1 files changed, 14 insertions, 28 deletions
diff --git a/ACE/tests/Time_Value_Test.cpp b/ACE/tests/Time_Value_Test.cpp
index 764b23f406d..20145f81145 100644
--- a/ACE/tests/Time_Value_Test.cpp
+++ b/ACE/tests/Time_Value_Test.cpp
@@ -49,16 +49,7 @@ ACE_RCSID(tests, Time_Value_Test, "$Id$")
 #include "ace/ACE.h"
 #include "ace/Time_Value.h"
 
-#if !defined(ACE_LACKS_NUMERIC_LIMITS)
-// some platforms pollute the namespace by defining max() and min() macros
-#ifdef max
-#undef max
-#endif
-#ifdef min
-#undef min
-#endif
-#include <limits>
-#endif /* ACE_LACKS_NUMERIC_LIMITS */
+#include "ace/Numeric_Limits.h"
 
 #if defined (sun) && !defined (ACE_LACKS_LONGLONG_T)
 static
@@ -236,49 +227,44 @@ run_main (int, ACE_TCHAR *[])
   tv1.set (1, 1);
   tv2.set (2, 2);
   tv1 *= 2.0;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT (tv1 == tv2);
   tv1.set (1, 1);
   tv2.set (-2, -2);
   tv1 *= -2.0;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT (tv1 == tv2);
 
   // test usec shift
   tv1.set (1, 999999);
   tv2.set (19, 999990);
   tv1 *= 10.0;
-  ACE_ASSERT ( tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT ( tv1 == tv2);
   tv1.set (1, 999999);
   tv2.set (-19, -999990);
   tv1 *= -10.0;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT (tv1 == tv2);
 
-#if !defined(ACE_LACKS_NUMERIC_LIMITS) && !defined (ACE_WIN64)
-  const time_t max_time_t = std::numeric_limits<time_t>::max ();
-  const time_t min_time_t = std::numeric_limits<time_t>::min ();
-#else
-  const time_t max_time_t = LONG_MAX;
-  const time_t min_time_t = LONG_MIN;
-#endif
+  const time_t max_time_t = ACE_Numeric_Limits<time_t>::max ();
+  const time_t min_time_t = ACE_Numeric_Limits<time_t>::min ();
 
   // test results near limits
   tv1.set ((max_time_t >> 1), 499999);
   tv2.set ((-(max_time_t >> 1) << 1), -999998);
   tv1 *= -2.0;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT (tv1 == tv2);
   tv1.set (max_time_t >> 1, 499999);
   tv2.set (((max_time_t >> 1) << 1), 999998);
   tv1 *= 2.0;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  ACE_ASSERT (tv1 == tv2);
 
   // test saturated result
   tv1.set (max_time_t - 1, 499999);
-  tv2.set (max_time_t, 999999);
-  tv1 *= max_time_t;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  tv2.set (max_time_t, 999999);  // ACE_Time_Value::max_time
+  tv1 *= 10.0;
+  ACE_ASSERT (tv1 == tv2);
   tv1.set (max_time_t - 1, 499999);
   tv2.set (min_time_t, -999999);
-  tv1 *= min_time_t;
-  ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
+  tv1 *= -10.0;
+  ACE_ASSERT (tv1 == tv2);
 
 #if defined (sun) && !defined (ACE_LACKS_LONGLONG_T)
   if (test_ace_u_longlong () != 0)