diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-06-28 09:14:52 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-06-28 09:14:52 +0000 |
| commit | 01b8ef15ad7826f42790868d94402332596a4403 (patch) | |
| tree | 65ea28a9eb5fcb556249a5ae6702f6c469727947 /qpid/cpp/src/tests/ReplicationTest.cpp | |
| parent | 15874225f863757fde6c078da7079592c534b60b (diff) | |
| parent | 83c220a465faba7fa61c44dd69e7aef497083553 (diff) | |
| download | qpid-python-01b8ef15ad7826f42790868d94402332596a4403.tar.gz | |
merge non-java changes from trunk up to r1353860
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-config-and-management@1354874 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/ReplicationTest.cpp')
| -rw-r--r-- | qpid/cpp/src/tests/ReplicationTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<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); |