repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unused warning
[deb_libcec.git]
/
src
/
lib
/
platform
/
posix
/
serversocket.cpp
diff --git
a/src/lib/platform/posix/serversocket.cpp
b/src/lib/platform/posix/serversocket.cpp
index dce13d36023dff9e1dde41617c0b8fc7335e45f3..c708a9967e99d6e5a64699fb6c352d68846948c9 100644
(file)
--- 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.
*
/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011-201
2
Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-201
3
Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
* 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/
*/
* 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;
using namespace std;
using namespace PLATFORM;
@@
-103,10
+103,10
@@
bool CTcpServerSocket::IsOpen(void)
return m_socket != INVALID_SOCKET_VALUE;
}
return m_socket != INVALID_SOCKET_VALUE;
}
-
CStdS
tring CTcpServerSocket::GetError(void)
+
std::s
tring CTcpServerSocket::GetError(void)
{
{
-
CStdS
tring strError;
- strError = m_strError.
IsE
mpty() && m_iError != 0 ? strerror(m_iError) : m_strError;
+
std::s
tring strError;
+ strError = m_strError.
e
mpty() && m_iError != 0 ? strerror(m_iError) : m_strError;
return strError;
}
return strError;
}
@@
-115,9
+115,9
@@
int CTcpServerSocket::GetErrorNumber(void)
return m_iError;
}
return m_iError;
}
-
CStdS
tring CTcpServerSocket::GetName(void)
+
std::s
tring CTcpServerSocket::GetName(void)
{
{
-
CStdS
tring strName("localhost");
+
std::s
tring strName("localhost");
return strName;
}
return strName;
}