Author: tross
Date: Wed Aug 4 13:22:00 2010
New Revision: 982243
URL: http://svn.apache.org/viewvc?rev=982243&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/cpp/include/qpid/messaging/Connection.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Connection.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Connection.h?rev=982243&r1=982242&r2=982243&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Connection.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Connection.h Wed Aug 4 13:22:00
2010
@@ -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::messagin
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
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h?rev=982243&r1=982242&r2=982243&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h Wed Aug 4 13:22:00
2010
@@ -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:
*/
QPID_MESSAGING_EXTERN Session getSession() const;
+#ifndef SWIG
private:
friend class qpid::messaging::PrivateImplRef<Receiver>;
+#endif
};
}} // namespace qpid::messaging
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h?rev=982243&r1=982242&r2=982243&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h Wed Aug 4 13:22:00 2010
@@ -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::H
* 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
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h?rev=982243&r1=982242&r2=982243&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h Wed Aug 4 13:22:00
2010
@@ -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::
QPID_MESSAGING_EXTERN bool hasError();
QPID_MESSAGING_EXTERN void checkError();
+#ifndef SWIG
private:
friend class qpid::messaging::PrivateImplRef<Session>;
+#endif
};
}} // namespace qpid::messaging
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
