summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/include/qpid/Exception.h2
-rw-r--r--cpp/include/qpid/sys/posix/check.h1
-rwxr-xr-xcpp/include/qpid/sys/windows/check.h1
-rw-r--r--cpp/rubygen/framing.0-10/MethodBodyFactory.rb1
-rwxr-xr-xcpp/rubygen/framing.0-10/constants.rb2
-rw-r--r--cpp/src/qmf/engine/EventImpl.cpp2
-rw-r--r--cpp/src/qmf/engine/ObjectIdImpl.cpp1
-rw-r--r--cpp/src/qmf/engine/SchemaImpl.cpp1
-rw-r--r--cpp/src/qmf/engine/SchemaImpl.h4
-rw-r--r--cpp/src/qpid/cluster/StoreStatus.cpp1
-rw-r--r--cpp/src/qpid/console/Value.cpp2
-rw-r--r--cpp/src/qpid/framing/AMQFrame.cpp2
-rw-r--r--cpp/src/qpid/framing/Array.cpp1
-rw-r--r--cpp/src/qpid/framing/BodyHandler.cpp1
-rw-r--r--cpp/src/qpid/framing/FieldTable.cpp1
-rw-r--r--cpp/src/qpid/framing/FieldValue.cpp1
-rw-r--r--cpp/src/qpid/framing/List.cpp1
-rw-r--r--cpp/src/qpid/framing/SequenceSet.cpp1
-rw-r--r--cpp/src/qpid/framing/Uuid.cpp1
-rw-r--r--cpp/src/qpid/messaging/Variant.cpp1
-rw-r--r--cpp/src/qpid/sys/posix/Shlib.cpp1
-rw-r--r--cpp/src/qpid/sys/ssl/check.h2
-rw-r--r--cpp/src/tests/TxMocks.h1
23 files changed, 29 insertions, 3 deletions
diff --git a/cpp/include/qpid/Exception.h b/cpp/include/qpid/Exception.h
index 7b937c242a..fa7111160c 100644
--- a/cpp/include/qpid/Exception.h
+++ b/cpp/include/qpid/Exception.h
@@ -26,9 +26,7 @@
#include "qpid/framing/constants.h"
#include "qpid/framing/enum.h"
#include "qpid/sys/StrError.h"
-#include "qpid/Msg.h"
#include "qpid/CommonImportExport.h"
-#include <memory>
#include <string>
#include <errno.h>
diff --git a/cpp/include/qpid/sys/posix/check.h b/cpp/include/qpid/sys/posix/check.h
index bbc66d389b..1bfe5d6d78 100644
--- a/cpp/include/qpid/sys/posix/check.h
+++ b/cpp/include/qpid/sys/posix/check.h
@@ -23,6 +23,7 @@
*/
#include "qpid/Exception.h"
+#include "qpid/Msg.h"
#include <cerrno>
#include <assert.h>
diff --git a/cpp/include/qpid/sys/windows/check.h b/cpp/include/qpid/sys/windows/check.h
index aba38814b2..2a8e439bed 100755
--- a/cpp/include/qpid/sys/windows/check.h
+++ b/cpp/include/qpid/sys/windows/check.h
@@ -23,6 +23,7 @@
*/
#include "qpid/Exception.h"
+#include "qpid/Msg.h"
#include "qpid/sys/StrError.h"
#define QPID_WINDOWS_ERROR(ERRVAL) qpid::Exception(QPID_MSG(qpid::sys::strError(ERRVAL)))
diff --git a/cpp/rubygen/framing.0-10/MethodBodyFactory.rb b/cpp/rubygen/framing.0-10/MethodBodyFactory.rb
index 95c79fd1a4..28a5d94e32 100644
--- a/cpp/rubygen/framing.0-10/MethodBodyFactory.rb
+++ b/cpp/rubygen/framing.0-10/MethodBodyFactory.rb
@@ -35,6 +35,7 @@ class MethodBodyFactoryGen < CppGen
include "qpid/framing/BodyFactory"
@amqp.methods_.each { |m| include "qpid/framing/#{m.body_name}" }
include "qpid/Exception.h"
+ include "qpid/Msg.h"
genl
namespace(@namespace) {
scope("boost::intrusive_ptr<AMQMethodBody> #{@classname}::create(ClassId c, MethodId m) {") {
diff --git a/cpp/rubygen/framing.0-10/constants.rb b/cpp/rubygen/framing.0-10/constants.rb
index 5c1c1047f7..85bfb96ac0 100755
--- a/cpp/rubygen/framing.0-10/constants.rb
+++ b/cpp/rubygen/framing.0-10/constants.rb
@@ -78,6 +78,7 @@ EOS
cpp_file(path) {
include(path);
include("qpid/Exception.h")
+ include("qpid/Msg.h")
include("<ostream>")
namespace(@namespace) {
scope("const char* typeName(TypeCode t) {") {
@@ -181,6 +182,7 @@ EOS
def reply_exceptions_cpp()
cpp_file("#{@dir}/reply_exceptions") {
include "#{@dir}/reply_exceptions"
+ include "qpid/Msg.h"
include "<sstream>"
include "<assert.h>"
namespace("qpid::framing") {
diff --git a/cpp/src/qmf/engine/EventImpl.cpp b/cpp/src/qmf/engine/EventImpl.cpp
index 6bdda9321e..3509220b0c 100644
--- a/cpp/src/qmf/engine/EventImpl.cpp
+++ b/cpp/src/qmf/engine/EventImpl.cpp
@@ -20,6 +20,8 @@
#include <qmf/engine/EventImpl.h>
#include <qmf/engine/ValueImpl.h>
+#include <sstream>
+
using namespace std;
using namespace qmf::engine;
using qpid::framing::Buffer;
diff --git a/cpp/src/qmf/engine/ObjectIdImpl.cpp b/cpp/src/qmf/engine/ObjectIdImpl.cpp
index 670ee385a3..9216f7bac0 100644
--- a/cpp/src/qmf/engine/ObjectIdImpl.cpp
+++ b/cpp/src/qmf/engine/ObjectIdImpl.cpp
@@ -19,6 +19,7 @@
#include "qmf/engine/ObjectIdImpl.h"
#include <stdlib.h>
+#include <sstream>
using namespace std;
using namespace qmf::engine;
diff --git a/cpp/src/qmf/engine/SchemaImpl.cpp b/cpp/src/qmf/engine/SchemaImpl.cpp
index 249a08ba7f..e0948a9911 100644
--- a/cpp/src/qmf/engine/SchemaImpl.cpp
+++ b/cpp/src/qmf/engine/SchemaImpl.cpp
@@ -24,6 +24,7 @@
#include <string.h>
#include <string>
#include <vector>
+#include <sstream>
using namespace std;
using namespace qmf::engine;
diff --git a/cpp/src/qmf/engine/SchemaImpl.h b/cpp/src/qmf/engine/SchemaImpl.h
index 7be757ee8d..8b079a5ec6 100644
--- a/cpp/src/qmf/engine/SchemaImpl.h
+++ b/cpp/src/qmf/engine/SchemaImpl.h
@@ -21,9 +21,11 @@
*/
#include "qmf/engine/Schema.h"
+#include "qpid/framing/Buffer.h"
+
#include <string>
#include <vector>
-#include <qpid/framing/Buffer.h>
+#include <memory>
namespace qmf {
namespace engine {
diff --git a/cpp/src/qpid/cluster/StoreStatus.cpp b/cpp/src/qpid/cluster/StoreStatus.cpp
index cf75cd3b5f..947f81d596 100644
--- a/cpp/src/qpid/cluster/StoreStatus.cpp
+++ b/cpp/src/qpid/cluster/StoreStatus.cpp
@@ -20,6 +20,7 @@
*/
#include "StoreStatus.h"
#include "qpid/Exception.h"
+#include "qpid/Msg.h"
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/operations.hpp>
diff --git a/cpp/src/qpid/console/Value.cpp b/cpp/src/qpid/console/Value.cpp
index c30660f1dc..47c6a4ce57 100644
--- a/cpp/src/qpid/console/Value.cpp
+++ b/cpp/src/qpid/console/Value.cpp
@@ -22,6 +22,8 @@
#include "qpid/console/Value.h"
#include "qpid/framing/Buffer.h"
+#include <sstream>
+
using namespace qpid;
using namespace qpid::console;
using namespace std;
diff --git a/cpp/src/qpid/framing/AMQFrame.cpp b/cpp/src/qpid/framing/AMQFrame.cpp
index 5c5920d786..d863970ece 100644
--- a/cpp/src/qpid/framing/AMQFrame.cpp
+++ b/cpp/src/qpid/framing/AMQFrame.cpp
@@ -24,6 +24,8 @@
#include "qpid/framing/reply_exceptions.h"
#include "qpid/framing/BodyFactory.h"
#include "qpid/framing/MethodBodyFactory.h"
+#include "qpid/Msg.h"
+
#include <boost/format.hpp>
#include <iostream>
diff --git a/cpp/src/qpid/framing/Array.cpp b/cpp/src/qpid/framing/Array.cpp
index d95e0d167d..454e8e298f 100644
--- a/cpp/src/qpid/framing/Array.cpp
+++ b/cpp/src/qpid/framing/Array.cpp
@@ -23,6 +23,7 @@
#include "qpid/framing/FieldValue.h"
#include "qpid/Exception.h"
#include "qpid/framing/reply_exceptions.h"
+#include "qpid/Msg.h"
#include <assert.h>
namespace qpid {
diff --git a/cpp/src/qpid/framing/BodyHandler.cpp b/cpp/src/qpid/framing/BodyHandler.cpp
index e2128596ed..db302b1e4c 100644
--- a/cpp/src/qpid/framing/BodyHandler.cpp
+++ b/cpp/src/qpid/framing/BodyHandler.cpp
@@ -25,6 +25,7 @@
#include "qpid/framing/AMQHeartbeatBody.h"
#include <boost/cast.hpp>
#include "qpid/framing/reply_exceptions.h"
+#include "qpid/Msg.h"
using namespace qpid::framing;
using namespace boost;
diff --git a/cpp/src/qpid/framing/FieldTable.cpp b/cpp/src/qpid/framing/FieldTable.cpp
index e2e91e450a..023e4af819 100644
--- a/cpp/src/qpid/framing/FieldTable.cpp
+++ b/cpp/src/qpid/framing/FieldTable.cpp
@@ -25,6 +25,7 @@
#include "qpid/framing/FieldValue.h"
#include "qpid/Exception.h"
#include "qpid/framing/reply_exceptions.h"
+#include "qpid/Msg.h"
#include <assert.h>
namespace qpid {
diff --git a/cpp/src/qpid/framing/FieldValue.cpp b/cpp/src/qpid/framing/FieldValue.cpp
index 0b49748de8..fd911645f4 100644
--- a/cpp/src/qpid/framing/FieldValue.cpp
+++ b/cpp/src/qpid/framing/FieldValue.cpp
@@ -24,6 +24,7 @@
#include "qpid/framing/Endian.h"
#include "qpid/framing/List.h"
#include "qpid/framing/reply_exceptions.h"
+#include "qpid/Msg.h"
namespace qpid {
namespace framing {
diff --git a/cpp/src/qpid/framing/List.cpp b/cpp/src/qpid/framing/List.cpp
index bde7dabbac..963ebc206b 100644
--- a/cpp/src/qpid/framing/List.cpp
+++ b/cpp/src/qpid/framing/List.cpp
@@ -23,6 +23,7 @@
#include "qpid/framing/FieldValue.h"
#include "qpid/Exception.h"
#include "qpid/framing/reply_exceptions.h"
+#include "qpid/Msg.h"
namespace qpid {
namespace framing {
diff --git a/cpp/src/qpid/framing/SequenceSet.cpp b/cpp/src/qpid/framing/SequenceSet.cpp
index dcfb4689b6..72fcd8a9e2 100644
--- a/cpp/src/qpid/framing/SequenceSet.cpp
+++ b/cpp/src/qpid/framing/SequenceSet.cpp
@@ -22,6 +22,7 @@
#include "qpid/framing/SequenceSet.h"
#include "qpid/framing/Buffer.h"
#include "qpid/framing/reply_exceptions.h"
+#include "qpid/Msg.h"
using namespace qpid::framing;
using std::max;
diff --git a/cpp/src/qpid/framing/Uuid.cpp b/cpp/src/qpid/framing/Uuid.cpp
index 432c7ab94e..67ca96d53f 100644
--- a/cpp/src/qpid/framing/Uuid.cpp
+++ b/cpp/src/qpid/framing/Uuid.cpp
@@ -22,6 +22,7 @@
#include "qpid/Exception.h"
#include "qpid/framing/Buffer.h"
#include "qpid/framing/reply_exceptions.h"
+#include "qpid/Msg.h"
namespace qpid {
namespace framing {
diff --git a/cpp/src/qpid/messaging/Variant.cpp b/cpp/src/qpid/messaging/Variant.cpp
index 116018f797..ba93f160ec 100644
--- a/cpp/src/qpid/messaging/Variant.cpp
+++ b/cpp/src/qpid/messaging/Variant.cpp
@@ -19,6 +19,7 @@
*
*/
#include "qpid/messaging/Variant.h"
+#include "qpid/Msg.h"
#include <boost/format.hpp>
#include <boost/lexical_cast.hpp>
#include <algorithm>
diff --git a/cpp/src/qpid/sys/posix/Shlib.cpp b/cpp/src/qpid/sys/posix/Shlib.cpp
index 299331103c..3fb685d5b8 100644
--- a/cpp/src/qpid/sys/posix/Shlib.cpp
+++ b/cpp/src/qpid/sys/posix/Shlib.cpp
@@ -20,6 +20,7 @@
#include "qpid/sys/Shlib.h"
#include "qpid/Exception.h"
+#include "qpid/Msg.h"
#include <dlfcn.h>
diff --git a/cpp/src/qpid/sys/ssl/check.h b/cpp/src/qpid/sys/ssl/check.h
index 984c338a18..94db120afa 100644
--- a/cpp/src/qpid/sys/ssl/check.h
+++ b/cpp/src/qpid/sys/ssl/check.h
@@ -21,6 +21,8 @@
* under the License.
*
*/
+#include "qpid/Msg.h"
+
#include <iostream>
#include <string>
#include <nspr.h>
diff --git a/cpp/src/tests/TxMocks.h b/cpp/src/tests/TxMocks.h
index a34d864bae..72cb50cd21 100644
--- a/cpp/src/tests/TxMocks.h
+++ b/cpp/src/tests/TxMocks.h
@@ -23,6 +23,7 @@
#include "qpid/Exception.h"
+#include "qpid/Msg.h"
#include "qpid/broker/TransactionalStore.h"
#include "qpid/broker/TxOp.h"
#include <iostream>