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

Merge fc changes from develop(latest-fc) to beatrice #15

Merged
pbsa-gitlab merged 8 commits from latest-fc into beatrice 2020-03-09 13:45:00 +00:00
Conversation 0 Commits 8 Files changed 2 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 23761bade5 - Show all commits

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

@ -524,11 +524,11 @@ namespace fc {
template<typename Stream, typename T> template<typename Stream, typename T>
inline void pack( Stream& s, const T& v ) { void pack( Stream& s, const T& v ) {
fc::raw::detail::if_reflected< typename fc::reflector<T>::is_defined >::pack(s,v); fc::raw::detail::if_reflected< typename fc::reflector<T>::is_defined >::pack(s,v);
} }
template<typename Stream, typename T> template<typename Stream, typename T>
inline void unpack( Stream& s, T& v ) void unpack( Stream& s, T& v )
{ try { { try {
fc::raw::detail::if_reflected< typename fc::reflector<T>::is_defined >::unpack(s,v); fc::raw::detail::if_reflected< typename fc::reflector<T>::is_defined >::unpack(s,v);
} FC_RETHROW_EXCEPTIONS( warn, "error unpacking ${type}", ("type",fc::get_typename<T>::name() ) ) } } FC_RETHROW_EXCEPTIONS( warn, "error unpacking ${type}", ("type",fc::get_typename<T>::name() ) ) }