3 files changed, 13 insertions, 0 deletions
diff --git a/cpp/include/qpid/messaging/Address.h b/cpp/include/qpid/messaging/Address.h
index 63dce0c49d..224a70b193 100644
--- a/cpp/include/qpid/messaging/Address.h
+++ b/cpp/include/qpid/messaging/Address.h
@@ -153,6 +153,7 @@ class QPID_MESSAGING_CLASS_EXTERN Address
     QPID_MESSAGING_EXTERN bool operator !() const;
   private:
     AddressImpl* impl;
+    friend class AddressImpl;
 };
 
 #ifndef SWIG
diff --git a/cpp/include/qpid/messaging/Receiver.h b/cpp/include/qpid/messaging/Receiver.h
index 13317dfcbd..6c6fdaa7cb 100644
--- a/cpp/include/qpid/messaging/Receiver.h
+++ b/cpp/include/qpid/messaging/Receiver.h
@@ -34,6 +34,7 @@ namespace messaging {
 template <class> class PrivateImplRef;
 #endif
 
+class Address;
 class Message;
 class ReceiverImpl;
 class Session;
@@ -134,6 +135,11 @@ class QPID_MESSAGING_CLASS_EXTERN Receiver : public qpid::messaging::Handle<Rece
      */
     QPID_MESSAGING_EXTERN Session getSession() const;
 
+    /**
+     * Returns an address for this receiver.
+     */
+    QPID_MESSAGING_EXTERN Address getAddress() const;
+
 #ifndef SWIG
   private:
   friend class qpid::messaging::PrivateImplRef<Receiver>;
diff --git a/cpp/include/qpid/messaging/Sender.h b/cpp/include/qpid/messaging/Sender.h
index 8e1c5846e9..9c7bca1905 100644
--- a/cpp/include/qpid/messaging/Sender.h
+++ b/cpp/include/qpid/messaging/Sender.h
@@ -34,6 +34,7 @@ namespace messaging {
 #ifndef SWIG
 template <class> class PrivateImplRef;
 #endif
+class Address;
 class Message;
 class SenderImpl;
 class Session;
@@ -89,6 +90,11 @@ class QPID_MESSAGING_CLASS_EXTERN Sender : public qpid::messaging::Handle<Sender
      * Returns a handle to the session associated with this sender.
      */
     QPID_MESSAGING_EXTERN Session getSession() const;
+
+    /**
+     * Returns an address for this sender.
+     */
+    QPID_MESSAGING_EXTERN Address getAddress() const;
 #ifndef SWIG
   private:
   friend class qpid::messaging::PrivateImplRef<Sender>;