Add DeliveryMode enum to AMQHeaderBody.h, remove from tests.

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

5 files changed, 3 insertions, 9 deletions

diff --git a/qpid/cpp/src/qpid/framing/AMQHeaderBody.h b/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
index 1cc9d80ea1..7aa6a2c334 100644
--- a/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
@@ -34,6 +34,8 @@
 namespace qpid {
 namespace framing {
 
+enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2};
+
 class AMQHeaderBody :  public AMQBody
 {
     template <class T> struct OptProps { boost::optional<T> props; };
diff --git a/qpid/cpp/src/tests/MessageTest.cpp b/qpid/cpp/src/tests/MessageTest.cpp
index 7e13595141..3d3de5e9d0 100644
--- a/qpid/cpp/src/tests/MessageTest.cpp
+++ b/qpid/cpp/src/tests/MessageTest.cpp
@@ -33,8 +33,6 @@ using namespace qpid::broker;
 using namespace qpid::framing;
 
 
-enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2};
-
 class MessageTest : public CppUnit::TestCase  
 {
     CPPUNIT_TEST_SUITE(MessageTest);
diff --git a/qpid/cpp/src/tests/TxAckTest.cpp b/qpid/cpp/src/tests/TxAckTest.cpp
index de3355949d..dd57736a0c 100644
--- a/qpid/cpp/src/tests/TxAckTest.cpp
+++ b/qpid/cpp/src/tests/TxAckTest.cpp
@@ -32,8 +32,6 @@ using std::vector;
 using namespace qpid::broker;
 using namespace qpid::framing;
 
-enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2};
-
 class TxAckTest : public CppUnit::TestCase  
 {
 
diff --git a/qpid/cpp/src/tests/TxPublishTest.cpp b/qpid/cpp/src/tests/TxPublishTest.cpp
index 73030516d9..4ec526f207 100644
--- a/qpid/cpp/src/tests/TxPublishTest.cpp
+++ b/qpid/cpp/src/tests/TxPublishTest.cpp
@@ -34,8 +34,6 @@ using std::vector;
 using namespace qpid::broker;
 using namespace qpid::framing;
 
-enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2};
-
 class TxPublishTest : public CppUnit::TestCase  
 {
     typedef std::pair<string, PersistableMessage*> msg_queue_pair;
diff --git a/qpid/cpp/src/tests/perftest.cpp b/qpid/cpp/src/tests/perftest.cpp
index e311f0fcd2..8d970a0a6f 100644
--- a/qpid/cpp/src/tests/perftest.cpp
+++ b/qpid/cpp/src/tests/perftest.cpp
@@ -35,8 +35,6 @@ using namespace qpid;
 using namespace client;
 using namespace sys;
 
-enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2};
-
 struct Opts : public TestOptions {
 
     bool listen;
@@ -167,7 +165,7 @@ void PublishThread::run() {
         Message msg(string(msgSize, 'X'), "perftest");
         char* msgBuf = const_cast<char*>(msg.getData().data());
         if (opts.durable)
-	    msg.getDeliveryProperties().setDeliveryMode(PERSISTENT);
+	    msg.getDeliveryProperties().setDeliveryMode(framing::PERSISTENT);
         // Time sending message.
         AbsTime start=now();
         if (!opts.summary) cout << "Publishing " << opts.count << " messages " << flush;