Tidied up namespace usage

Miscelleneous whitespace fixes

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

1 files changed, 14 insertions, 9 deletions

diff --git a/qpid/cpp/src/tests/TxPublishTest.cpp b/qpid/cpp/src/tests/TxPublishTest.cpp
index 63dbf99266..fabb01b864 100644
--- a/qpid/cpp/src/tests/TxPublishTest.cpp
+++ b/qpid/cpp/src/tests/TxPublishTest.cpp
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -35,30 +35,33 @@ using boost::intrusive_ptr;
 using namespace qpid::broker;
 using namespace qpid::framing;
 
+namespace qpid {
+namespace tests {
+
 struct TxPublishTest
 {
-    
+
     TestMessageStore store;
     Queue::shared_ptr queue1;
     Queue::shared_ptr queue2;
     intrusive_ptr<Message> msg;
     TxPublish op;
-    
+
     TxPublishTest() :
-        queue1(new Queue("queue1", false, &store, 0)), 
-        queue2(new Queue("queue2", false, &store, 0)), 
+        queue1(new Queue("queue1", false, &store, 0)),
+        queue2(new Queue("queue2", false, &store, 0)),
         msg(MessageUtils::createMessage("exchange", "routing_key", "id")),
         op(msg)
     {
         msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT);
         op.deliverTo(queue1);
         op.deliverTo(queue2);
-    }      
+    }
 };
 
 
 QPID_AUTO_TEST_SUITE(TxPublishTestSuite)
-    
+
 QPID_AUTO_TEST_CASE(testPrepare)
 {
     TxPublishTest t;
@@ -88,7 +91,9 @@ QPID_AUTO_TEST_CASE(testCommit)
     BOOST_CHECK_EQUAL(t.msg, msg_dequeue);
 
     BOOST_CHECK_EQUAL((uint32_t) 1, t.queue2->getMessageCount());
-    BOOST_CHECK_EQUAL(t.msg, t.queue2->get().payload);            
+    BOOST_CHECK_EQUAL(t.msg, t.queue2->get().payload);
 }
 
 QPID_AUTO_TEST_SUITE_END()
+
+}} // namespace qpid::tests