X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fplatform%2Fposix%2Fserversocket.cpp;h=c708a9967e99d6e5a64699fb6c352d68846948c9;hb=103eb041ef46f322b3c374da47feabab6c378004;hp=dce13d36023dff9e1dde41617c0b8fc7335e45f3;hpb=f7115044597c427b5bfb86fe0dec6436ed2752ac;p=deb_libcec.git

diff --git a/src/lib/platform/posix/serversocket.cpp b/src/lib/platform/posix/serversocket.cpp
index dce13d3..c708a99 100644
--- a/src/lib/platform/posix/serversocket.cpp
+++ b/src/lib/platform/posix/serversocket.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libCEC(R) library.
  *
- * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -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;
 }