Merge branch 'master' into jwi-ACE_HAS_TIME_T_LONG_MISMATCH

Author: jwillemsen

ACE/tests/Compiler_Features_16_Test.cpp

@@ -9,8 +9,6 @@
 #include <stdint.h>
 #include <ostream>
 
-static constexpr uint32_t bound = std::numeric_limits<uint32_t>::max();
-
 namespace CORBA {
   // First forward declare TCKind, this is legal with C++11
   enum class TCKind : uint32_t;
@@ -25,10 +23,9 @@ namespace CORBA {
   // And another forward declared TCKind, after it has been
   // declared
   enum class TCKind : uint32_t;
-};
+}
 
-std::ostream& operator<<
-(std::ostream& strm,CORBA::TCKind _enumerator)
+std::ostream& operator<< (std::ostream& strm, CORBA::TCKind _enumerator)
 {
   switch (_enumerator) {
     case CORBA::TCKind::tk_null: return strm << "CORBA::TCKind::tk_null"; break;

ACE/tests/MM_Shared_Memory_Test.cpp

@@ -25,10 +25,6 @@
 
 #if !defined (ACE_LACKS_MMAP)
 
-static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
-const int SHMSZ = 27;
-static ACE_TCHAR *shm_key;
-
 #if defined (ACE_LACKS_FORK)
 #include "ace/Thread_Semaphore.h"
 typedef ACE_Thread_Semaphore SYNCHRONIZER;
@@ -65,6 +61,11 @@ const ACE_TCHAR *sem_name ()
 }
 #endif /* !defined (ACE_LACKS_FORK) */
 
+#ifndef ACE_DISABLE_MKTEMP
+static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
+const int SHMSZ = 27;
+static ACE_TCHAR *shm_key;
+
 // Synchronize the start of the parent and the child.
 static SYNCHRONIZER *synchronizer = 0;
 
@@ -194,6 +195,7 @@ spawn ()
 #endif /* ACE_HAS_THREADS */
   return 0;
 }
+#endif /* !ACE_DISABLE_MKTEMP */
 #endif /* !ACE_LACKS_MMAP */
 
 int

ACE/tests/Multicast_Interfaces_Test.cpp

@@ -105,6 +105,8 @@ get_valid_ipv4_interface_names (nameset &names)
   get_valid_ipv4_interface_names_win32 (names);
 #elif defined (ACE_HAS_GETIFADDRS)
   get_valid_ipv4_interface_names_getifaddrs (names);
+#else
+  ACE_UNUSED_ARG (names);
 #endif /* ACE_WIN32 */
 }
 

ACE/tests/OS_Test.cpp

@@ -1208,7 +1208,7 @@ ace_ctype_test ()
       ++retval;
     }
 
-  return 0;
+  return retval;
 }
 
 int

ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp

@@ -375,7 +375,7 @@ dev_poll_reactor_factory ()
  *
  * Reactor test execution functor.
  */
-struct Run_Test : public std::function<void(reactor_factory_type)>
+struct Run_Test
 {
   /// Function call operator overload.
   void operator() (reactor_factory_type factory)

ACE/tests/Recursive_Condition_Test.cpp

@@ -236,8 +236,8 @@ run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Recursive_Condition_Test"));
 
-#if defined (ACE_HAS_THREADS)
   int status = 0;
+#if defined (ACE_HAS_THREADS)
 
   /* Test 1 - Simple test */
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test 1...\n")));
@@ -293,6 +293,6 @@ run_main (int, ACE_TCHAR *[])
               ACE_TEXT ("ACE doesn't support recursive condition variables on this platform\n")));
 #endif /* ACE_HAS_THREADS */
   ACE_END_TEST;
-  return 0;
+  return status;
 }
 

ACE/tests/SOCK_Send_Recv_Test_IPV6.cpp

@@ -32,6 +32,8 @@ static int Test_Result = 0;
 
 #if !defined (ACE_LACKS_FORK) || defined (ACE_HAS_THREADS)
 
+#if defined (ACE_HAS_IPV6)
+
 // In test 3, a large amount of data is sent. The purpose is to overflow the
 // TCP send window, causing the sender to block (it's a send_n). This value
 // is the amount to send. The assumption is that no implementation has a
@@ -43,9 +45,6 @@ const size_t Test3_Send_Size = 4*1024;
 const size_t Test3_Loops = 10;
 const size_t Test3_Total_Size = Test3_Send_Size * Test3_Loops;
 
-
-#if defined (ACE_HAS_IPV6)
-
 static void *
 client (void *arg)
 {

ACE/tests/STL_algorithm_Test_T.cpp

@@ -14,6 +14,8 @@ class Element_Counter
   {
   }
 
+  Element_Counter (const Element_Counter &) = default;
+
   void operator () (typename T::value_type & item)
   {
     ++ this->count_;

ACE/tests/Sendfile_Test.cpp

@@ -29,16 +29,6 @@ static int Test_Result = 0;
 
 #if !defined (ACE_LACKS_FORK) || defined (ACE_HAS_THREADS)
 
-// This test sends a large amount of data.  The purpose is to overflow the
-// TCP send window, causing the sender to block (it's a send_n). This value
-// is the amount to send. The assumption is that no implementation has a
-// receive window larger than 128K bytes. If one is found, this is the place
-// to change it.
-// For some odd reason, NT will try to send a single large buffer, but not
-// multiple smaller ones that add up to the large size.
-const size_t Test3_Send_Size = 4*1024;
-const size_t Test3_Loops = 10;
-
 static void *
 client (void *arg)
 {

ACE/tests/Thread_Pool_Test.cpp

@@ -205,9 +205,7 @@ Thread_Pool::test_queue_deactivation_shutdown ()
   // Run the main loop that generates messages and enqueues them into
   // the pool of threads managed by <ACE_Task>.
 
-  for (size_t count = 0;
-       ;
-       count++)
+  while (true)
     {
       ssize_t n = 0;
 
@@ -294,10 +292,7 @@ Thread_Pool::test_empty_message_shutdown ()
 
   // Run the main loop that generates messages and enqueues them into
   // the pool of threads managed by <ACE_Task>.
-
-  for (size_t count = 0;
-       ;
-       count++)
+  while (true)
     {
       ssize_t n = 0;