Merged branch master into master
This commit is contained in:
commit
5c021761a8
@ -6,7 +6,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake_mo
|
||||
|
||||
#User options
|
||||
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)
|
||||
FIND_PACKAGE(MBEDTLS)
|
||||
@ -77,4 +77,4 @@ install(
|
||||
install(
|
||||
DIRECTORY include
|
||||
DESTINATION .
|
||||
)
|
||||
)
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
#include <vector>
|
||||
#include "NetworkEncoding.h"
|
||||
#include "Packetable.h"
|
||||
|
||||
@ -16,7 +16,6 @@ namespace fr
|
||||
class SocketReactor
|
||||
{
|
||||
public:
|
||||
SocketReactor() noexcept = default;
|
||||
SocketReactor(const SocketReactor&)=delete;
|
||||
SocketReactor(SocketReactor&&) noexcept = default;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user