summaryrefslogtreecommitdiff
path: root/test/FtpConnectionTest.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2013-06-22 01:10:38 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2013-06-22 01:10:38 +0900
commit07d270c87e6f9184aea4ca17eb26e466712e8db2 (patch)
tree2dfbaa2e0d2ad0f38cb73098608f7d67a64320f8 /test/FtpConnectionTest.cc
parent126a4bde612eb0e6c48cf2f13ebe3eac45cc71a8 (diff)
Require -std=c++11 and use std::shared_ptr instead of SharedHandle
Diffstat (limited to 'test/FtpConnectionTest.cc')
-rw-r--r--test/FtpConnectionTest.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/FtpConnectionTest.cc b/test/FtpConnectionTest.cc
index b8291f6e..e24cd918 100644
--- a/test/FtpConnectionTest.cc
+++ b/test/FtpConnectionTest.cc
@@ -35,13 +35,13 @@ class FtpConnectionTest:public CppUnit::TestFixture {
CPPUNIT_TEST(testReceiveEpsvResponse);
CPPUNIT_TEST_SUITE_END();
private:
- SharedHandle<SocketCore> serverSocket_;
+ std::shared_ptr<SocketCore> serverSocket_;
uint16_t listenPort_;
- SharedHandle<SocketCore> clientSocket_;
- SharedHandle<FtpConnection> ftp_;
- SharedHandle<Option> option_;
- SharedHandle<AuthConfigFactory> authConfigFactory_;
- SharedHandle<Request> req_;
+ std::shared_ptr<SocketCore> clientSocket_;
+ std::shared_ptr<FtpConnection> ftp_;
+ std::shared_ptr<Option> option_;
+ std::shared_ptr<AuthConfigFactory> authConfigFactory_;
+ std::shared_ptr<Request> req_;
public:
void setUp()
{
@@ -49,7 +49,7 @@ public:
authConfigFactory_.reset(new AuthConfigFactory());
//_ftpServerSocket.reset(new SocketCore());
- SharedHandle<SocketCore> listenSocket(new SocketCore());
+ std::shared_ptr<SocketCore> listenSocket(new SocketCore());
listenSocket->bind(0);
listenSocket->beginListen();
listenSocket->setBlockingMode();
@@ -94,7 +94,7 @@ public:
CPPUNIT_TEST_SUITE_REGISTRATION(FtpConnectionTest);
namespace {
-void waitRead(const SharedHandle<SocketCore>& socket)
+void waitRead(const std::shared_ptr<SocketCore>& socket)
{
while(!socket->isReadable(0));
}