Merge branch 'master' into jwi-ACE_HAS_TIME_T_LONG_MISMATCH

Author: jwillemsen

ACE/ace/OS_NS_sys_select.inl

@@ -16,15 +16,13 @@ ACE_OS::select (int width,
 #if defined (ACE_HAS_NONCONST_SELECT_TIMEVAL)
   // We must defend against non-conformity!
   timeval copy;
-  timeval *timep = 0;
+  timeval *timep = nullptr;
 
-  if (timeout != 0)
+  if (timeout != nullptr)
     {
       copy = *timeout;
-      timep = ©
+      timep = std::addressof(copy);
     }
-  else
-    timep = 0;
 #else
   const timeval *timep = (timeout == 0 ? (const timeval *)0 : *timeout);
 #endif /* ACE_HAS_NONCONST_SELECT_TIMEVAL */

ACE/tests/Time_Value_Test.cpp

@@ -20,6 +20,38 @@
 #include <sstream>
 #include <type_traits>
 
+int timeval_test_func (const ACE_Time_Value* timeout)
+{
+  int ret = 0;
+  timeval timeval_test;
+
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Start test ACE_Time_Value to timeval conversion\n")));
+
+  if (timeout)
+    {
+      timeval_test = *timeout;
+    }
+
+  if (timeval_test.tv_sec != 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("timeval.tv_sec should be zero not %d\n"), timeval_test.tv_sec));
+      ++ret;
+    }
+  if (timeval_test.tv_usec != 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("timeval.tv_usec should be zero not %d\n"), timeval_test.tv_usec));
+      ++ret;
+    }
+
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Finished test ACE_Time_Value to timeval conversion\n")));
+
+  return ret;
+}
+
 int
 run_main (int, ACE_TCHAR *[])
 {
@@ -227,6 +259,8 @@ run_main (int, ACE_TCHAR *[])
                   ACE_TEXT ("time_t is at least 64bit, this platform will not have problems after 2038\n")));
     }
 
+  ret += timeval_test_func ((ACE_Time_Value *) &ACE_Time_Value::zero);
+
   ACE_END_TEST;
 
   return ret;