svn commit: r593726 - in /incubator/qpid/trunk/qpid/cpp/src: qpid/framing/AMQHeaderBody.h tests/MessageTest.cpp tests/TxAckTest.cpp tests/TxPublishTest.cpp tests/perftest.cpp

[aconway]

Author: aconway
Date: Fri Nov  9 18:52:57 2007
New Revision: 593726

URL: http://svn.apache.org/viewvc?rev=593726&view=rev
Log:
Add DeliveryMode enum to AMQHeaderBody.h, remove from tests.

Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
    incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h?rev=593726&r1=593725&r2=593726&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h Fri Nov  9 
18:52:57 2007
@@ -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; };

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp?rev=593726&r1=593725&r2=593726&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp Fri Nov  9 18:52:57 
2007
@@ -33,8 +33,6 @@
 using namespace qpid::framing;
 
 
-enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2};
-
 class MessageTest : public CppUnit::TestCase  
 {
     CPPUNIT_TEST_SUITE(MessageTest);

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp?rev=593726&r1=593725&r2=593726&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp Fri Nov  9 18:52:57 
2007
@@ -32,8 +32,6 @@
 using namespace qpid::broker;
 using namespace qpid::framing;
 
-enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2};
-
 class TxAckTest : public CppUnit::TestCase  
 {
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp?rev=593726&r1=593725&r2=593726&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp Fri Nov  9 
18:52:57 2007
@@ -34,8 +34,6 @@
 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;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp?rev=593726&r1=593725&r2=593726&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp Fri Nov  9 18:52:57 
2007
@@ -35,8 +35,6 @@
 using namespace client;
 using namespace sys;
 
-enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2};
-
 struct Opts : public TestOptions {
 
     bool listen;
@@ -167,7 +165,7 @@
         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;