diff --git a/CMakeLists.txt b/CMakeLists.txt index e3c6157..8628aa9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,7 @@ option( UNITY_BUILD OFF ) include_directories( vendor/boost/process/include ) include_directories( ${Boost_INCLUDE_DIR} ) +include_directories( ${OPENSSL_INCLUDE_DIR} ) include_directories( include ) set( sources @@ -82,7 +83,7 @@ set( sources ) setup_library( fc SOURCES ${sources} ) -setup_executable( json_rpc_test SOURCES tests/json_rpc_test.cpp LIBRARIES fc ${Boost_THREAD_LIBRARY} ${Boost_CONTEXT_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ) +setup_executable( json_rpc_test SOURCES tests/json_rpc_test.cpp LIBRARIES fc ${pthread_library} ${rt_library} ${Boost_THREAD_LIBRARY} ${Boost_CONTEXT_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${rt_library} ) #add_executable( test_vec tests/vector_test.cpp ) #target_link_libraries( test_vec fc ${Boost_SYSTEM_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_CONTEXT_LIBRARY} ) diff --git a/include/fc/iostream.hpp b/include/fc/iostream.hpp index f0650d8..0e3829a 100644 --- a/include/fc/iostream.hpp +++ b/include/fc/iostream.hpp @@ -76,13 +76,4 @@ namespace fc { v = fc::lexical_cast(str); return o; } - - fc::cin_t& getline( fc::cin_t&, fc::string&, char delim = '\n' ); - template - cin_t& operator>>( cin_t& o, T& v ) { - fc::string str; - getline( o, str, ' ' ); - v = fc::lexical_cast(str); - return o; - } } diff --git a/include/fc/lexical_cast.hpp b/include/fc/lexical_cast.hpp index e0f491e..18b9f6f 100644 --- a/include/fc/lexical_cast.hpp +++ b/include/fc/lexical_cast.hpp @@ -28,7 +28,7 @@ namespace fc { fc::string to_string( int16_t d ); fc::string to_string( int8_t d ); fc::string to_string( char d ); - fc::string to_string( const char* d ); + inline fc::string to_string( const char* d ) { return d; } inline fc::string to_string( fc::string s ) { return s; } template diff --git a/include/fc/sha1.hpp b/include/fc/sha1.hpp index 34ddb7a..cef850f 100644 --- a/include/fc/sha1.hpp +++ b/include/fc/sha1.hpp @@ -34,7 +34,7 @@ namespace fc { private: struct impl; - fwd my; + fwd my; }; template