Merge branch 'master' into jwi-defaultcpp17

.github/workflows/windows.yml

@@ -131,7 +131,7 @@ jobs:
     - name: Install vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: fba75d09065fcc76a25dcf386b1d00d33f5175af
+        vcpkgGitCommitId: a34c873a9717a888f58dc05268dea15592c2f0ff
         runVcpkgInstall: true
     - name: create $ACE_ROOT/ace/config.h
       run: |

ACE/ace/Configuration.h

@@ -349,7 +349,7 @@ class ACE_Export ACE_Configuration
    * error The path consists of sections separated by the backslash
    * '\' or forward slash '/'.
    * Returns 0 on success, -1 if <create) is 0 and the path refers
-   * a nonexistant section
+   * a non-existent section
    */
   int expand_path (const ACE_Configuration_Section_Key& key,
                    const ACE_TString& path_in,

ACE/ace/Process.cpp

@@ -1121,10 +1121,18 @@ ACE_Process_Options::release_handles ()
       ACE_OS::close (startup_info_.hStdInput);
       ACE_OS::close (startup_info_.hStdOutput);
       ACE_OS::close (startup_info_.hStdError);
+
+      startup_info_.hStdInput = ACE_INVALID_HANDLE;
+      startup_info_.hStdOutput = ACE_INVALID_HANDLE;
+      startup_info_.hStdError = ACE_INVALID_HANDLE;
 #else /* ACE_WIN32 */
       ACE_OS::close (stdin_);
       ACE_OS::close (stdout_);
       ACE_OS::close (stderr_);
+
+      stdin_ = ACE_INVALID_HANDLE;
+      stdout_ = ACE_INVALID_HANDLE;
+      stderr_ = ACE_INVALID_HANDLE;
 #endif /* ACE_WIN32 */
       set_handles_called_ = 0;
     }

ACE/ace/SOCK_Dgram_Mcast.cpp

@@ -564,17 +564,13 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
 
   // Open the socket IFF this is the first ::subscribe and ::open
   // was not explicitly invoked.
-  if (this->open (mcast_addr,
-                  net_if,
-                  reuse_addr) == -1)
+  if (this->open (mcast_addr, net_if, reuse_addr) == -1)
     return -1;
 
   // Only do this if net_if == 0, i.e., INADDR_ANY
   if (net_if == 0)
     {
-      int result = this->subscribe_ifs (mcast_addr,
-                                        net_if,
-                                        reuse_addr);
+      int const result = this->subscribe_ifs (mcast_addr, net_if, reuse_addr);
       // Check for error or "short-circuit" return.
       if (result != 0)
         return result;

ACE/include/makeinclude/wrapper_macros.GNU

@@ -283,10 +283,6 @@ ifeq ($(debug),0)
   DEFFLAGS        += -DNDEBUG
 endif
 
-ifeq (,$(findstring -I$(ACE_ROOT),$(INCLDIRS)))
-  INCLDIRS        += -I$(ACE_ROOT)
-endif
-
 CPPFLAGS          += $(DEFFLAGS) $(INCLDIRS)
 
 # Define default extensions for IDL-generated files

ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h

@@ -96,7 +96,7 @@ const size_t ACE_MAX_THREADS = 4;
 
 #if defined (VXWORKS)
 // This is the only way I could figure out to avoid an error
-// about attempting to unlink a non-existant file.
+// about attempting to unlink a non-existent file.
 #define ACE_INIT_LOG(NAME) \
   ACE_TCHAR temp[MAXPATHLEN]; \
   ACE_OS::sprintf (temp, ACE_TEXT ("%s%s%s"), \
@@ -198,7 +198,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 #if defined (VXWORKS)
   // This is the only way I could figure out to avoid a console
   // warning about opening an existing file (w/o O_CREAT), or
-  // attempting to unlink a non-existant one.
+  // attempting to unlink a non-existent one.
   ACE_HANDLE fd = ACE_OS::open (temp,
                                 O_WRONLY|O_CREAT,
                                 S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);

ACE/tests/Test_Output.cpp

@@ -110,7 +110,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 #if defined (ACE_VXWORKS)
   // This is the only way I could figure out to avoid a console
   // warning about opening an existing file (w/o O_CREAT), or
-  // attempting to unlink a non-existant one.
+  // attempting to unlink a non-existent one.
   ACE_HANDLE fd = ACE_OS::open (temp,
                                 O_WRONLY|O_CREAT,
                                 S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);

ACE/tests/run_test.lst

@@ -220,7 +220,7 @@ Reference_Counted_Event_Handler_Test -d 0
 Refcounted_Event_Handler_Test_DevPoll:
 Reverse_Lock_Test
 RW_Process_Mutex_Test: !VxWorks !ACE_FOR_TAO !PHARLAP !Cygwin
-Sendfile_Test: !QNX !NO_NETWORK !VxWorks !LabVIEW_RT
+Sendfile_Test: !NO_NETWORK !VxWorks !LabVIEW_RT
 Signal_Test: !VxWorks !Cygwin
 SOCK_Acceptor_Test: !NO_NETWORK
 SOCK_Connector_Test: !NO_NETWORK

TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp

@@ -99,7 +99,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 #if defined (VXWORKS)
   // This is the only way I could figure out to avoid a console
   // warning about opening an existing file (w/o O_CREAT), or
-  // attempting to unlink a non-existant one.
+  // attempting to unlink a non-existent one.
   ACE_HANDLE fd = ACE_OS::open (temp,
                                 O_WRONLY|O_CREAT,
                                 S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);

TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp

@@ -99,7 +99,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 #if defined (VXWORKS)
   // This is the only way I could figure out to avoid a console
   // warning about opening an existing file (w/o O_CREAT), or
-  // attempting to unlink a non-existant one.
+  // attempting to unlink a non-existent one.
   ACE_HANDLE fd = ACE_OS::open (temp,
                                 O_WRONLY|O_CREAT,
                                 S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);

TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp

@@ -99,7 +99,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 #if defined (VXWORKS)
   // This is the only way I could figure out to avoid a console
   // warning about opening an existing file (w/o O_CREAT), or
-  // attempting to unlink a non-existant one.
+  // attempting to unlink a non-existent one.
   ACE_HANDLE fd = ACE_OS::open (temp,
                                 O_WRONLY|O_CREAT,
                                 S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);

TAO/tao/PI/PICurrent_Impl.cpp

@@ -150,7 +150,7 @@ TAO::PICurrent_Impl::~PICurrent_Impl ()
     this->impending_change_callback_->convert_from_lazy_to_real_copy ();
 
   // If we have logically copied another table, ensure it is told about our
-  // demise so that it will not call our non-existant
+  // demise so that it will not call our non-existent
   // convert_from_lazy_to_real_copy() when it changes/destructs.
   if (0 != this->lazy_copy_)
     this->lazy_copy_->set_callback_for_impending_change (0);

TAO/tests/POA/FindPOA/FindPOA.cpp

@@ -64,7 +64,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       poa_manager->activate ();
 
-      // Try to find a non-existant POA.  Since the Adapter Activator
+      // Try to find a non-existent POA.  Since the Adapter Activator
       // has not been installed yet, this call should fail.
       find_non_existant_POA (root_poa.in (),
                              "firstPOA",
@@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         first_poa->find_POA (name.c_str (),
                              1);
 
-      // Try to find a non-existant POA.  Even though the Adapter
+      // Try to find a non-existent POA.  Even though the Adapter
       // Activator has been installed, this call should fail because
       // the activate (if not found) flag is 0.
       find_non_existant_POA (root_poa.in (),