diff --git a/CMakeLists.txt b/CMakeLists.txt index f605b64..d9f6d3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,6 +97,9 @@ set( sources add_subdirectory(vendor) +add_executable( date t.cpp ) +target_link_libraries( date fc ${Boost_THREAD_LIBRARY} ${Boost_CONTEXT_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${rt_library} ${Boost_DATE_TIME_LIBRARY}) + setup_library( fc SOURCES ${sources} ) #setup_executable( json_rpc_test SOURCES tests/json_rpc_test.cpp LIBRARIES fc ${ZLIB_LIBRARY} ${pthread_library} ${rt_library} ${Boost_THREAD_LIBRARY} ${Boost_CONTEXT_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${rt_library} ${Boost_DATE_TIME_LIBRARY}) diff --git a/src/time.cpp b/src/time.cpp index 0e30792..b82aa36 100644 --- a/src/time.cpp +++ b/src/time.cpp @@ -13,7 +13,7 @@ namespace fc { bch::system_clock::time_point tp; tp += bch::microseconds( elapsed._count); time_t tt = bch::system_clock::to_time_t(tp); - return boost::posix_time::to_iso_string( boost::posix_time::from_time_t(tt) ); + return boost::posix_time::to_iso_string( boost::posix_time::from_time_t(tt) + boost::posix_time::microseconds( elapsed._count - tt*1000000 )); } time_point time_point::from_iso_string( const fc::string& s ) { auto pt = boost::posix_time::from_iso_string(s);