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 +9 -2
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4bb8bf7832 - Show all commits

11
include/fc/io/json_relaxed.hpp
View file

@ -104,8 +104,15 @@ namespace fc { namespace json_relaxed
if( in.peek() == q ) if( in.peek() == q )
{ {
in.get(); in.get();
if( in.peek() != q ) try
return fc::string(); {
if( in.peek() != q )
return fc::string();
}
catch( const fc::eof_exception& e )
{
return fc::string();
}
// triple quote processing // triple quote processing
if( strict ) if( strict )