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

updates for arm

Browse source
This commit is contained in:
Daniel Larimer 2012-10-29 13:19:17 -07:00
parent 9af6c22f30
commit d4554ca029
4 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -41,6 +41,7 @@ option( UNITY_BUILD OFF )
include_directories( vendor/boost/process/include ) include_directories( vendor/boost/process/include )
include_directories( ${Boost_INCLUDE_DIR} ) include_directories( ${Boost_INCLUDE_DIR} )
include_directories( ${OPENSSL_INCLUDE_DIR} )
include_directories( include ) include_directories( include )
set( sources set( sources
@ -82,7 +83,7 @@ set( sources
) )
setup_library( fc SOURCES ${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 ) #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} ) #target_link_libraries( test_vec fc ${Boost_SYSTEM_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_CONTEXT_LIBRARY} )

9
include/fc/iostream.hpp
View file

@ -76,13 +76,4 @@ namespace fc {
v = fc::lexical_cast<T>(str); v = fc::lexical_cast<T>(str);
return o; return o;
} }
fc::cin_t& getline( fc::cin_t&, fc::string&, char delim = '\n' );
template<typename T>
cin_t& operator>>( cin_t& o, T& v ) {
fc::string str;
getline( o, str, ' ' );
v = fc::lexical_cast<T>(str);
return o;
}
} }

2
include/fc/lexical_cast.hpp
View file

@ -28,7 +28,7 @@ namespace fc {
fc::string to_string( int16_t d ); fc::string to_string( int16_t d );
fc::string to_string( int8_t d ); fc::string to_string( int8_t d );
fc::string to_string( char 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; } inline fc::string to_string( fc::string s ) { return s; }
template<typename R> template<typename R>

2
include/fc/sha1.hpp
View file

@ -34,7 +34,7 @@ namespace fc {
private: private:
struct impl; struct impl;
fwd<impl,89> my; fwd<impl,96> my;
}; };
template<typename T> template<typename T>