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

Allow [[deprecated]] attribute (#3033)

Browse source
This commit is contained in:
Wesley Shillingford 2020-11-03 16:10:24 +00:00 • committed by GitHub
commit 2bca6e9ff6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -144,7 +144,7 @@ if (WIN32)
else ()
if (NANO_WARN_TO_ERR)
add_compile_options(-Werror)
add_compile_options(-Werror -Wno-deprecated-declarations)
endif ()
if ((${USING_TSAN} AND ${USING_ASAN}) OR

2
nano/node/nodeconfig.cpp
View file

@ -339,7 +339,7 @@ nano::error nano::node_config::deserialize_toml (nano::tomlconfig & toml)
auto lmdb_config_l (toml.get_required_child ("lmdb"));
lmdb_config.deserialize_toml (lmdb_config_l, is_deprecated_lmdb_dbs_used);
// Note that the lmdb config fails is both the deprecated and new setting are changed.
// Note that the lmdb config fails if both the deprecated and new setting are changed.
if (is_deprecated_lmdb_dbs_used)
{
lmdb_config.max_databases = deprecated_lmdb_max_dbs;

2
nano/node/nodeconfig.hpp
View file

@ -73,7 +73,7 @@ public:
std::string callback_address;
uint16_t callback_port{ 0 };
std::string callback_target;
int deprecated_lmdb_max_dbs{ 128 };
[[deprecated]] int deprecated_lmdb_max_dbs{ 128 };
bool allow_local_peers{ !(network_params.network.is_live_network () || network_params.network.is_test_network ()) }; // disable by default for live network
nano::stat_config stat_config;
nano::ipc::ipc_config ipc_config;