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

Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix

Browse source
This commit is contained in:
Daniel Larimer 2014-06-09 10:49:54 -04:00
commit 34ac1baf82
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/fc/exception/exception.hpp
View file

@ -225,7 +225,7 @@ namespace fc
:exception(c){} \ :exception(c){} \
TYPE( const exception& c ) \ TYPE( const exception& c ) \
:exception(c){} \ :exception(c){} \
TYPE():exception(){}\ TYPE():exception(CODE, BOOST_PP_STRINGIZE(TYPE), WHAT){}\
\ \
virtual std::shared_ptr<exception> dynamic_copy_exception()const\ virtual std::shared_ptr<exception> dynamic_copy_exception()const\
{ return std::make_shared<TYPE>( *this ); } \ { return std::make_shared<TYPE>( *this ); } \

3
include/fc/time.hpp
View file

@ -83,6 +83,9 @@ namespace fc {
time_point_sec( const time_point& t ) time_point_sec( const time_point& t )
:utc_seconds( t.time_since_epoch().count() / 1000000ll ){} :utc_seconds( t.time_since_epoch().count() / 1000000ll ){}
static time_point_sec maximum() { return time_point_sec(0xffffffff); }
static time_point_sec min() { return time_point_sec(0); }
operator time_point()const { return time_point( fc::seconds( utc_seconds) ); } operator time_point()const { return time_point( fc::seconds( utc_seconds) ); }
uint32_t sec_since_epoch()const { return utc_seconds; } uint32_t sec_since_epoch()const { return utc_seconds; }