From bc6e10f9029eb78bf5ed9834a8811ca68c00e8b3 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Tue, 1 Jul 2014 12:01:16 -0400 Subject: [PATCH 1/3] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 49d0a55..0a8ee06 100644 --- a/.gitignore +++ b/.gitignore @@ -46,5 +46,6 @@ git_revision.cpp GitSHA3.cpp ntp_test +task_cancel_test udt_client udt_server From 0efad975cb87e1d4b35df575b377dc663f96b153 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Tue, 1 Jul 2014 12:13:58 -0400 Subject: [PATCH 2/3] Add missing const on time_point_sec::+ --- include/fc/time.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/fc/time.hpp b/include/fc/time.hpp index ca851ec..2c12ef0 100644 --- a/include/fc/time.hpp +++ b/include/fc/time.hpp @@ -102,7 +102,7 @@ namespace fc { friend bool operator != ( const time_point_sec& a, const time_point_sec& b ) { return a.utc_seconds != b.utc_seconds; } time_point_sec& operator += ( uint32_t m ) { utc_seconds+=m; return *this; } time_point_sec& operator -= ( uint32_t m ) { utc_seconds-=m; return *this; } - time_point_sec operator+( uint32_t offset ) { return time_point_sec(utc_seconds + offset); } + time_point_sec operator +( uint32_t offset )const { return time_point_sec(utc_seconds + offset); } friend time_point operator - ( const time_point_sec& t, const microseconds& m ) { return time_point(t) - m; } friend microseconds operator - ( const time_point_sec& t, const time_point_sec& m ) { return time_point(t) - time_point(m); } From 748a9b52a5f2afe0751cb33325e45f4046eb9cc3 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Tue, 1 Jul 2014 13:38:24 -0400 Subject: [PATCH 3/3] Add time_point_sec::-( uint32_t ) --- include/fc/time.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/fc/time.hpp b/include/fc/time.hpp index 2c12ef0..ae0d48d 100644 --- a/include/fc/time.hpp +++ b/include/fc/time.hpp @@ -103,6 +103,7 @@ namespace fc { time_point_sec& operator += ( uint32_t m ) { utc_seconds+=m; return *this; } time_point_sec& operator -= ( uint32_t m ) { utc_seconds-=m; return *this; } time_point_sec operator +( uint32_t offset )const { return time_point_sec(utc_seconds + offset); } + time_point_sec operator -( uint32_t offset )const { return time_point_sec(utc_seconds - offset); } friend time_point operator - ( const time_point_sec& t, const microseconds& m ) { return time_point(t) - m; } friend microseconds operator - ( const time_point_sec& t, const time_point_sec& m ) { return time_point(t) - time_point(m); }