Merge pull request #280
2ff0d75
Fix missing virtual destructor (Sergey Kazenyuk)eb565a1
Suppress 'register storage class is deprecated' warning in boost dependency library (Sergey Kazenyuk)
This commit is contained in:
commit
ec5eca699d
|
@ -213,7 +213,7 @@ else()
|
||||||
else()
|
else()
|
||||||
set(ARCH_FLAG "-march=${ARCH}")
|
set(ARCH_FLAG "-march=${ARCH}")
|
||||||
endif()
|
endif()
|
||||||
set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=strict-aliasing -Wno-error=type-limits -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
|
set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=strict-aliasing -Wno-error=type-limits -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized -Wno-deprecated-register")
|
||||||
if(NOT MINGW)
|
if(NOT MINGW)
|
||||||
set(WARNINGS "${WARNINGS} -Werror") # to allow pedantic but not stop compilation
|
set(WARNINGS "${WARNINGS} -Werror") # to allow pedantic but not stop compilation
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -82,15 +82,16 @@ namespace nodetool
|
||||||
|
|
||||||
node_server(t_payload_net_handler& payload_handler)
|
node_server(t_payload_net_handler& payload_handler)
|
||||||
:m_payload_handler(payload_handler),
|
:m_payload_handler(payload_handler),
|
||||||
|
m_current_number_of_out_peers(0),
|
||||||
m_allow_local_ip(false),
|
m_allow_local_ip(false),
|
||||||
m_no_igd(false),
|
|
||||||
m_hide_my_port(false),
|
m_hide_my_port(false),
|
||||||
|
m_no_igd(false),
|
||||||
|
m_save_graph(false),
|
||||||
|
is_closing(false),
|
||||||
m_net_server( epee::net_utils::e_connection_type_P2P ) // this is a P2P connection of the main p2p node server, because this is class node_server<>
|
m_net_server( epee::net_utils::e_connection_type_P2P ) // this is a P2P connection of the main p2p node server, because this is class node_server<>
|
||||||
{
|
{}
|
||||||
m_current_number_of_out_peers = 0;
|
virtual ~node_server()
|
||||||
m_save_graph = false;
|
{}
|
||||||
is_closing = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void init_options(boost::program_options::options_description& desc);
|
static void init_options(boost::program_options::options_description& desc);
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,6 @@ namespace nodetool
|
||||||
|
|
||||||
const command_line::arg_descriptor<bool> arg_save_graph = {"save-graph", "Save data for dr monero", false};
|
const command_line::arg_descriptor<bool> arg_save_graph = {"save-graph", "Save data for dr monero", false};
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------------
|
||||||
template<class t_payload_net_handler>
|
template<class t_payload_net_handler>
|
||||||
void node_server<t_payload_net_handler>::init_options(boost::program_options::options_description& desc)
|
void node_server<t_payload_net_handler>::init_options(boost::program_options::options_description& desc)
|
||||||
|
|
Loading…
Reference in New Issue