Author: astitcher Date: 2009-07-30 10:06:48 -0400 (Thu, 30 Jul 2009) New Revision: 3527 Modified: store/trunk/cpp/tests/OrderingTest.cpp store/trunk/cpp/tests/SimpleTest.cpp store/trunk/cpp/tests/TransactionalTest.cpp store/trunk/cpp/tests/TwoPhaseCommitTest.cpp Log: Change Timer references to sys::Timer as they have changed in the broker Modified: store/trunk/cpp/tests/OrderingTest.cpp =================================================================== --- store/trunk/cpp/tests/OrderingTest.cpp 2009-07-29 19:22:31 UTC (rev 3526) +++ store/trunk/cpp/tests/OrderingTest.cpp 2009-07-30 14:06:48 UTC (rev 3527) @@ -37,6 +37,7 @@ opts.selectors.push_back(level); \ qpid::log::Logger::instance().configure(opts); +using namespace qpid; using namespace qpid::broker; using namespace qpid::framing; using namespace mrg::msgstore; @@ -102,7 +103,7 @@ store->init(test_dir, 4, 1, 8); ExchangeRegistry exchanges; LinkRegistry links; - Timer t; + sys::Timer t; DtxManager mgr(t); mgr.setStore (store.get()); RecoveryManagerImpl recoveryMgr(queues, exchanges, links, mgr, 0); Modified: store/trunk/cpp/tests/SimpleTest.cpp =================================================================== --- store/trunk/cpp/tests/SimpleTest.cpp 2009-07-29 19:22:31 UTC (rev 3526) +++ store/trunk/cpp/tests/SimpleTest.cpp 2009-07-30 14:06:48 UTC (rev 3527) @@ -67,7 +67,7 @@ void recover(MessageStoreImpl& store, QueueRegistry& queues, ExchangeRegistry& exchanges, LinkRegistry& links) { - Timer t; + sys::Timer t; DtxManager mgr(t); mgr.setStore (&store); RecoveryManagerImpl recovery(queues, exchanges, links, mgr, 0); @@ -419,7 +419,7 @@ registry.setStore (&store); ExchangeRegistry exchanges; LinkRegistry links; - Timer t; + sys::Timer t; DtxManager dtx(t); dtx.setStore (&store); RecoveryManagerImpl recovery(registry, exchanges, links, dtx, 10); Modified: store/trunk/cpp/tests/TransactionalTest.cpp =================================================================== --- store/trunk/cpp/tests/TransactionalTest.cpp 2009-07-29 19:22:31 UTC (rev 3526) +++ store/trunk/cpp/tests/TransactionalTest.cpp 2009-07-30 14:06:48 UTC (rev 3527) @@ -39,6 +39,7 @@ qpid::log::Logger::instance().configure(opts); using namespace mrg::msgstore; +using namespace qpid; using namespace qpid::broker; using namespace qpid::framing; using namespace std; @@ -132,7 +133,7 @@ queues = std::auto_ptr<QueueRegistry>(new QueueRegistry); ExchangeRegistry exchanges; LinkRegistry links; - Timer t; + sys::Timer t; DtxManager mgr(t); mgr.setStore (store.get()); RecoveryManagerImpl recovery(*queues, exchanges, links, mgr, 0); Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp =================================================================== --- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2009-07-29 19:22:31 UTC (rev 3526) +++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2009-07-30 14:06:48 UTC (rev 3527) @@ -40,6 +40,7 @@ qpid::log::Logger::instance().configure(opts); using namespace mrg::msgstore; +using namespace qpid; using namespace qpid::broker; using namespace qpid::framing; using namespace std; @@ -355,7 +356,7 @@ store = std::auto_ptr<T>(new T()); store->init(test_dir, 4, 1, 8); - Timer t; + sys::Timer t; ExchangeRegistry exchanges; queues = std::auto_ptr<QueueRegistry>(new QueueRegistry); links = std::auto_ptr<LinkRegistry>(new LinkRegistry);