X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fplatform%2Fposix%2Fserversocket.cpp;h=30d80eea6ca0bd5324d017e90c8810cc824b6571;hb=2b44051cbfa70deafc30d9767323214debbc1a75;hp=dce13d36023dff9e1dde41617c0b8fc7335e45f3;hpb=ebefc26c10d68ba9ced2a30c896dccc81c6c2eeb;p=deb_libcec.git diff --git a/src/lib/platform/posix/serversocket.cpp b/src/lib/platform/posix/serversocket.cpp index dce13d3..30d80ee 100644 --- a/src/lib/platform/posix/serversocket.cpp +++ b/src/lib/platform/posix/serversocket.cpp @@ -30,9 +30,9 @@ * http://www.pulse-eight.net/ */ -#include "../os.h" -#include "../sockets/tcp.h" -#include "../sockets/serversocket.h" +#include "env.h" +#include "lib/platform/sockets/tcp.h" +#include "lib/platform/sockets/serversocket.h" using namespace std; using namespace PLATFORM; @@ -103,10 +103,10 @@ bool CTcpServerSocket::IsOpen(void) return m_socket != INVALID_SOCKET_VALUE; } -CStdString CTcpServerSocket::GetError(void) +std::string CTcpServerSocket::GetError(void) { - CStdString strError; - strError = m_strError.IsEmpty() && m_iError != 0 ? strerror(m_iError) : m_strError; + std::string strError; + strError = m_strError.empty() && m_iError != 0 ? strerror(m_iError) : m_strError; return strError; } @@ -115,9 +115,9 @@ int CTcpServerSocket::GetErrorNumber(void) return m_iError; } -CStdString CTcpServerSocket::GetName(void) +std::string CTcpServerSocket::GetName(void) { - CStdString strName("localhost"); + std::string strName("localhost"); return strName; }