Patch for improved compatibility with gcc 3.4 and boost 1.33

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

5 files changed, 22 insertions, 22 deletions

diff --git a/cpp/src/tests/amqp_0_10/Map.cpp b/cpp/src/tests/amqp_0_10/Map.cpp
index dcec1f49f7..efde967050 100644
--- a/cpp/src/tests/amqp_0_10/Map.cpp
+++ b/cpp/src/tests/amqp_0_10/Map.cpp
@@ -31,7 +31,7 @@ using namespace std;
 
 QPID_AUTO_TEST_SUITE(MapTestSuite)
 
- BOOST_AUTO_TEST_CASE(testGetSet) {
+ QPID_AUTO_TEST_CASE(testGetSet) {
     MapValue v;
     v = Str8("foo");
     BOOST_CHECK(v.get<Str8>());
@@ -53,7 +53,7 @@ template <class R> struct TestVisitor : public MapValue::Visitor<R> {
     R operator()(const R& r) const { return r; }
 };
     
-BOOST_AUTO_TEST_CASE(testVisit) {
+QPID_AUTO_TEST_CASE(testVisit) {
     MapValue v;
     v = Str8("foo");
     BOOST_CHECK_EQUAL(v.apply_visitor(TestVisitor<Str8>()), "foo");
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE(testVisit) {
 }
 
 
-BOOST_AUTO_TEST_CASE(testEncodeMapValue) {
+QPID_AUTO_TEST_CASE(testEncodeMapValue) {
     MapValue mv;
     std::string data;
     mv = Str8("hello");
@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE(testEncodeMapValue) {
     BOOST_CHECK_EQUAL(*mv2.get<Str8>(), "hello");
 }
 
-BOOST_AUTO_TEST_CASE(testEncode) {
+QPID_AUTO_TEST_CASE(testEncode) {
     Map map;
     std::string data;
     map["A"] = true;
diff --git a/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp b/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp
index cab87b6511..9d4fcb8935 100644
--- a/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp
+++ b/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp
@@ -34,7 +34,7 @@ struct ToAny {
 
 struct AnyProxy : public ProxyTemplate<ToAny, boost::any> {};
 
-BOOST_AUTO_TEST_CASE(testAnyProxy) {
+QPID_AUTO_TEST_CASE(testAnyProxy) {
     AnyProxy p;
     boost::any a=p.connectionTune(1,2,3,4);
     BOOST_CHECK_EQUAL(a.type().name(), typeid(connection::Tune).name());
diff --git a/cpp/src/tests/amqp_0_10/apply.cpp b/cpp/src/tests/amqp_0_10/apply.cpp
index 450aeac356..5a67c28c79 100644
--- a/cpp/src/tests/amqp_0_10/apply.cpp
+++ b/cpp/src/tests/amqp_0_10/apply.cpp
@@ -48,7 +48,7 @@ struct TestFunctor {
     bool operator()(const T&) { return false; }
 };
 
-BOOST_AUTO_TEST_CASE(testApply) {
+QPID_AUTO_TEST_CASE(testApply) {
     connection::Tune tune(1,2,3,4);
     Control* p = &tune;
 
@@ -83,7 +83,7 @@ struct VoidTestFunctor {
     void operator()(const T&) { code=0xFF; }
 };
 
-BOOST_AUTO_TEST_CASE(testApplyVoid) {
+QPID_AUTO_TEST_CASE(testApplyVoid) {
     connection::Tune tune(1,2,3,4);
     Control* p = &tune;
     VoidTestFunctor tf;
diff --git a/cpp/src/tests/amqp_0_10/handlers.cpp b/cpp/src/tests/amqp_0_10/handlers.cpp
index 035429a15d..428643c802 100644
--- a/cpp/src/tests/amqp_0_10/handlers.cpp
+++ b/cpp/src/tests/amqp_0_10/handlers.cpp
@@ -92,7 +92,7 @@ struct TestUnitHandler : public boost::static_visitor<void> {
     void operator()(const CommandHolder& c) { c.invoke(handler); }
 };
 
-BOOST_AUTO_TEST_CASE(testHandlers) {
+QPID_AUTO_TEST_CASE(testHandlers) {
     TestUnitHandler handler;
     Unit u;
 
diff --git a/cpp/src/tests/amqp_0_10/serialize.cpp b/cpp/src/tests/amqp_0_10/serialize.cpp
index f978609dd7..901779d8a3 100644
--- a/cpp/src/tests/amqp_0_10/serialize.cpp
+++ b/cpp/src/tests/amqp_0_10/serialize.cpp
@@ -83,7 +83,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 
 // FIXME aconway 2008-04-15: 
 // // TODO aconway 2008-02-20: should test 64 bit integrals for order also.
-// BOOST_AUTO_TEST_CASE(testNetworkByteOrder) {
+// QPID_AUTO_TEST_CASE(testNetworkByteOrder) {
 //     string data;
 
 //     uint32_t l = 0x11223344;
@@ -99,7 +99,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 //     BOOST_CHECK_EQUAL(s, s2);
 // }
 
-// BOOST_AUTO_TEST_CASE(testSetLimit) {
+// QPID_AUTO_TEST_CASE(testSetLimit) {
 //     typedef Codec::Encoder<back_insert_iterator<string> > Encoder;
 //     string data;
 //     Encoder encode(back_inserter(data), 3);
@@ -111,7 +111,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 //     BOOST_CHECK_EQUAL(data, "123");
 // }
 
-// BOOST_AUTO_TEST_CASE(testScopedLimit) {
+// QPID_AUTO_TEST_CASE(testScopedLimit) {
 //     typedef Codec::Encoder<back_insert_iterator<string> > Encoder;
 //     string data;
 //     Encoder encode(back_inserter(data), 10);
@@ -153,7 +153,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 // void testValue(Map& m) { m["s"] = Str8("foobar"); m["b"] = true; m["c"] = uint16_t(42); }
 
 // //typedef mpl::vector<Str8, Str16>::type TestTypes;
-// BOOST_AUTO_TEST_CASE_TEMPLATE(testEncodeDecode, T, AllTypes)
+// QPID_AUTO_TEST_CASE_TEMPLATE(testEncodeDecode, T, AllTypes)
 // {
 //     string data;
 //     T t;
@@ -178,7 +178,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 //     template <class S> void serialize(S& s) { s.split(*this); }
 // };
 
-// BOOST_AUTO_TEST_CASE(testSplit) {
+// QPID_AUTO_TEST_CASE(testSplit) {
 //     string data;
 //     TestMe t1('x');
 //     Codec::encode(std::back_inserter(data))(t1);
@@ -193,7 +193,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 //     BOOST_CHECK_EQUAL(t2.value, 'x');
 // }
 
-// BOOST_AUTO_TEST_CASE(testControlEncodeDecode) {
+// QPID_AUTO_TEST_CASE(testControlEncodeDecode) {
 //     string data;
 //     Control::Holder h(in_place<connection::Tune>(1,2,3,4));
 //     Codec::encode(std::back_inserter(data))(h);
@@ -214,7 +214,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 //     BOOST_CHECK_EQUAL(tune.heartbeatMax, 4u);
 // }
 
-// BOOST_AUTO_TEST_CASE(testStruct32) {
+// QPID_AUTO_TEST_CASE(testStruct32) {
 //     message::DeliveryProperties dp;
 //     dp.priority=message::MEDIUM;
 //     dp.routingKey="foo";
@@ -236,7 +236,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 //     BOOST_CHECK_EQUAL(dp2->routingKey, "foo");
 // }
 
-// BOOST_AUTO_TEST_CASE(testStruct32Unknown) {
+// QPID_AUTO_TEST_CASE(testStruct32Unknown) {
 //     // Verify we can recode an unknown struct unchanged.
 //     Struct32 s;
 //     string data;
@@ -260,7 +260,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 
 // Packer<DummyPacked> serializable(DummyPacked& d) { return Packer<DummyPacked>(d); }
 
-// BOOST_AUTO_TEST_CASE(testPackBits) {
+// QPID_AUTO_TEST_CASE(testPackBits) {
 //     DummyPacked d('a','b','c');
 //     BOOST_CHECK_EQUAL(packBits(d), 7u);
 //     d.j = boost::none;
@@ -270,7 +270,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 // }
 
 
-// BOOST_AUTO_TEST_CASE(testPacked) {
+// QPID_AUTO_TEST_CASE(testPacked) {
 //     string data;
 
 //     Codec::encode(back_inserter(data))('a')(boost::optional<char>('b'))(boost::optional<char>())('c');
@@ -297,7 +297,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 //     BOOST_CHECK_EQUAL(dummy.k, 'y');
 // }
 
-// BOOST_AUTO_TEST_CASE(testUnitControl) {
+// QPID_AUTO_TEST_CASE(testUnitControl) {
 //     string data;
 //     Control::Holder h(in_place<connection::Tune>(1,2,3,4));
 //     Codec::encode(std::back_inserter(data))(h);
@@ -313,7 +313,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 //     BOOST_CHECK_EQUAL(data, data2);
 // }
 
-// BOOST_AUTO_TEST_CASE(testArray) {
+// QPID_AUTO_TEST_CASE(testArray) {
 //     ArrayDomain<char> a;
 //     a.resize(3, 'x');
 //     string data;
@@ -338,7 +338,7 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 //     BOOST_CHECK_EQUAL(data,data2);
 // }
 
-// BOOST_AUTO_TEST_CASE(testStruct) {
+// QPID_AUTO_TEST_CASE(testStruct) {
 //     string data;
 
 //     message::DeliveryProperties dp;
@@ -420,7 +420,7 @@ struct RecodeUnit {
     }
 };
 
-BOOST_AUTO_TEST_CASE(testSerializeAllSegmentTypes) {
+QPID_AUTO_TEST_CASE(testSerializeAllSegmentTypes) {
     RecodeUnit recode;
     allSegmentTypes(recode);
 }