Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move to C++14

Browse source 
Replaces a single reset with make_unique to see if things compile in CI. Also reverts a CI-specific RPATH change which prevented the wallet from running on macOS dev machines
This commit is contained in:
cryptocode 2018-03-01 16:32:48 +01:00 • committed by androm3da
commit fe8d6e9760
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -7,12 +7,8 @@ set (CPACK_PACKAGE_VERSION_PATCH "1")
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
else()
set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib:\$ORIGIN/")
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
endif()
set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib:\$ORIGIN/")
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set (RAIBLOCKS_GUI OFF CACHE BOOL "")
set (RAIBLOCKS_TEST OFF CACHE BOOL "")
@ -70,7 +66,7 @@ endif (WIN32)
if (WIN32)
set (PLATFORM_CXX_FLAGS "/bigobj")
else (WIN32)
set (PLATFORM_CXX_FLAGS "-std=c++11")
set (PLATFORM_CXX_FLAGS "-std=c++14")
endif (WIN32)
if (WIN32)

2
rai/rai_node/daemon.cpp
View file

@ -124,7 +124,7 @@ void rai_daemon::daemon::run (boost::filesystem::path const & data_path)
{
rpc->start ();
}
runner.reset (new rai::thread_runner (service, node->config.io_threads));
runner = std::make_unique<rai::thread_runner> (service, node->config.io_threads);
runner->join ();
}
else