Mercurial > code

changeset 573:db2934ac95c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Net: fix some warnings
author David Demelier <markand@malikania.fr>
date Tue, 19 Jul 2016 13:36:29 +0200
parents ad302d1b7335
children d1afc6cc5974
files CMakeLists.txt modules/net/net.hpp
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Thu Jun 30 12:35:42 2016 +0200
+++ b/CMakeLists.txt	Tue Jul 19 13:36:29 2016 +0200
@@ -22,6 +22,10 @@
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED On)
 
+if (CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS}")
+endif ()
+
 include(${code_SOURCE_DIR}/cmake/CodeDefineModule.cmake)
 
 add_subdirectory(extern)
--- a/modules/net/net.hpp	Thu Jun 30 12:35:42 2016 +0200
+++ b/modules/net/net.hpp	Tue Jul 19 13:36:29 2016 +0200
@@ -2123,7 +2123,7 @@
     void handshake()
     {
         wrap([&] () -> int {
-            SSL_do_handshake(m_ssl.get());
+            return SSL_do_handshake(m_ssl.get());
         });
     }
 
@@ -2352,7 +2352,7 @@
 
     std::memset(ret, 0, sizeof (ret));
 
-    if (!inet_ntop(AF_INET6, const_cast<in6_addr *>(&address.as<sockaddr_in6>().sin6_addr), ret, sizeof (ret)));
+    if (!inet_ntop(AF_INET6, const_cast<in6_addr *>(&address.as<sockaddr_in6>().sin6_addr), ret, sizeof (ret)))
         throw Error();
 
     return ret;