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

3
src/io/json.cpp
View file

@ -5,6 +5,7 @@
#include <fc/io/fstream.hpp> #include <fc/io/fstream.hpp>
#include <fc/io/sstream.hpp> #include <fc/io/sstream.hpp>
#include <fc/log/logger.hpp> #include <fc/log/logger.hpp>
#include <cstdint>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
@ -596,7 +597,7 @@ namespace fc
return; return;
case variant::int64_type: case variant::int64_type:
if( format == json::stringify_large_ints_and_doubles && if( format == json::stringify_large_ints_and_doubles &&
( v.as_int64() > 0xffffffff || v.as_int64() < -int64_t(0xffffffff) ) ) ( v.as_int64() > INT32_MAX || v.as_int64() < INT32_MIN ) )
os << '"'<<v.as_string()<<'"'; os << '"'<<v.as_string()<<'"';
else else
os << v.as_int64(); os << v.as_int64();