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, 2 insertions, 24 deletions

diff --git a/cpp/bindings/qpid/dotnet/src/Message.cpp b/cpp/bindings/qpid/dotnet/src/Message.cpp
index e5dbf845b3..fe7825134d 100644
--- a/cpp/bindings/qpid/dotnet/src/Message.cpp
+++ b/cpp/bindings/qpid/dotnet/src/Message.cpp
@@ -235,7 +235,7 @@ namespace Messaging {
         }

     }

 

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

+    // Copy constructor

     Message::Message(const Message ^ message)

     {

         System::Exception ^ newException = nullptr;

@@ -257,29 +257,7 @@ namespace Messaging {
 		}

     }

 

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

-    Message::Message(const Message % message)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try 

-		{

-            messagep = new ::qpid::messaging::Message(

-                        *(const_cast<Message %>(message).NativeMessage));

-        } 

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

-		{

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

-            newException    = gcnew QpidException(errmsg);

-        }

-

-		if (newException != nullptr) 

-		{

-	        throw newException;

-		}

-    }

-

-    // Property

+	// Property

     void Message::SetProperty(System::String ^ name, System::Object ^ value)

     {

         System::Exception ^ newException = nullptr;