From b8525e9a76d63a2dc26c87577940a058e70e3dd5 Mon Sep 17 00:00:00 2001 From: John Grossman Date: Thu, 16 Feb 2012 14:53:24 -0800 Subject: Fix the build. Looks like not all flavors of the android build include support for std::numeric_limits. Fix the build by using a simple macro for now. A more elegant solution can be searched for once the build is green again. Change-Id: I18329cd0d26ca69de6a52df9a1c6eeb3ba063b48 --- services/common_time/common_time_server.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/common_time/common_time_server.cpp b/services/common_time/common_time_server.cpp index 4af73b5..4db516a 100644 --- a/services/common_time/common_time_server.cpp +++ b/services/common_time/common_time_server.cpp @@ -50,7 +50,7 @@ #include "clock_recovery.h" #include "common_clock.h" -using std::numeric_limits; +#define MAX_INT ((int)0x7FFFFFFF) namespace android { @@ -1335,8 +1335,8 @@ int CommonTimeServer::TimeoutHelper::msecTillTimeout() { uint64_t deltaMsec = (((mEndTime - now) + 999999) / 1000000); - if (deltaMsec > static_cast(std::numeric_limits::max())) - return std::numeric_limits::max(); + if (deltaMsec > static_cast(MAX_INT)) + return MAX_INT; return static_cast(deltaMsec); } -- cgit v1.1