diff options
Diffstat (limited to 'test/basicserver')
| -rw-r--r-- | test/basicserver/TestCommands.cpp | 9 | ||||
| -rw-r--r-- | test/basicserver/testbasicserver.cpp | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/test/basicserver/TestCommands.cpp b/test/basicserver/TestCommands.cpp index 5238819f..a0022f72 100644 --- a/test/basicserver/TestCommands.cpp +++ b/test/basicserver/TestCommands.cpp @@ -48,7 +48,8 @@ public: std::auto_ptr<TestProtocolMessage> TestProtocolGetStream::DoCommand(TestProtocolReplyable &rProtocol, TestContext &rContext) const { // make a new stream object - CollectInBufferStream *pstream = mUncertainSize?(new UncertainBufferStream):(new CollectInBufferStream); + std::auto_ptr<CollectInBufferStream> apStream( + mUncertainSize?(new UncertainBufferStream):(new CollectInBufferStream)); // Data. int values[24273]; @@ -59,14 +60,14 @@ std::auto_ptr<TestProtocolMessage> TestProtocolGetStream::DoCommand(TestProtocol { values[x] = v++; } - pstream->Write(values, sizeof(values)); + apStream->Write(values, sizeof(values)); } // Finished - pstream->SetForReading(); + apStream->SetForReading(); // Get it to be sent - rProtocol.SendStreamAfterCommand(pstream); + rProtocol.SendStreamAfterCommand((std::auto_ptr<IOStream>)apStream); return std::auto_ptr<TestProtocolMessage>(new TestProtocolGetStream(mStartingValue, mUncertainSize)); } diff --git a/test/basicserver/testbasicserver.cpp b/test/basicserver/testbasicserver.cpp index 976bdd92..5a13cb45 100644 --- a/test/basicserver/testbasicserver.cpp +++ b/test/basicserver/testbasicserver.cpp @@ -719,11 +719,13 @@ int test(int argc, const char *argv[]) // Try to send a stream { - CollectInBufferStream s; + std::auto_ptr<CollectInBufferStream> + s(new CollectInBufferStream()); char buf[1663]; - s.Write(buf, sizeof(buf)); - s.SetForReading(); - std::auto_ptr<TestProtocolGetStream> reply(protocol.QuerySendStream(0x73654353298ffLL, s)); + s->Write(buf, sizeof(buf)); + s->SetForReading(); + std::auto_ptr<TestProtocolGetStream> reply(protocol.QuerySendStream(0x73654353298ffLL, + (std::auto_ptr<IOStream>)s)); TEST_THAT(reply->GetStartingValue() == sizeof(buf)); } |