QPID-1904: Ensure that all timestamp uses are correctly relative to 1/1/1970 epoch.

- Removed the hacky way to access the internal time value in AbsTime now that there
  is a defined AbsTime value EPOCH.
- Changed all the code to use Duration(EPOCH, abtime)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@937147 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/tests/echotest.cpp b/cpp/src/tests/echotest.cpp
index dcb1869e4d..5114ab883d 100644
--- a/cpp/src/tests/echotest.cpp
+++ b/cpp/src/tests/echotest.cpp
@@ -64,7 +64,7 @@ struct  Args : public qpid::Options,
 
 uint64_t current_time()
 {
-    Duration t(now());
+    Duration t(EPOCH, now());
     return t;
 }
 
diff --git a/cpp/src/tests/latencytest.cpp b/cpp/src/tests/latencytest.cpp
index a205ef6c7c..20eb4568f3 100644
--- a/cpp/src/tests/latencytest.cpp
+++ b/cpp/src/tests/latencytest.cpp
@@ -97,7 +97,7 @@ Connection globalConnection;
 
 uint64_t current_time()
 {
-    Duration t(now());
+    Duration t(EPOCH, now());
     return t;
 }
 
@@ -363,7 +363,7 @@ void Sender::sendByRate()
     AbsTime start = now();
     while (true) {
         AbsTime sentAt=now();
-        msg.getDeliveryProperties().setTimestamp(Duration(sentAt));
+        msg.getDeliveryProperties().setTimestamp(Duration(EPOCH, sentAt));
         async(session).messageTransfer(arg::content=msg, arg::acceptMode=1);
         if (opts.sync) session.sync();
         ++sent;