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

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +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 3f9c3f6ed2 - Show all commits

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

@ -31,7 +31,7 @@ namespace fc {
boost::endian::little_uint64_buf_at hilo[2]; boost::endian::little_uint64_buf_at hilo[2];
hilo[0] = uint128_hi64( v ); hilo[0] = uint128_hi64( v );
hilo[1] = uint128_lo64( v ); hilo[1] = uint128_lo64( v );
s.write( hilo[0].data(), sizeof(hilo) ); s.write( (char*)hilo[0].data(), sizeof(hilo) );
} }
template<typename Stream> template<typename Stream>
inline void unpack( Stream& s, uint128_t& v, uint32_t _max_depth ) inline void unpack( Stream& s, uint128_t& v, uint32_t _max_depth )
@ -731,7 +731,7 @@ namespace fc {
void pack( Stream& s, const boost::endian::endian_buffer<O,T,N,A>& v, uint32_t _max_depth ) void pack( Stream& s, const boost::endian::endian_buffer<O,T,N,A>& v, uint32_t _max_depth )
{ {
FC_ASSERT( _max_depth > 0 ); FC_ASSERT( _max_depth > 0 );
s.write( v.data(), sizeof(v) ); s.write( (char*)v.data(), sizeof(v) );
} }
template<typename Stream, boost::endian::order O, class T, std::size_t N, boost::endian::align A> template<typename Stream, boost::endian::order O, class T, std::size_t N, boost::endian::align A>
void unpack( Stream& s, boost::endian::endian_buffer<O,T,N,A>& v, uint32_t _max_depth ) void unpack( Stream& s, boost::endian::endian_buffer<O,T,N,A>& v, uint32_t _max_depth )