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

fix bugs, add < to path

Browse source
This commit is contained in:
Daniel Larimer 2013-01-25 13:23:29 -05:00
commit e5796f06bd
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -97,8 +97,8 @@ set( sources
add_subdirectory(vendor) add_subdirectory(vendor)
add_executable( date t.cpp ) #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}) #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_library( fc SOURCES ${sources} )

5
src/time.cpp
View file

@ -1,7 +1,7 @@
#include <fc/time.hpp>
#include <fc/value_cast.hpp> #include <fc/value_cast.hpp>
#include <boost/chrono/system_clocks.hpp> #include <boost/chrono/system_clocks.hpp>
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>
#include <fc/time.hpp>
#include <sstream> #include <sstream>
namespace fc { namespace fc {
@ -13,7 +13,8 @@ namespace fc {
bch::system_clock::time_point tp; bch::system_clock::time_point tp;
tp += bch::microseconds( elapsed._count); tp += bch::microseconds( elapsed._count);
time_t tt = bch::system_clock::to_time_t(tp); time_t tt = bch::system_clock::to_time_t(tp);
return boost::posix_time::to_iso_string( boost::posix_time::from_time_t(tt) + boost::posix_time::microseconds( elapsed._count - tt*1000000 ));
return boost::posix_time::to_iso_string( boost::posix_time::from_time_t(tt) + boost::posix_time::microseconds( elapsed._count % 1000000 ) );
} }
time_point time_point::from_iso_string( const fc::string& s ) { time_point time_point::from_iso_string( const fc::string& s ) {
auto pt = boost::posix_time::from_iso_string(s); auto pt = boost::posix_time::from_iso_string(s);