From 35de0467ca9ff44d24f3387df065313c6efc7545 Mon Sep 17 00:00:00 2001
From: Mark Meserve <mark.meserve@ni.com>
Date: Wed, 26 Sep 2018 16:24:35 -0500
Subject: uhd: reconcile time_spec operators with boost concepts

- Removes operator+ which was ambiguously defined in some cases
- Adds additive concept for time_spec_t and double operators
- Remove unnecessary ctime header
---
 host/include/uhd/types/time_spec.hpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'host/include')

diff --git a/host/include/uhd/types/time_spec.hpp b/host/include/uhd/types/time_spec.hpp
index 54fd9d379..8c0a2568d 100644
--- a/host/include/uhd/types/time_spec.hpp
+++ b/host/include/uhd/types/time_spec.hpp
@@ -10,7 +10,6 @@
 
 #include <uhd/config.hpp>
 #include <boost/operators.hpp>
-#include <ctime>
 
 namespace uhd{
 
@@ -26,7 +25,10 @@ namespace uhd{
      * This gives the fractional seconds enough precision to unambiguously
      * specify a clock-tick/sample-count up to rates of several petahertz.
      */
-    class UHD_API time_spec_t : boost::additive<time_spec_t>, boost::totally_ordered<time_spec_t>{
+    class UHD_API time_spec_t : 
+        boost::additive<time_spec_t>,
+        boost::additive<time_spec_t, double>,
+        boost::totally_ordered<time_spec_t>{
     public:
 
         /*!
@@ -98,10 +100,9 @@ namespace uhd{
         //! Implement addable interface
         time_spec_t &operator+=(const time_spec_t &);
         time_spec_t &operator+=(double &);
-        time_spec_t operator+(double &);
-        time_spec_t operator+(const time_spec_t &);
         //! Implement subtractable interface
         time_spec_t &operator-=(const time_spec_t &);
+        time_spec_t &operator-=(double &);
 
     //private time storage details
     private:
-- 
cgit v1.2.3