You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2011/05/09 21:56:00 UTC

svn commit: r1101181 - in /qpid/trunk/qpid/cpp/src: qmf/PrivateImplRef.h qpid/RefCounted.h qpid/cluster/Connection.h qpid/cluster/types.h qpid/framing/MethodBodyFactory.h

Author: astitcher
Date: Mon May  9 19:56:00 2011
New Revision: 1101181

URL: http://svn.apache.org/viewvc?rev=1101181&view=rev
Log:
QPID-3004: Get Clang to compile qpid c++
- Finish getting boost::intrusive_ptr working (may be compiler bug)

Modified:
    qpid/trunk/qpid/cpp/src/qmf/PrivateImplRef.h
    qpid/trunk/qpid/cpp/src/qpid/RefCounted.h
    qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h
    qpid/trunk/qpid/cpp/src/qpid/cluster/types.h
    qpid/trunk/qpid/cpp/src/qpid/framing/MethodBodyFactory.h

Modified: qpid/trunk/qpid/cpp/src/qmf/PrivateImplRef.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/PrivateImplRef.h?rev=1101181&r1=1101180&r2=1101181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/PrivateImplRef.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/PrivateImplRef.h Mon May  9 19:56:00 2011
@@ -23,8 +23,8 @@
  */
 
 #include "qmf/ImportExport.h"
-#include <boost/intrusive_ptr.hpp>
 #include "qpid/RefCounted.h"
+#include <boost/intrusive_ptr.hpp>
 
 namespace qmf {
 

Modified: qpid/trunk/qpid/cpp/src/qpid/RefCounted.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/RefCounted.h?rev=1101181&r1=1101180&r2=1101181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/RefCounted.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/RefCounted.h Mon May  9 19:56:00 2011
@@ -53,8 +53,10 @@ protected:
 
 // intrusive_ptr support.
 namespace boost {
-inline void intrusive_ptr_add_ref(const qpid::RefCounted* p) { p->addRef(); }
-inline void intrusive_ptr_release(const qpid::RefCounted* p) { p->release(); }
+template <typename T>
+inline void intrusive_ptr_add_ref(const T* p) { p->qpid::RefCounted::addRef(); }
+template <typename T>
+inline void intrusive_ptr_release(const T* p) { p->qpid::RefCounted::release(); }
 }
 
 

Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h?rev=1101181&r1=1101180&r2=1101181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h Mon May  9 19:56:00 2011
@@ -24,10 +24,10 @@
 
 #include "types.h"
 #include "OutputInterceptor.h"
-#include "EventFrame.h"
 #include "McastFrameHandler.h"
 #include "UpdateReceiver.h"
 
+#include "qpid/RefCounted.h"
 #include "qpid/broker/Connection.h"
 #include "qpid/broker/SecureConnection.h"
 #include "qpid/broker/SemanticState.h"
@@ -55,6 +55,7 @@ class TxAccept;
 namespace cluster {
 class Cluster;
 class Event;
+struct EventFrame;
 
 /** Intercept broker::Connection calls for shadow and local cluster connections. */
 class Connection :

Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/types.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/types.h?rev=1101181&r1=1101180&r2=1101181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/types.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/types.h Mon May  9 19:56:00 2011
@@ -24,6 +24,7 @@
 
 #include "config.h"
 #include "qpid/Url.h"
+#include "qpid/RefCounted.h"
 #include "qpid/sys/IntegerTypes.h"
 #include <boost/intrusive_ptr.hpp>
 #include <utility>

Modified: qpid/trunk/qpid/cpp/src/qpid/framing/MethodBodyFactory.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/MethodBodyFactory.h?rev=1101181&r1=1101180&r2=1101181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/MethodBodyFactory.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/MethodBodyFactory.h Mon May  9 19:56:00 2011
@@ -22,6 +22,7 @@
  *
  */
 #include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
 #include <boost/intrusive_ptr.hpp>
 
 namespace qpid {



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org