summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/tests/ReplicationTest.cpp4
-rw-r--r--cpp/src/tests/txjob.cpp6
-rw-r--r--cpp/src/tests/txshift.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/tests/ReplicationTest.cpp b/cpp/src/tests/ReplicationTest.cpp
index 1219a6b59e..055f06579f 100644
--- a/cpp/src/tests/ReplicationTest.cpp
+++ b/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<std::string>& args)
{
std::vector<const char*> 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<std::string>& args
QPID_AUTO_TEST_CASE(testReplicationExchange)
{
- qpid::broker::Broker::Options brokerOpts(getBrokerOpts(list_of<string>("qpidd")
+ qpid::broker::Broker::Options brokerOpts(getBrokerOpts(list_of<std::string>("qpidd")
("--replication-exchange-name=qpid.replication")));
SessionFixture f(brokerOpts);
diff --git a/cpp/src/tests/txjob.cpp b/cpp/src/tests/txjob.cpp
index a7a905c1b7..29394c3415 100644
--- a/cpp/src/tests/txjob.cpp
+++ b/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/cpp/src/tests/txshift.cpp b/cpp/src/tests/txshift.cpp
index 882d3716d8..bf85bee986 100644
--- a/cpp/src/tests/txshift.cpp
+++ b/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)