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

Sync develop with master #4

Merged
RoshanSyed merged 144 commits from master into develop 2019-12-16 15:20:56 +00:00
Conversation 0 Commits 144 Files changed 636 -3
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3c6d7d9fe3 - Show all commits

3
include/fc/fixed_string.hpp
View file

@ -23,7 +23,6 @@ namespace fc {
if( str.size() <= sizeof(data) )
memcpy( (char*)&data, str.c_str(), str.size() );
else {
wlog( "truncating string '${str}'", ("str",str) );
memcpy( (char*)&data, str.c_str(), sizeof(data) );
}
}
@ -32,7 +31,6 @@ namespace fc {
if( l <= sizeof(data) )
memcpy( (char*)&data, str, l );
else {
wlog( "truncating string '${str}'", ("str",str) );
memcpy( (char*)&data, str, sizeof(data) );
}
}
@ -63,7 +61,6 @@ namespace fc {
memcpy( (char*)&data, str.c_str(), str.size() );
}
else {
wlog( "truncating string '${str}'", ("str",str) );
memcpy( (char*)&data, str.c_str(), sizeof(data) );
}
return *this;