Merge branch 'master' of github.com:edubart/otclient

CMakeLists.txt

@@ -22,7 +22,7 @@ MESSAGE(STATUS "BUILD TYPE: " ${CMAKE_BUILD_TYPE})
 
 # setup compiler options
 IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(CMAKE_CXX_FLAGS "-Wall -Wextra -Werror -Wno-unused-parameter -std=c++0x")
+    SET(CMAKE_CXX_FLAGS "-Wall -Wextra -Werror -Wno-unused-parameter -std=gnu++0x")
     SET(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -ggdb -fno-inline")
     SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wl,-s")
     SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")

src/framework/net/protocol.cpp

@@ -27,11 +27,11 @@
 Protocol::Protocol()
 {
     m_connection = g_connections.createConnection();
-    m_connection->setErrorCallback(
+    /*m_connection->setErrorCallback(
         [this](const boost::system::error_code& error, const std::string& msg){
             this->onError(error, msg);
         }
-    );
+    );*/
 }
 
 void Protocol::send(NetworkMessagePtr networkMessage, Connection::ConnectionCallback onSend)

src/framework/util/logger.cpp

@@ -21,7 +21,6 @@
  * THE SOFTWARE.
  */
 
-
 #include "logger.h"
 #include "util.h"
 

src/framework/util/util.cpp

@@ -21,7 +21,6 @@
  * THE SOFTWARE.
  */
 
-
 #include "util.h"
 #include <cstdio>