QPID-3004: Get Clang to compile qpid c++

- Change class/struct declarations to be consistent with the definition to avoid
  warnings

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

9 files changed, 14 insertions, 13 deletions

diff --git a/qpid/cpp/include/qmf/Query.h b/qpid/cpp/include/qmf/Query.h
index fec4660bd7..1867b59d81 100644
--- a/qpid/cpp/include/qmf/Query.h
+++ b/qpid/cpp/include/qmf/Query.h
@@ -65,7 +65,7 @@ namespace qmf {
 #ifndef SWIG
     private:
         friend class qmf::PrivateImplRef<Query>;
-        friend class QueryImplAccess;
+        friend struct QueryImplAccess;
 #endif
     };
 
diff --git a/qpid/cpp/include/qmf/Subscription.h b/qpid/cpp/include/qmf/Subscription.h
index 4e60eb984e..0a01b7c526 100644
--- a/qpid/cpp/include/qmf/Subscription.h
+++ b/qpid/cpp/include/qmf/Subscription.h
@@ -73,7 +73,7 @@ namespace qmf {
 #ifndef SWIG
     private:
         friend class qmf::PrivateImplRef<Subscription>;
-        friend class SubscriptionImplAccess;
+        friend struct SubscriptionImplAccess;
 #endif
     };
 
diff --git a/qpid/cpp/src/qpid/cluster/Cluster.h b/qpid/cpp/src/qpid/cluster/Cluster.h
index 8f73c6acca..78d325cdf9 100644
--- a/qpid/cpp/src/qpid/cluster/Cluster.h
+++ b/qpid/cpp/src/qpid/cluster/Cluster.h
@@ -60,13 +60,13 @@ class Message;
 
 namespace framing {
 class AMQBody;
-class Uuid;
+struct Uuid;
 }
 
 namespace cluster {
 
 class Connection;
-class EventFrame;
+struct EventFrame;
 class ClusterTimer;
 class UpdateDataExchange;
 
@@ -298,7 +298,7 @@ class Cluster : private Cpg::Handler, public management::Manageable {
     ClusterTimer* timer;
 
   friend std::ostream& operator<<(std::ostream&, const Cluster&);
-  friend class ClusterDispatcher;
+  friend struct ClusterDispatcher;
 };
 
 }} // namespace qpid::cluster
diff --git a/qpid/cpp/src/qpid/cluster/Connection.h b/qpid/cpp/src/qpid/cluster/Connection.h
index 04ace724da..b290824805 100644
--- a/qpid/cpp/src/qpid/cluster/Connection.h
+++ b/qpid/cpp/src/qpid/cluster/Connection.h
@@ -47,7 +47,7 @@ namespace framing { class AMQFrame; }
 
 namespace broker {
 class SemanticState;
-class QueuedMessage;
+struct QueuedMessage;
 class TxBuffer;
 class TxAccept;
 }
diff --git a/qpid/cpp/src/qpid/cluster/Decoder.h b/qpid/cpp/src/qpid/cluster/Decoder.h
index 2e2af2868f..3b5ada4a81 100644
--- a/qpid/cpp/src/qpid/cluster/Decoder.h
+++ b/qpid/cpp/src/qpid/cluster/Decoder.h
@@ -31,7 +31,7 @@
 namespace qpid {
 namespace cluster {
 
-class EventFrame;
+struct EventFrame;
 class EventHeader;
 
 /**
diff --git a/qpid/cpp/src/qpid/cluster/ErrorCheck.h b/qpid/cpp/src/qpid/cluster/ErrorCheck.h
index de8cedafb3..a417b2ec25 100644
--- a/qpid/cpp/src/qpid/cluster/ErrorCheck.h
+++ b/qpid/cpp/src/qpid/cluster/ErrorCheck.h
@@ -33,7 +33,7 @@
 namespace qpid {
 namespace cluster {
 
-class EventFrame;
+struct EventFrame;
 class Cluster;
 class Multicaster;
 class Connection;
diff --git a/qpid/cpp/src/qpid/cluster/UpdateClient.h b/qpid/cpp/src/qpid/cluster/UpdateClient.h
index bbf7a948bc..b72d090d73 100644
--- a/qpid/cpp/src/qpid/cluster/UpdateClient.h
+++ b/qpid/cpp/src/qpid/cluster/UpdateClient.h
@@ -34,7 +34,7 @@
 
 namespace qpid {
 
-class Url;
+struct Url;
 
 namespace broker {
 
@@ -42,8 +42,8 @@ class Broker;
 class Queue;
 class Exchange;
 class QueueBindings;
-class QueueBinding;
-class QueuedMessage;
+struct QueueBinding;
+struct QueuedMessage;
 class SessionHandler;
 class DeliveryRecord;
 class SessionState;
diff --git a/qpid/cpp/src/qpid/sys/posix/Thread.cpp b/qpid/cpp/src/qpid/sys/posix/Thread.cpp
index b466733260..a1d6396763 100644
--- a/qpid/cpp/src/qpid/sys/posix/Thread.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Thread.cpp
@@ -37,7 +37,8 @@ void* runRunnable(void* p)
 }
 }
 
-struct ThreadPrivate {
+class ThreadPrivate {
+public:
     pthread_t thread;
 
     ThreadPrivate(Runnable* runnable) {
diff --git a/qpid/cpp/src/qpid/sys/ssl/SslHandler.h b/qpid/cpp/src/qpid/sys/ssl/SslHandler.h
index a340109966..400fa317fd 100644
--- a/qpid/cpp/src/qpid/sys/ssl/SslHandler.h
+++ b/qpid/cpp/src/qpid/sys/ssl/SslHandler.h
@@ -35,7 +35,7 @@ namespace sys {
 namespace ssl {
 
 class SslIO;
-class SslIOBufferBase;
+struct SslIOBufferBase;
 class SslSocket;
 
 class SslHandler : public OutputControl {