Commit 686608fd authored by Shervin Nourbakhsh's avatar Shervin Nourbakhsh
Browse files

Merge commit 'ee5177b7'

parents 5c6fbaaf ee5177b7
/target/
/bin/
/.settings/
build/
\ No newline at end of file
......@@ -18,12 +18,6 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
#set(BUILD_SHARED_LIBS True)
endif()
if(NOT DEFINED CMAKE_CXX_STANDARD)
# specify the C++ standard
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED True)
endif()
# fix the RPATH for the linker
#if(not APPLE)
......@@ -70,7 +64,7 @@ target_include_directories(cameo
SYSTEM PRIVATE ${Rapidjson_INCLUDE_DIRS}/
)
#target_include_directories(cameo PRIVATE ${DOCTEST_INCLUDE_DIR})
#target_compile_features(cameo PUBLIC cxx_std_11)
target_compile_features(cameo PUBLIC cxx_std_17)
set_target_properties(cameo PROPERTIES
SOVERSION ${PROJECT_VERSION_MAJOR}
......
......@@ -31,7 +31,8 @@
using namespace std;
namespace cameo {
constexpr int defaultTimeout = 10000;
void Server::initServer(const Endpoint& endpoint, int timeoutMs) {
Services::init();
......@@ -117,7 +118,7 @@ int Server::getAvailableTimeout() const {
return timeout;
}
else {
return 10000;
return defaultTimeout;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment