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

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +2
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1412df18d1 - Show all commits

2
src/io/json.cpp
View file

@ -772,6 +772,8 @@ namespace fc
case relaxed_parser: case relaxed_parser:
return json_relaxed::variant_from_stream<buffered_istream, false>( in ); return json_relaxed::variant_from_stream<buffered_istream, false>( in );
#endif #endif
case broken_nul_parser:
return variant_from_stream<fc::buffered_istream, broken_nul_parser>( in );
default: default:
FC_ASSERT( false, "Unknown JSON parser type {ptype}", ("ptype", ptype) ); FC_ASSERT( false, "Unknown JSON parser type {ptype}", ("ptype", ptype) );
} }