Undo bad merge from trunk - merged at wrong level.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 50 deletions

diff --git a/cpp/bindings/qpid/dotnet/src/Session.cpp b/cpp/bindings/qpid/dotnet/src/Session.cpp
index 0e918769a3..880331c588 100644
--- a/cpp/bindings/qpid/dotnet/src/Session.cpp
+++ b/cpp/bindings/qpid/dotnet/src/Session.cpp
@@ -89,7 +89,7 @@ namespace Messaging {
     }

 

 

-    // Copy constructor look-alike (C#)

+    // Copy constructor

     Session::Session(const Session ^ session)

         : parentConnectionp(session->parentConnectionp)

     {

@@ -113,30 +113,6 @@ namespace Messaging {
 		}

     }

 

-    // Copy constructor implicitly dereferenced (C++)

-    Session::Session(const Session % session)

-        : parentConnectionp(session.parentConnectionp)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try 

-		{

-            sessionp = new ::qpid::messaging::Session(

-                        *(const_cast<Session %>(session).NativeSession));

-          

-        } 

-        catch (const ::qpid::types::Exception & error) 

-		{

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-		if (newException != nullptr) 

-		{

-	        throw newException;

-		}

-    }

-

 

     void Session::Close()

     {

@@ -248,31 +224,6 @@ namespace Messaging {
 		}

     }

 

-    void Session::AcknowledgeUpTo(Message ^ message)

-    {

-        AcknowledgeUpTo(message, false);

-    }

-

-    void Session::AcknowledgeUpTo(Message ^ message, bool sync)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try 

-		{

-            sessionp->acknowledgeUpTo(*(message->NativeMessage), sync);

-        } 

-        catch (const ::qpid::types::Exception & error) 

-		{

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-		if (newException != nullptr) 

-		{

-	        throw newException;

-		}

-    }

-

     void Session::Reject(Message ^ message)

     {

         System::Exception ^ newException = nullptr;