diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2012-08-03 12:13:32 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2012-08-03 12:13:32 +0000 |
| commit | d43d1912b376322e27fdcda551a73f9ff5487972 (patch) | |
| tree | ce493e10baa95f44be8beb5778ce51783463196d /cpp/src/tests/MessageBuilderTest.cpp | |
| parent | 04877fec0c6346edec67072d7f2d247740cf2af5 (diff) | |
| download | qpid-python-d43d1912b376322e27fdcda551a73f9ff5487972.tar.gz | |
QPID-3858: Updated branch - merged from trunk r.1368650
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1368910 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/MessageBuilderTest.cpp')
| -rw-r--r-- | cpp/src/tests/MessageBuilderTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/tests/MessageBuilderTest.cpp b/cpp/src/tests/MessageBuilderTest.cpp index c3d40ed88a..9adb133d40 100644 --- a/cpp/src/tests/MessageBuilderTest.cpp +++ b/cpp/src/tests/MessageBuilderTest.cpp @@ -40,7 +40,7 @@ class MockMessageStore : public NullMessageStore uint64_t id; boost::intrusive_ptr<PersistableMessage> expectedMsg; - string expectedData; + std::string expectedData; std::list<Op> ops; void checkExpectation(Op actual) @@ -58,7 +58,7 @@ class MockMessageStore : public NullMessageStore ops.push_back(STAGE); } - void expectAppendContent(PersistableMessage& msg, const string& data) + void expectAppendContent(PersistableMessage& msg, const std::string& data) { expectedMsg = &msg; expectedData = data; @@ -73,7 +73,7 @@ class MockMessageStore : public NullMessageStore } void appendContent(const boost::intrusive_ptr<const PersistableMessage>& msg, - const string& data) + const std::string& data) { checkExpectation(APPEND); BOOST_CHECK_EQUAL(boost::static_pointer_cast<const PersistableMessage>(expectedMsg), msg); |