From 24a328fc163a4b5709762bdcc00793ff738dd500 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Wed, 31 Mar 2010 11:09:55 +0200
Subject: [PATCH] [Positioning] Fix Timestamp on 32 bits architectures

---
 owlps-positioning/src/timestamp.hh        | 4 +++-
 owlps-positioning/tests/timestamp_test.hh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/owlps-positioning/src/timestamp.hh b/owlps-positioning/src/timestamp.hh
index fc39205..2af52e4 100644
--- a/owlps-positioning/src/timestamp.hh
+++ b/owlps-positioning/src/timestamp.hh
@@ -233,7 +233,9 @@ inline Timestamp::operator const struct timespec&() const
 
 inline Timestamp::operator uint64_t(void) const
 {
-  return timestamp.tv_sec * 1000 + timestamp.tv_nsec / 1000000 ;
+  return
+    static_cast<uint64_t>(timestamp.tv_sec) * 1000 +
+    static_cast<uint64_t>(timestamp.tv_nsec) / 1000000 ;
 }
 
 
diff --git a/owlps-positioning/tests/timestamp_test.hh b/owlps-positioning/tests/timestamp_test.hh
index ff7da55..325b11d 100644
--- a/owlps-positioning/tests/timestamp_test.hh
+++ b/owlps-positioning/tests/timestamp_test.hh
@@ -133,7 +133,7 @@ public:
     TS_ASSERT_EQUALS(static_cast<struct timespec>(timestamp2), current_time) ;
     TS_ASSERT_EQUALS(timestamp2, current_time) ;
 
-    msec = 1234567891234567ull ;
+    msec = 1234567891234ull ;
     timestamp2 = msec ;
     TS_ASSERT_EQUALS(static_cast<uint64_t>(timestamp2), msec) ;
     TS_ASSERT_EQUALS(timestamp2, msec) ;