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

fix bug in json file loading, see issue #8

Browse source
This commit is contained in:
Daniel Larimer 2014-02-13 01:47:08 -05:00
parent 95c1e07896
commit 4571ce36d5
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/io/json.cpp
View file

@ -6,6 +6,8 @@
#include <fc/io/sstream.hpp> #include <fc/io/sstream.hpp>
#include <fc/log/logger.hpp> #include <fc/log/logger.hpp>
//#include <utfcpp/utf8.h> //#include <utfcpp/utf8.h>
#include <iostream>
#include <fstream>
namespace fc namespace fc
{ {
@ -585,8 +587,10 @@ namespace fc
} }
variant json::from_file( const fc::path& p ) variant json::from_file( const fc::path& p )
{ {
auto tmp = std::make_shared<fc::ifstream>( p, ifstream::binary ); //auto tmp = std::make_shared<fc::ifstream>( p, ifstream::binary );
buffered_istream bi( tmp ); //auto tmp = std::make_shared<std::ifstream>( p.generic_string().c_str(), std::ios::binary );
//buffered_istream bi( tmp );
std::ifstream bi( p.generic_string().c_str(), std::ios::binary );
return variant_from_stream( bi ); return variant_from_stream( bi );
} }
variant json::from_stream( buffered_istream& in ) variant json::from_stream( buffered_istream& in )