* Build order - src before tests.

 * docs/api/developer.doxygen: Generate for all classes, private members etc.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@495254 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 35 insertions, 32 deletions

diff --git a/cpp/lib/broker/BrokerChannel.h b/cpp/lib/broker/BrokerChannel.h
index 888ca3c051..2d4f97fef6 100644
--- a/cpp/lib/broker/BrokerChannel.h
+++ b/cpp/lib/broker/BrokerChannel.h
@@ -1,3 +1,6 @@
+#ifndef _broker_BrokerChannel_h
+#define _broker_BrokerChannel_h
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -18,8 +21,6 @@
  * under the License.
  *
  */
-#ifndef _Channel_
-#define _Channel_
 
 #include <algorithm>
 #include <functional>
@@ -125,4 +126,4 @@ namespace qpid {
 }
 
 
-#endif
+#endif  /*!_broker_BrokerChannel_h*/
diff --git a/cpp/lib/broker/BrokerExchange.h b/cpp/lib/broker/BrokerExchange.h
index f5e4d9cb28..6f4e9e6671 100644
--- a/cpp/lib/broker/BrokerExchange.h
+++ b/cpp/lib/broker/BrokerExchange.h
@@ -1,3 +1,6 @@
+#ifndef _broker_BrokerExchange_h
+#define _broker_BrokerExchange_h
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -18,8 +21,6 @@
  * under the License.
  *
  */
-#ifndef _Exchange_
-#define _Exchange_
 
 #include <boost/shared_ptr.hpp>
 #include <Deliverable.h>
@@ -47,4 +48,4 @@ namespace qpid {
 }
 
 
-#endif
+#endif  /*!_broker_BrokerExchange_h*/
diff --git a/cpp/lib/broker/BrokerMessage.h b/cpp/lib/broker/BrokerMessage.h
index 1f68e1004a..388bfba51e 100644
--- a/cpp/lib/broker/BrokerMessage.h
+++ b/cpp/lib/broker/BrokerMessage.h
@@ -1,3 +1,6 @@
+#ifndef _broker_BrokerMessage_h
+#define _broker_BrokerMessage_h
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -18,8 +21,6 @@
  * under the License.
  *
  */
-#ifndef _Message_
-#define _Message_
 
 #include <memory>
 #include <boost/shared_ptr.hpp>
@@ -142,4 +143,4 @@ namespace qpid {
 }
 
 
-#endif
+#endif  /*!_broker_BrokerMessage_h*/
diff --git a/cpp/lib/broker/BrokerQueue.h b/cpp/lib/broker/BrokerQueue.h
index 41611bebe9..860de45b9c 100644
--- a/cpp/lib/broker/BrokerQueue.h
+++ b/cpp/lib/broker/BrokerQueue.h
@@ -1,3 +1,6 @@
+#ifndef _broker_BrokerQueue_h
+#define _broker_BrokerQueue_h
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -18,8 +21,6 @@
  * under the License.
  *
  */
-#ifndef _Queue_
-#define _Queue_
 
 #include <vector>
 #include <memory>
@@ -143,4 +144,4 @@ namespace qpid {
 }
 
 
-#endif
+#endif  /*!_broker_BrokerQueue_h*/
diff --git a/cpp/lib/broker/ExchangeRegistry.h b/cpp/lib/broker/ExchangeRegistry.h
index 8dcd0d3623..aeb32753df 100644
--- a/cpp/lib/broker/ExchangeRegistry.h
+++ b/cpp/lib/broker/ExchangeRegistry.h
@@ -1,3 +1,6 @@
+#ifndef _broker_ExchangeRegistry_h
+#define _broker_ExchangeRegistry_h
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -18,8 +21,6 @@
  * under the License.
  *
  */
-#ifndef _ExchangeRegistry_
-#define _ExchangeRegistry_
 
 #include <map>
 #include <BrokerExchange.h>
@@ -43,4 +44,4 @@ namespace broker {
 }
 
 
-#endif
+#endif  /*!_broker_ExchangeRegistry_h*/
diff --git a/cpp/lib/client/ClientChannel.h b/cpp/lib/client/ClientChannel.h
index 066f837430..5beda0296e 100644
--- a/cpp/lib/client/ClientChannel.h
+++ b/cpp/lib/client/ClientChannel.h
@@ -1,3 +1,6 @@
+#ifndef _client_ClientChannel_h
+#define _client_ClientChannel_h
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,9 +26,6 @@
 #include <queue>
 #include "sys/types.h"
 
-#ifndef _Channel_
-#define _Channel_
-
 #include <framing/amqp_framing.h>
 #include <Connection.h>
 #include <ClientExchange.h>
@@ -317,5 +317,4 @@ namespace client {
 }
 }
 
-
-#endif
+#endif  /*!_client_ClientChannel_h*/
diff --git a/cpp/lib/client/ClientMessage.h b/cpp/lib/client/ClientMessage.h
index b46eb0bc72..a5d204d35a 100644
--- a/cpp/lib/client/ClientMessage.h
+++ b/cpp/lib/client/ClientMessage.h
@@ -1,3 +1,6 @@
+#ifndef _client_ClientMessage_h
+#define _client_ClientMessage_h
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,10 +24,6 @@
 #include <string>
 #include <framing/amqp_framing.h>
 
-#ifndef _Message_
-#define _Message_
-
-
 namespace qpid {
 namespace client {
 
@@ -110,5 +109,4 @@ namespace client {
 }
 }
 
-
-#endif
+#endif  /*!_client_ClientMessage_h*/
diff --git a/cpp/lib/client/ClientQueue.h b/cpp/lib/client/ClientQueue.h
index 037856ecd2..6b7aaf7c41 100644
--- a/cpp/lib/client/ClientQueue.h
+++ b/cpp/lib/client/ClientQueue.h
@@ -1,3 +1,6 @@
+#ifndef _client_ClientQueue_h
+#define _client_ClientQueue_h
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,9 +23,6 @@
  */
 #include <string>
 
-#ifndef _Queue_
-#define _Queue_
-
 namespace qpid {
 namespace client {
 
@@ -97,5 +97,4 @@ namespace client {
 }
 }
 
-
-#endif
+#endif  /*!_client_ClientQueue_h*/
diff --git a/cpp/lib/common/Makefile.am b/cpp/lib/common/Makefile.am
index fe05498b97..941b30f8e5 100644
--- a/cpp/lib/common/Makefile.am
+++ b/cpp/lib/common/Makefile.am
@@ -56,6 +56,8 @@ libqpidcommon_la_LDFLAGS =		\
 libqpidcommon_la_SOURCES =			\
   $(platform_src)				\
   $(framing)/AMQBody.cpp			\
+  $(framing)/AMQRequestBody.cpp			\
+  $(framing)/AMQResponseBody.cpp		\
   $(framing)/AMQContentBody.cpp			\
   $(framing)/AMQFrame.cpp			\
   $(framing)/AMQHeaderBody.cpp			\
@@ -72,7 +74,7 @@ libqpidcommon_la_SOURCES =			\
   $(framing)/ProtocolVersionException.cpp	\
   $(framing)/Value.cpp				\
   $(gen)/AMQP_ClientProxy.cpp			\
-  $(gen)/AMQP_HighestVersion.h		\
+  $(gen)/AMQP_HighestVersion.h			\
   $(gen)/AMQP_MethodVersionMap.cpp		\
   $(gen)/AMQP_ServerProxy.cpp			\
   Exception.cpp					\