rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-14 07:03:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3821

Browse Source 
558d05b epee: log type name when a container size check fails (moneromooo-monero)
a2566db object_sizes: add a few useful types (moneromooo-monero)
This commit is contained in:
luigi1111 2018-06-19 12:39:12 -05:00
commit f62399b88d
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/epee/include/serialization/keyvalue_serialization_overloads.h
View File

@ -156,7 +156,7 @@ namespace epee
typename stl_container::value_type* pelem = (typename stl_container::value_type*)buff.data(); typename stl_container::value_type* pelem = (typename stl_container::value_type*)buff.data();
CHECK_AND_ASSERT_MES(!(loaded_size%sizeof(typename stl_container::value_type)), CHECK_AND_ASSERT_MES(!(loaded_size%sizeof(typename stl_container::value_type)),
false, false,
"size in blob " << loaded_size << " not have not zero modulo for sizeof(value_type) = " << sizeof(typename stl_container::value_type)); "size in blob " << loaded_size << " not have not zero modulo for sizeof(value_type) = " << sizeof(typename stl_container::value_type) << ", type " << typeid(typename stl_container::value_type).name());
size_t count = (loaded_size/sizeof(typename stl_container::value_type)); size_t count = (loaded_size/sizeof(typename stl_container::value_type));
for(size_t i = 0; i < count; i++) for(size_t i = 0; i < count; i++)
container.insert(container.end(), *(pelem++)); container.insert(container.end(), *(pelem++));

5
src/debug_utilities/object_sizes.cpp
View File

@ -94,6 +94,11 @@ int main(int argc, char* argv[])
SL(nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core>>); SL(nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core>>);
SL(nodetool::p2p_connection_context_t<cryptonote::t_cryptonote_protocol_handler<cryptonote::core>::connection_context>); SL(nodetool::p2p_connection_context_t<cryptonote::t_cryptonote_protocol_handler<cryptonote::core>::connection_context>);
SL(nodetool::network_address_old); SL(nodetool::network_address_old);
SL(nodetool::peerlist_entry_base<nodetool::network_address_old>);
SL(nodetool::network_config);
SL(nodetool::basic_node_data);
SL(cryptonote::CORE_SYNC_DATA);
SL(tools::wallet2::transfer_details); SL(tools::wallet2::transfer_details);
SL(tools::wallet2::payment_details); SL(tools::wallet2::payment_details);