Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update fc to sync with recent changes on beatrice #16

Merged
pbsa-gitlab merged 9 commits from beatrice into master 2020-03-19 18:00:03 +00:00
Conversation 0 Commits 9 Files changed 2 +1 -2
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2343ab74f3 - Show all commits

2
include/fc/network/ip.hpp
View file

@ -113,7 +113,7 @@ namespace fc {
}
} // namespace fc
FC_REFLECT_TYPENAME( fc::ip::address )
FC_REFLECT_EMPTY( fc::ip::address )
FC_REFLECT_TYPENAME( fc::ip::endpoint )
namespace std
{

1
src/exception.cpp
View file

@ -15,7 +15,6 @@ namespace fc
FC_IMPLEMENT_EXCEPTION( key_not_found_exception, key_not_found_exception_code, "Key Not Found" )
FC_IMPLEMENT_EXCEPTION( bad_cast_exception, bad_cast_exception_code, "Bad Cast" )
FC_IMPLEMENT_EXCEPTION( out_of_range_exception, out_of_range_exception_code, "Out of Range" )
FC_IMPLEMENT_EXCEPTION( method_not_found_exception, method_not_found_exception_code, "Method Not Found" );
FC_IMPLEMENT_EXCEPTION( invalid_operation_exception, invalid_operation_exception_code, "Invalid Operation" )
FC_IMPLEMENT_EXCEPTION( unknown_host_exception, unknown_host_exception_code, "Unknown Host" )
FC_IMPLEMENT_EXCEPTION( canceled_exception, canceled_exception_code, "Canceled" )