You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by ve...@apache.org on 2012/08/02 17:00:19 UTC

svn commit: r1368505 - in /incubator/etch/trunk/binding-cpp/runtime: lib/capu/modules/capu/include/capu/os/NumericLimits.h src/main/util/EtchCircularQueue.cpp

Author: veithm
Date: Thu Aug  2 15:00:18 2012
New Revision: 1368505

URL: http://svn.apache.org/viewvc?rev=1368505&view=rev
Log:
ETCH-134 Fixed time bug

Change-Id: Idd8d61bd5352832e1a88b405ac5f65223f36ab94

Modified:
    incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/NumericLimits.h
    incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp

Modified: incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/NumericLimits.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/NumericLimits.h?rev=1368505&r1=1368504&r2=1368505&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/NumericLimits.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/NumericLimits.h Thu Aug  2 15:00:18 2012
@@ -50,6 +50,16 @@ namespace capu {
   }
 
   template<>
+  inline capu::uint32_t NumericLimitMax<capu::uint32_t>() {
+    return 0xFFFFFFFF;
+  }
+
+  template<>
+  inline capu::uint32_t NumericLimitMin<capu::uint32_t>() {
+    return 0x0;
+  }
+
+  template<>
   inline capu::int16_t NumericLimitMin<capu::int16_t>() {
     return -32768;
   }

Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp?rev=1368505&r1=1368504&r2=1368505&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp Thu Aug  2 15:00:18 2012
@@ -124,8 +124,8 @@ status_t EtchCircularQueue::get(EtchMail
   }
 
   // the queue is empty, not closed, and caller has requested a delay...
-  capu::int32_t now = capu::Time::GetMilliseconds();
-  capu::int32_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimitMax<capu::int32_t>();
+  capu::uint32_t now = capu::Time::GetMilliseconds();
+  capu::uint32_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimitMax<capu::uint32_t>();
 
   capu::int32_t d;
   while ((d = end - now) > 0) {
@@ -191,8 +191,8 @@ capu::status_t EtchCircularQueue::put(Et
   }
 
   // the queue is full, not closed, and the caller has requested a delay...
-  capu::int32_t now = capu::Time::GetMilliseconds();
-  capu::int32_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimitMax<capu::int32_t>();
+  capu::uint32_t now = capu::Time::GetMilliseconds();
+  capu::uint32_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimitMax<capu::uint32_t>();
 
   capu::int32_t d;
   while((d = end - now) > 0) {