diff options
author | David Wagner <david.wagner@intel.com> | 2014-10-24 17:41:58 +0200 |
---|---|---|
committer | David Wagner <david.wagner@intel.com> | 2014-10-24 17:41:58 +0200 |
commit | d9ad02e2a322fff355cd113c5bb98ff4667a95f2 (patch) | |
tree | 7bfbb4fd253ffa8abb98f03887a4e76f1f26caaa /remote-processor/RemoteProcessorServer.cpp | |
parent | a022e315ecfede7bb37ab17382482eb794b33f00 (diff) | |
parent | d9526499d6ab53b7d13d1434f748f6f2161c2e0a (diff) | |
download | external_parameter-framework-d9ad02e2a322fff355cd113c5bb98ff4667a95f2.zip external_parameter-framework-d9ad02e2a322fff355cd113c5bb98ff4667a95f2.tar.gz external_parameter-framework-d9ad02e2a322fff355cd113c5bb98ff4667a95f2.tar.bz2 |
Merge pull request #13 from 01org/OznOg-bis
some C++ cleanup
Diffstat (limited to 'remote-processor/RemoteProcessorServer.cpp')
-rw-r--r-- | remote-processor/RemoteProcessorServer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/remote-processor/RemoteProcessorServer.cpp b/remote-processor/RemoteProcessorServer.cpp index 8c66109..dff935b 100644 --- a/remote-processor/RemoteProcessorServer.cpp +++ b/remote-processor/RemoteProcessorServer.cpp @@ -39,6 +39,8 @@ #include "AnswerMessage.h" #include "RemoteCommandHandler.h" +using std::string; + CRemoteProcessorServer::CRemoteProcessorServer(uint16_t uiPort, IRemoteCommandHandler* pCommandHandler) : _uiPort(uiPort), _pCommandHandler(pCommandHandler), _bIsStarted(false), _pListeningSocket(NULL), _ulThreadId(0) { @@ -148,7 +150,7 @@ void CRemoteProcessorServer::run() // New connection void CRemoteProcessorServer::handleNewConnection() { - const auto_ptr<CSocket> clientSocket(_pListeningSocket->accept()); + const std::auto_ptr<CSocket> clientSocket(_pListeningSocket->accept()); if (clientSocket.get() == NULL) { @@ -172,7 +174,7 @@ void CRemoteProcessorServer::handleNewConnection() switch (res) { case CRequestMessage::error: - cout << "Error while receiving message: " << strError << endl; + std::cout << "Error while receiving message: " << strError << std::endl; // fall through case CRequestMessage::peerDisconnected: // Consider peer disconnection as normal, no log @@ -209,7 +211,7 @@ void CRemoteProcessorServer::handleNewConnection() // Peer should not disconnect while waiting for an answer // Fall through to log the error and bail out case CRequestMessage::error: - cout << "Error while receiving message: " << strError << endl; + std::cout << "Error while receiving message: " << strError << std::endl; return; // Bail out case CRequestMessage::success: break; // No error, continue |