Move the time constants to timedelta.h

diff --git a/source/time/timedelta.cpp b/source/time/timedelta.cpp
index 1bda9e564909f59c16951675f8e4c875a24ae509..a4e5db172cf97925c2ce8bb7929c3080ec430b88 100644 (file)
--- a/source/time/timedelta.cpp
+++ b/source/time/timedelta.cpp
@@ -76,5 +76,14 @@ void operator<<(LexicalConverter &conv, const TimeDelta &td)
        conv.result(result);
 }
 
        conv.result(result);
 }
 

+const TimeDelta zero(0);
+const TimeDelta usec(1);
+const TimeDelta msec(1000);
+const TimeDelta sec(1000000);
+const TimeDelta min(60*1000000);
+const TimeDelta hour(3600*1000000LL);
+const TimeDelta day(86400*1000000LL);
+const TimeDelta week(7*86400*1000000LL);
+

 } // namespace Time
 } // namespace Msp
 } // namespace Time
 } // namespace Msp

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 4a5411838dff02ab761d7b9f696fa6515b38c6f0..9be491ecbc762bf02046628274d0e6bb91ba445d 100644 (file)
--- a/source/time/timedelta.h
+++ b/source/time/timedelta.h
@@ -61,6 +61,17 @@ inline TimeDelta operator*(T a, const TimeDelta &t) { return t*a; }
 
 void operator<<(LexicalConverter &, const TimeDelta &);
 
 
 void operator<<(LexicalConverter &, const TimeDelta &);
 

+
+// Constants to be used in creation of TimeDeltas
+extern const TimeDelta zero;
+extern const TimeDelta usec;
+extern const TimeDelta msec;
+extern const TimeDelta sec;
+extern const TimeDelta min;
+extern const TimeDelta hour;
+extern const TimeDelta day;
+extern const TimeDelta week;
+

 } // namespace Time
 } // namespace Msp
 
 } // namespace Time
 } // namespace Msp
 

diff --git a/source/time/units.cpp b/source/time/units.cpp
deleted file mode 100644 (file)
index 382592c..0000000
--- a/source/time/units.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "units.h"
-
-namespace Msp {
-namespace Time {
-
-// Constants to be used in creation of TimeDeltas
-const TimeDelta zero(0);
-const TimeDelta usec(1);
-const TimeDelta msec(1000);
-const TimeDelta sec(1000000);
-const TimeDelta min(60*1000000);
-const TimeDelta hour(3600*1000000LL);
-const TimeDelta day(86400*1000000LL);
-const TimeDelta week(7*86400*1000000LL);
-
-} // namespace Time
-} // namespace Msp

diff --git a/source/time/units.h b/source/time/units.h
index fb3be369d5fa602931db69dde5828e62dc0ab83f..ec06c11523633d03cafc4d71d502aa09357f9e4a 100644 (file)
--- a/source/time/units.h
+++ b/source/time/units.h
@@ -3,19 +3,6 @@
 
 #include "timedelta.h"
 
 
 #include "timedelta.h"
 

-namespace Msp {
-namespace Time {
-
-extern const TimeDelta zero;
-extern const TimeDelta usec;
-extern const TimeDelta msec;
-extern const TimeDelta sec;
-extern const TimeDelta min;
-extern const TimeDelta hour;
-extern const TimeDelta day;
-extern const TimeDelta week;
-
-} // namespace Time
-} // namespace Msp
+// This header is deprecated

 
 #endif
 
 #endif