From 351b9822649f305fc270c30e3c6db6b81761d984 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Fri, 18 May 2012 22:05:11 +0000 Subject: QPID-4005: Eliminate "using" especially "using namespace" from header file git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1340276 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/ReplicationTest.cpp | 4 ++-- qpid/cpp/src/tests/txjob.cpp | 6 +++--- qpid/cpp/src/tests/txshift.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/tests/ReplicationTest.cpp b/qpid/cpp/src/tests/ReplicationTest.cpp index 1219a6b59e..055f06579f 100644 --- a/qpid/cpp/src/tests/ReplicationTest.cpp +++ b/qpid/cpp/src/tests/ReplicationTest.cpp @@ -62,7 +62,7 @@ qpid::sys::Shlib plugin(getLibPath("REPLICATING_LISTENER_LIB", default_shlib)); qpid::broker::Broker::Options getBrokerOpts(const std::vector& args) { std::vector argv(args.size()); - transform(args.begin(), args.end(), argv.begin(), boost::bind(&string::c_str, _1)); + transform(args.begin(), args.end(), argv.begin(), boost::bind(&std::string::c_str, _1)); qpid::broker::Broker::Options opts; qpid::Plugin::addOptions(opts); @@ -72,7 +72,7 @@ qpid::broker::Broker::Options getBrokerOpts(const std::vector& args QPID_AUTO_TEST_CASE(testReplicationExchange) { - qpid::broker::Broker::Options brokerOpts(getBrokerOpts(list_of("qpidd") + qpid::broker::Broker::Options brokerOpts(getBrokerOpts(list_of("qpidd") ("--replication-exchange-name=qpid.replication"))); SessionFixture f(brokerOpts); diff --git a/qpid/cpp/src/tests/txjob.cpp b/qpid/cpp/src/tests/txjob.cpp index a7a905c1b7..29394c3415 100644 --- a/qpid/cpp/src/tests/txjob.cpp +++ b/qpid/cpp/src/tests/txjob.cpp @@ -38,9 +38,9 @@ namespace tests { struct Args : public qpid::TestOptions { - string workQueue; - string source; - string dest; + std::string workQueue; + std::string source; + std::string dest; uint messages; uint jobs; bool quit; diff --git a/qpid/cpp/src/tests/txshift.cpp b/qpid/cpp/src/tests/txshift.cpp index 882d3716d8..bf85bee986 100644 --- a/qpid/cpp/src/tests/txshift.cpp +++ b/qpid/cpp/src/tests/txshift.cpp @@ -39,7 +39,7 @@ namespace tests { struct Args : public qpid::TestOptions { - string workQueue; + std::string workQueue; size_t workers; Args() : workQueue("txshift-control"), workers(1) -- cgit v1.2.1