From 48837f31165bf8f5177e7f9de1158515eb48b716 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Sat, 26 Jul 2014 21:05:11 -0400 Subject: [PATCH] Add time_point_sec::to_iso_{extended_}string() --- include/fc/time.hpp | 3 +++ src/log/file_appender.cpp | 4 +--- src/time.cpp | 13 +++++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/include/fc/time.hpp b/include/fc/time.hpp index ae0d48d..22ace58 100644 --- a/include/fc/time.hpp +++ b/include/fc/time.hpp @@ -109,6 +109,9 @@ namespace fc { friend microseconds operator - ( const time_point_sec& t, const time_point_sec& m ) { return time_point(t) - time_point(m); } friend microseconds operator - ( const time_point& t, const time_point_sec& m ) { return time_point(t) - time_point(m); } + fc::string to_iso_string()const; + fc::string to_iso_extended_string()const; + private: uint32_t utc_seconds; }; diff --git a/src/log/file_appender.cpp b/src/log/file_appender.cpp index 686ed65..d8440d2 100644 --- a/src/log/file_appender.cpp +++ b/src/log/file_appender.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -36,8 +35,7 @@ namespace fc { string timestamp_to_string( const time_point_sec& timestamp ) { - auto ptime = boost::posix_time::from_time_t( time_t ( timestamp.sec_since_epoch() ) ); - return boost::posix_time::to_iso_string( ptime ); + return timestamp.to_iso_string(); } time_point_sec string_to_timestamp( const string& str ) diff --git a/src/time.cpp b/src/time.cpp index dc50544..06c4494 100644 --- a/src/time.cpp +++ b/src/time.cpp @@ -29,6 +29,19 @@ namespace fc { } FC_RETHROW_EXCEPTIONS(warn, "unable to convert ISO-formatted string to fc::time_point") } + + fc::string time_point_sec::to_iso_string()const + { + const auto ptime = boost::posix_time::from_time_t( time_t ( sec_since_epoch() ) ); + return boost::posix_time::to_iso_string( ptime ); + } + + fc::string time_point_sec::to_iso_extended_string()const + { + const auto ptime = boost::posix_time::from_time_t( time_t ( sec_since_epoch() ) ); + return boost::posix_time::to_iso_extended_string( ptime ); + } + void to_variant( const fc::time_point& t, variant& v ) { v = fc::string(t); }