rexy712/frnetlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged branch master into master

Browse Source
This commit is contained in:
Cloaked9000 2017-02-02 11:51:43 +00:00
commit 5c021761a8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -6,7 +6,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake_mo
#User options #User options
option(USE_SSL "Use SSL" ON) option(USE_SSL "Use SSL" ON)
set(FRNETLIB_BUILD_SHARED_LIBS true CACHE BOOL "Build shared library.") set(FRNETLIB_BUILD_SHARED_LIBS false CACHE BOOL "Build shared library.")
if(USE_SSL) if(USE_SSL)
FIND_PACKAGE(MBEDTLS) FIND_PACKAGE(MBEDTLS)
@ -77,4 +77,4 @@ install(
install( install(
DIRECTORY include DIRECTORY include
DESTINATION . DESTINATION .
) )

1
include/frnetlib/Packet.h
View File

@ -7,6 +7,7 @@
#include <string> #include <string>
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
#include <stdexcept>
#include <vector> #include <vector>
#include "NetworkEncoding.h" #include "NetworkEncoding.h"
#include "Packetable.h" #include "Packetable.h"

1
include/frnetlib/SocketReactor.h
View File

@ -16,7 +16,6 @@ namespace fr
class SocketReactor class SocketReactor
{ {
public: public:
SocketReactor() noexcept = default;
SocketReactor(const SocketReactor&)=delete; SocketReactor(const SocketReactor&)=delete;
SocketReactor(SocketReactor&&) noexcept = default; SocketReactor(SocketReactor&&) noexcept = default;