Mercurial > code
changeset 260:2096edb63a4f
Socket: fix Windows
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Sun, 05 Oct 2014 13:13:08 +0200 |
| parents | 0b3fcc5ed8eb |
| children | 0c7bc55e0d36 |
| files | C++/Socket.cpp C++/SocketAddress.h C++/Tests/Sockets/CMakeLists.txt C++/Tests/Sockets/main.cpp |
| diffstat | 4 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/C++/Socket.cpp Sun Oct 05 11:48:39 2014 +0200 +++ b/C++/Socket.cpp Sun Oct 05 13:13:08 2014 +0200 @@ -83,7 +83,7 @@ if (str) { - errmsg = string(str); + errmsg = std::string(str); LocalFree(str); }
--- a/C++/SocketAddress.h Sun Oct 05 11:48:39 2014 +0200 +++ b/C++/SocketAddress.h Sun Oct 05 13:13:08 2014 +0200 @@ -127,8 +127,8 @@ Unix(const std::string &path, bool rm = false); }; +#endif // ! !_WIN32 + } // !address -#endif // ! !_WIN32 - #endif // !_SOCKET_ADDRESS_H_
--- a/C++/Tests/Sockets/CMakeLists.txt Sun Oct 05 11:48:39 2014 +0200 +++ b/C++/Tests/Sockets/CMakeLists.txt Sun Oct 05 13:13:08 2014 +0200 @@ -28,3 +28,7 @@ ) define_test(socket "${SOURCES}") + +if (WIN32) + target_link_libraries(socket ws2_32) +endif ()
--- a/C++/Tests/Sockets/main.cpp Sun Oct 05 11:48:39 2014 +0200 +++ b/C++/Tests/Sockets/main.cpp Sun Oct 05 13:13:08 2014 +0200 @@ -598,8 +598,12 @@ int main(int argc, char **argv) { Socket::init(); + testing::InitGoogleTest(&argc, argv); + + auto ret = RUN_ALL_TESTS(); + Socket::finish(); - return RUN_ALL_TESTS(); + return ret; }