Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-28 21:06:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #291

Browse Source 
6962253 Fix compile for GCC 5.1.0 (warptangent)
This commit is contained in:
Riccardo Spagni 2015-05-26 10:45:00 +02:00
commit e042fad317
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/epee/include/storages/portable_storage.h
View File

@ -427,7 +427,7 @@ namespace epee
TRY_ENTRY(); TRY_ENTRY();
CHECK_AND_ASSERT(hsec_array, false); CHECK_AND_ASSERT(hsec_array, false);
if(hsec_array->type() != typeid(array_entry_t<section>)) if(hsec_array->type() != typeid(array_entry_t<section>))
return nullptr; return false;
array_entry_t<section>& sec_array = boost::get<array_entry_t<section>>(*hsec_array); array_entry_t<section>& sec_array = boost::get<array_entry_t<section>>(*hsec_array);
h_child_section = sec_array.get_next_val(); h_child_section = sec_array.get_next_val();
if(!h_child_section) if(!h_child_section)

6
src/p2p/net_node.inl
View File

@ -1194,6 +1194,10 @@ namespace nodetool
std::string port_=port; std::string port_=port;
peerid_type pr_ = pr; peerid_type pr_ = pr;
auto cb_ = cb;*/ auto cb_ = cb;*/
// GCC 5.1.0 gives error with second use of uint64_t (peerid_type) variable.
peerid_type pr_ = pr;
bool inv_call_res = epee::net_utils::async_invoke_remote_command2<COMMAND_PING::response>(ping_context.m_connection_id, COMMAND_PING::ID, req, m_net_server.get_config_object(), bool inv_call_res = epee::net_utils::async_invoke_remote_command2<COMMAND_PING::response>(ping_context.m_connection_id, COMMAND_PING::ID, req, m_net_server.get_config_object(),
[=](int code, const COMMAND_PING::response& rsp, p2p_connection_context& context) [=](int code, const COMMAND_PING::response& rsp, p2p_connection_context& context)
{ {
@ -1205,7 +1209,7 @@ namespace nodetool
if(rsp.status != PING_OK_RESPONSE_STATUS_TEXT || pr != rsp.peer_id) if(rsp.status != PING_OK_RESPONSE_STATUS_TEXT || pr != rsp.peer_id)
{ {
LOG_PRINT_CC_L2(ping_context, "back ping invoke wrong response \"" << rsp.status << "\" from" << ip << ":" << port << ", hsh_peer_id=" << pr << ", rsp.peer_id=" << rsp.peer_id); LOG_PRINT_CC_L2(ping_context, "back ping invoke wrong response \"" << rsp.status << "\" from" << ip << ":" << port << ", hsh_peer_id=" << pr_ << ", rsp.peer_id=" << rsp.peer_id);
return; return;
} }
m_net_server.get_config_object().close(ping_context.m_connection_id); m_net_server.get_config_object().close(ping_context.m_connection_id);