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 +5 -5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/fc/io/raw.hpp
View file

@ -618,12 +618,12 @@ namespace fc {
template<typename Stream, typename T> template<typename Stream, typename T>
inline void pack( Stream& s, const T& v, uint32_t _max_depth ) { void pack( Stream& s, const T& v, uint32_t _max_depth ) {
FC_ASSERT( _max_depth > 0 ); FC_ASSERT( _max_depth > 0 );
fc::raw::detail::if_reflected< typename fc::reflector<T>::is_defined >::pack( s, v, _max_depth - 1 ); fc::raw::detail::if_reflected< typename fc::reflector<T>::is_defined >::pack( s, v, _max_depth - 1 );
} }
template<typename Stream, typename T> template<typename Stream, typename T>
inline void unpack( Stream& s, T& v, uint32_t _max_depth ) void unpack( Stream& s, T& v, uint32_t _max_depth )
{ try { { try {
FC_ASSERT( _max_depth > 0 ); FC_ASSERT( _max_depth > 0 );
fc::raw::detail::if_reflected< typename fc::reflector<T>::is_defined >::unpack( s, v, _max_depth - 1 ); fc::raw::detail::if_reflected< typename fc::reflector<T>::is_defined >::unpack( s, v, _max_depth - 1 );

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

@ -83,13 +83,13 @@ namespace fc {
namespace raw namespace raw
{ {
template<typename Stream> template<typename Stream>
inline void pack( Stream& s, const ip::address& v, uint32_t _max_depth=FC_PACK_MAX_DEPTH ) void pack( Stream& s, const ip::address& v, uint32_t _max_depth=FC_PACK_MAX_DEPTH )
{ {
FC_ASSERT( _max_depth > 0 ); FC_ASSERT( _max_depth > 0 );
fc::raw::pack( s, uint32_t(v), _max_depth - 1 ); fc::raw::pack( s, uint32_t(v), _max_depth - 1 );
} }
template<typename Stream> template<typename Stream>
inline void unpack( Stream& s, ip::address& v, uint32_t _max_depth=FC_PACK_MAX_DEPTH ) void unpack( Stream& s, ip::address& v, uint32_t _max_depth=FC_PACK_MAX_DEPTH )
{ {
FC_ASSERT( _max_depth > 0 ); FC_ASSERT( _max_depth > 0 );
uint32_t _ip; uint32_t _ip;
@ -119,7 +119,7 @@ namespace fc {
} }
} // namespace fc } // namespace fc
FC_REFLECT_TYPENAME( fc::ip::address ) FC_REFLECT_EMPTY( fc::ip::address )
FC_REFLECT_TYPENAME( fc::ip::endpoint ) FC_REFLECT_TYPENAME( fc::ip::endpoint )
namespace std namespace std
{ {