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

Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix

Browse source
This commit is contained in:
dnotestein 2014-02-13 16:14:01 -05:00
commit 89f5bde073
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -44,7 +44,9 @@ IF( WIN32 )
FIND_PACKAGE(Boost 1.53 REQUIRED COMPONENTS thread date_time system filesystem program_options signals serialization chrono unit_test_framework context) FIND_PACKAGE(Boost 1.53 REQUIRED COMPONENTS thread date_time system filesystem program_options signals serialization chrono unit_test_framework context)
# For Boost 1.53 on windows, coroutine was not in BOOST_LIBRARYDIR and do not need it to build, but if boost versin >= 1.54, find coroutine otherwise will cause link errors # For Boost 1.53 on windows, coroutine was not in BOOST_LIBRARYDIR and do not need it to build, but if boost versin >= 1.54, find coroutine otherwise will cause link errors
IF(NOT "${Boost_VERSION}" MATCHES "1.53(.*)") IF(NOT "${Boost_VERSION}" MATCHES "1.53(.*)")
SET(BOOST_LIBRARIES_TEMP ${Boost_LIBRARIES})
FIND_PACKAGE(Boost 1.54 REQUIRED COMPONENTS coroutine) FIND_PACKAGE(Boost 1.54 REQUIRED COMPONENTS coroutine)
SET(Boost_LIBRARIES ${BOOST_LIBRARIES_TEMP} ${Boost_LIBRARIES})
ENDIF() ENDIF()
ELSE(WIN32) ELSE(WIN32)
@ -55,7 +57,11 @@ ELSE(WIN32)
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so") SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so")
IF(NOT APPLE ) include_directories( ${Boost_INCLUDE_DIR} )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/vendor/salsa20 )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/vendor/easylzma/src )
IF(NOT APPLE ) # then unix
# Unix build: # Unix build:
SET(SALSA_SRC vendor/salsa20/salsa20.s) SET(SALSA_SRC vendor/salsa20/salsa20.s)
SET(rt_library rt ) SET(rt_library rt )
@ -167,6 +173,7 @@ IF(WIN32)
target_compile_options(fc PUBLIC /EHa) target_compile_options(fc PUBLIC /EHa)
ELSE() ELSE()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall" ) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall" )
IF(APPLE) IF(APPLE)
target_compile_options(fc PUBLIC -std=c++11 -stdlib=libc++ -Wall) target_compile_options(fc PUBLIC -std=c++11 -stdlib=libc++ -Wall)
ELSE() ELSE()

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 )