From 2bca6e9ff6f4c34ab4c165122bf9b75402481a45 Mon Sep 17 00:00:00 2001 From: Wesley Shillingford Date: Tue, 3 Nov 2020 16:10:24 +0000 Subject: [PATCH] Allow [[deprecated]] attribute (#3033) --- CMakeLists.txt | 2 +- nano/node/nodeconfig.cpp | 2 +- nano/node/nodeconfig.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef6ccc1e..7dbdef83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/nano/node/nodeconfig.cpp b/nano/node/nodeconfig.cpp index a3daba11..7ea24832 100644 --- a/nano/node/nodeconfig.cpp +++ b/nano/node/nodeconfig.cpp @@ -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; diff --git a/nano/node/nodeconfig.hpp b/nano/node/nodeconfig.hpp index 3a072a32..60c5e055 100644 --- a/nano/node/nodeconfig.hpp +++ b/nano/node/nodeconfig.hpp @@ -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;