Author: kpvdr Date: 2012-05-29 11:14:32 -0400 (Tue, 29 May 2012) New Revision: 4509 Modified: store/trunk/cpp/tests/MessageUtils.h store/trunk/cpp/tests/OrderingTest.cpp Log: Solved compile problems stemming from cleanup of namespace pollution in recent qpid checkins Modified: store/trunk/cpp/tests/MessageUtils.h =================================================================== --- store/trunk/cpp/tests/MessageUtils.h 2012-05-08 15:39:54 UTC (rev 4508) +++ store/trunk/cpp/tests/MessageUtils.h 2012-05-29 15:14:32 UTC (rev 4509) @@ -31,7 +31,7 @@ struct MessageUtils { - static boost::intrusive_ptr<Message> createMessage(const string& exchange, const string& routingKey, + static boost::intrusive_ptr<Message> createMessage(const std::string& exchange, const std::string& routingKey, const Uuid& messageId=Uuid(), const bool persistent = false, const uint64_t contentSize = 0, const std::string& correlationId = std::string()) { @@ -53,7 +53,7 @@ return msg; } - static void addContent(boost::intrusive_ptr<Message> msg, const string& data) + static void addContent(boost::intrusive_ptr<Message> msg, const std::string& data) { AMQFrame content((AMQContentBody(data))); msg->getFrames().append(content); Modified: store/trunk/cpp/tests/OrderingTest.cpp =================================================================== --- store/trunk/cpp/tests/OrderingTest.cpp 2012-05-08 15:39:54 UTC (rev 4508) +++ store/trunk/cpp/tests/OrderingTest.cpp 2012-05-29 15:14:32 UTC (rev 4509) @@ -53,7 +53,7 @@ // === Helper fns === -const string name("OrderingQueue"); +const std::string name("OrderingQueue"); std::auto_ptr<MessageStoreImpl> store; QueueRegistry queues; Queue::shared_ptr queue;