Made the new C++ API more friendly for swig-wrapping.

  - Added Message::setProperty() as an alternative to using getProperties() to obtain
    a writable reference to a Variant::Map.
  - Added unit testing for this new method.
  - Added #ifndef SWIG conditions around the declarations of non-member operator<< methods.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@980147 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 0 deletions

diff --git a/cpp/include/qpid/messaging/Address.h b/cpp/include/qpid/messaging/Address.h
index 2e36d0ae22..bebbfc72f6 100644
--- a/cpp/include/qpid/messaging/Address.h
+++ b/cpp/include/qpid/messaging/Address.h
@@ -155,7 +155,9 @@ class Address
     AddressImpl* impl;
 };
 
+#ifndef SWIG
 QPID_MESSAGING_EXTERN std::ostream& operator<<(std::ostream& out, const Address& address);
+#endif
 
 }} // namespace qpid::messaging
 
diff --git a/cpp/include/qpid/messaging/Message.h b/cpp/include/qpid/messaging/Message.h
index ba58b5887c..d48af35cc0 100644
--- a/cpp/include/qpid/messaging/Message.h
+++ b/cpp/include/qpid/messaging/Message.h
@@ -100,6 +100,8 @@ class Message
     QPID_MESSAGING_EXTERN const char* getContentPtr() const;
     /** Get the size of content in bytes. */
     QPID_MESSAGING_EXTERN size_t getContentSize() const;
+
+    QPID_MESSAGING_EXTERN void setProperty(const std::string&, const qpid::types::Variant&);
   private:
     MessageImpl* impl;
     friend struct MessageImplAccess;