From a13d7d0cb1d3d82a31b360d8b855dc366c91ca3f Mon Sep 17 00:00:00 2001
From: Bruno Nery <bruno@thousandeyes.com>
Date: Tue, 15 Jan 2013 12:22:44 -0800
Subject: [PATCH] Fixed Timestamp::operator std::chrono::microseconds issue.

Signed-off-by: Matias Fontanini <matias.fontanini@gmail.com>
---
 include/timestamp.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/timestamp.h b/include/timestamp.h
index 6ec61b9..c48cb44 100644
--- a/include/timestamp.h
+++ b/include/timestamp.h
@@ -99,7 +99,8 @@ public:
          * Converts this Timestamp to a std::chrono::microseconds
          */
         operator std::chrono::microseconds() const {
-            return std::chrono::microseconds(seconds() * 1000000 + microseconds());
+            return std::chrono::seconds(seconds()) +
+                std::chrono::microseconds(microseconds());
         }
     #endif
 private: