Added conditional-compilation directives to hide the PrivateImplRef template

from Swig.  It seems that earlier versions of Swig (like that in RHEL5) don't like
the template syntax.


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

4 files changed, 17 insertions, 1 deletions

diff --git a/cpp/include/qpid/messaging/Connection.h b/cpp/include/qpid/messaging/Connection.h
index 6f2cd54b4b..59f5616a2f 100644
--- a/cpp/include/qpid/messaging/Connection.h
+++ b/cpp/include/qpid/messaging/Connection.h
@@ -32,7 +32,9 @@
 namespace qpid {
 namespace messaging {
 
+#ifndef SWIG
 template <class> class PrivateImplRef;
+#endif
 class ConnectionImpl;
 class Session;
 
@@ -99,9 +101,11 @@ class Connection : public qpid::messaging::Handle<ConnectionImpl>
 
     QPID_MESSAGING_EXTERN Session getSession(const std::string& name) const;
     QPID_MESSAGING_EXTERN std::string getAuthenticatedUsername();
+
+#ifndef SWIG
   private:
   friend class qpid::messaging::PrivateImplRef<Connection>;
-
+#endif
 };
 
 }} // namespace qpid::messaging
diff --git a/cpp/include/qpid/messaging/Receiver.h b/cpp/include/qpid/messaging/Receiver.h
index a1129975cf..6f3ae961db 100644
--- a/cpp/include/qpid/messaging/Receiver.h
+++ b/cpp/include/qpid/messaging/Receiver.h
@@ -30,7 +30,9 @@
 namespace qpid {
 namespace messaging {
 
+#ifndef SWIG
 template <class> class PrivateImplRef;
+#endif
 
 class Message;
 class ReceiverImpl;
@@ -132,8 +134,10 @@ class Receiver : public qpid::messaging::Handle<ReceiverImpl>
      */
     QPID_MESSAGING_EXTERN Session getSession() const;
 
+#ifndef SWIG
   private:
   friend class qpid::messaging::PrivateImplRef<Receiver>;
+#endif
 };
 }} // namespace qpid::messaging
 
diff --git a/cpp/include/qpid/messaging/Sender.h b/cpp/include/qpid/messaging/Sender.h
index 80ebf517a4..85658f37cc 100644
--- a/cpp/include/qpid/messaging/Sender.h
+++ b/cpp/include/qpid/messaging/Sender.h
@@ -31,7 +31,9 @@
 namespace qpid {
 namespace messaging {
 
+#ifndef SWIG
 template <class> class PrivateImplRef;
+#endif
 class Message;
 class SenderImpl;
 class Session;
@@ -87,8 +89,10 @@ class Sender : public qpid::messaging::Handle<SenderImpl>
      * Returns a handle to the session associated with this sender.
      */
     QPID_MESSAGING_EXTERN Session getSession() const;
+#ifndef SWIG
   private:
   friend class qpid::messaging::PrivateImplRef<Sender>;
+#endif
 };
 }} // namespace qpid::messaging
 
diff --git a/cpp/include/qpid/messaging/Session.h b/cpp/include/qpid/messaging/Session.h
index 34fccdb868..688a4dd102 100644
--- a/cpp/include/qpid/messaging/Session.h
+++ b/cpp/include/qpid/messaging/Session.h
@@ -32,7 +32,9 @@
 namespace qpid {
 namespace messaging {
 
+#ifndef SWIG
 template <class> class PrivateImplRef;
+#endif
 class Address;
 class Connection;
 class Message;
@@ -161,8 +163,10 @@ class Session : public qpid::messaging::Handle<SessionImpl>
     QPID_MESSAGING_EXTERN bool hasError();
     QPID_MESSAGING_EXTERN void checkError();
 
+#ifndef SWIG
   private:
   friend class qpid::messaging::PrivateImplRef<Session>;
+#endif
 };
 }} // namespace qpid::messaging