Merge branch 'master' into jwi-vs2019

39 files changed, 77 insertions, 78 deletions

diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp
index 3ebbb3c2790..c223563eb38 100644
--- a/ACE/ace/Message_Queue_T.cpp
+++ b/ACE/ace/Message_Queue_T.cpp
@@ -2715,7 +2715,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_pending_queue (co
                                      (int) current_status),
                                     -1);
                 }
-              /* FALLTHRU */
+              /* FALLTHROUGH */
             }
           else
             {
diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp
index 113e4670dce..1bf7a4cdc4b 100644
--- a/ACE/ace/OS_NS_unistd.cpp
+++ b/ACE/ace/OS_NS_unistd.cpp
@@ -388,7 +388,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
               ACE_OS::exit (errno);
             }
 #   endif /* ACE_HAS_WCHAR */
-
+          return result;
         default:
           // Server process.  The fork succeeded.
           return result;
diff --git a/ACE/ace/Shared_Object.h b/ACE/ace/Shared_Object.h
index 7ca66fae59b..6497f292e36 100644
--- a/ACE/ace/Shared_Object.h
+++ b/ACE/ace/Shared_Object.h
@@ -46,7 +46,6 @@ public:
 
   /// Returns information on a service object.
   virtual int info (ACE_TCHAR **info_string, size_t length = 0) const;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp
index 54c76e03b42..577a1e43035 100644
--- a/ACE/ace/Sig_Handler.cpp
+++ b/ACE/ace/Sig_Handler.cpp
@@ -10,8 +10,6 @@
 #include "ace/Sig_Handler.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 #if defined (ACE_HAS_SIG_C_FUNC)
 
 extern "C" void
diff --git a/ACE/examples/APG/Active_Objects/AO.cpp b/ACE/examples/APG/Active_Objects/AO.cpp
index 2b1f6a8f1a4..352075f1fca 100644
--- a/ACE/examples/APG/Active_Objects/AO.cpp
+++ b/ACE/examples/APG/Active_Objects/AO.cpp
@@ -92,8 +92,11 @@ public:
     while (1)
       {
         // Dequeue the next method object
-        auto_ptr<ACE_Method_Request>
-          request (this->activation_queue_.dequeue ());
+#if defined (ACE_HAS_CPP11)
+        std::unique_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
+#else
+        auto_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
+#endif /* ACE_HAS_CPP11 */
 
         // Invoke the method request.
         if (request->call () == -1)
diff --git a/ACE/examples/APG/Active_Objects/AO2.cpp b/ACE/examples/APG/Active_Objects/AO2.cpp
index 4d1e85242c2..a0bc5594362 100644
--- a/ACE/examples/APG/Active_Objects/AO2.cpp
+++ b/ACE/examples/APG/Active_Objects/AO2.cpp
@@ -90,8 +90,11 @@ public:
     while (1)
       {
         // Dequeue the next method object
-        auto_ptr<ACE_Method_Request>
-          request (this->activation_queue_.dequeue ());
+#if defined (ACE_HAS_CPP11)
+        std::unique_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
+#else
+        auto_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
+#endif /* ACE_HAS_CPP11 */
 
         // Invoke the method request.
         if (request->call () == -1)
diff --git a/ACE/examples/Threads/future1.cpp b/ACE/examples/Threads/future1.cpp
index db54db97fc3..96504624420 100644
--- a/ACE/examples/Threads/future1.cpp
+++ b/ACE/examples/Threads/future1.cpp
@@ -218,7 +218,11 @@ Scheduler::svc (void)
     {
       // Dequeue the next method object (we use an auto pointer in
       // case an exception is thrown in the <call>).
+#if defined (ACE_HAS_CPP11)
+      std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
+#else
       auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
+#endif /* ACE_HAS_CPP11 */
 
       ACE_DEBUG ((LM_DEBUG, "(%t) calling method object\n"));
       // Call it.
diff --git a/ACE/examples/Threads/future2.cpp b/ACE/examples/Threads/future2.cpp
index 5695d9ec27a..d435a7f6318 100644
--- a/ACE/examples/Threads/future2.cpp
+++ b/ACE/examples/Threads/future2.cpp
@@ -215,7 +215,11 @@ Scheduler::svc (void)
     {
       // Dequeue the next method object (we use an auto pointer in
       // case an exception is thrown in the <call>).
+#if defined (ACE_HAS_CPP11)
+      std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
+#else
       auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
+#endif /* ACE_HAS_CPP11 */
 
       ACE_DEBUG ((LM_DEBUG, " (%t) calling method object\n"));
       // Call it.
@@ -269,8 +273,11 @@ Scheduler::name (void)
         {
           // This scheduler is inactive... so we execute the user
           // request right away...
-
+#if defined (ACE_HAS_CPP11)
+          std::unique_ptr<ACE_Method_Request> mo (new Method_Request_name (this, new_future));
+#else
           auto_ptr<ACE_Method_Request> mo (new Method_Request_name (this, new_future));
+#endif /* ACE_HAS_CPP11 */
 
           mo->call ();
           // Smart pointer destructor automatically deletes mo.
@@ -295,8 +302,13 @@ Scheduler::work (u_long newparam, int newcount)
 
       if (this->thr_count () == 0)
         {
+#if defined (ACE_HAS_CPP11)
+          std::unique_ptr<ACE_Method_Request> mo
+            (new Method_Request_work (this, newparam, newcount, new_future));
+#else
           auto_ptr<ACE_Method_Request> mo
             (new Method_Request_work (this, newparam, newcount, new_future));
+#endif /* ACE_HAS_CPP11 */
           mo->call ();
           // Smart pointer destructor automatically deletes it.
         }
diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.cpp b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
index 0c41214bfa4..9ba0aabfd4f 100644
--- a/ACE/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
@@ -109,7 +109,11 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
                   ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE),
                   -1);
 
+#if defined (ACE_HAS_CPP11)
+  std::unique_ptr <ACE_Message_Block> header (header_p);
+#else
   auto_ptr <ACE_Message_Block> header (header_p);
+#endif /* ACE_HAS_CPP11 */
 
   // Align the Message Block for a CDR stream
   ACE_CDR::mb_align (header.get ());
@@ -217,7 +221,11 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
   ACE_NEW_RETURN (payload_p,
                   ACE_Message_Block (length),
                   -1);
+#if defined (ACE_HAS_CPP11)
+  std::unique_ptr <ACE_Message_Block> payload (payload_p);
+#else
   auto_ptr <ACE_Message_Block> payload (payload_p);
+#endif /* ACE_HAS_CPP11 */
 
   // Ensure there's sufficient room for log record payload.
   ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length);
diff --git a/ACE/netsvcs/lib/Name_Handler.cpp b/ACE/netsvcs/lib/Name_Handler.cpp
index d5a8faee576..d13c45f9adb 100644
--- a/ACE/netsvcs/lib/Name_Handler.cpp
+++ b/ACE/netsvcs/lib/Name_Handler.cpp
@@ -265,9 +265,9 @@ ACE_Name_Handler::recv_request (void)
   switch (n)
     {
     case -1:
-      /* FALLTHROUGH */
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("****************** recv_request returned -1\n")));
+      /* FALLTHROUGH */
     default:
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
index 196cf6c2c09..5bc40c5ae3a 100644
--- a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -65,7 +65,11 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
                   ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE),
                   -1);
 
+#if defined (ACE_HAS_CPP11)
+  std::unique_ptr <ACE_Message_Block> header (header_p);
+#else
   auto_ptr <ACE_Message_Block> header (header_p);
+#endif /* ACE_HAS_CPP11 */
 
   // Align the Message Block for a CDR stream
   ACE_CDR::mb_align (header.get ());
@@ -122,7 +126,11 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
   ACE_NEW_RETURN (payload_p,
                   ACE_Message_Block (length),
                   -1);
+#if defined (ACE_HAS_CPP11)
+  std::unique_ptr <ACE_Message_Block> payload (payload_p);
+#else
   auto_ptr <ACE_Message_Block> payload (payload_p);
+#endif /* ACE_HAS_CPP11 */
 
   // Ensure there's sufficient room for log record payload.
   ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length);
diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
index 22110b5ef5b..8b56b5f1790 100644
--- a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -245,8 +245,8 @@ ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply)
       switch (n)
         {
         case -1:
-          // FALLTHROUGH
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("****************** recv_reply returned -1\n")));
+          // FALLTHROUGH
         default:
           ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
                       ACE_TEXT ("recv failed"), n, bytes_expected));
diff --git a/ACE/netsvcs/lib/TS_Server_Handler.cpp b/ACE/netsvcs/lib/TS_Server_Handler.cpp
index e49e45eda62..f3f789998b2 100644
--- a/ACE/netsvcs/lib/TS_Server_Handler.cpp
+++ b/ACE/netsvcs/lib/TS_Server_Handler.cpp
@@ -192,19 +192,19 @@ ACE_TS_Server_Handler::dispatch (void)
 ACE_TS_Server_Handler::recv_request (void)
 {
   ACE_TRACE ("ACE_TS_Server_Handler::recv_request");
-  ssize_t bytes_expected = this->time_request_.size ();
+  ssize_t const bytes_expected = this->time_request_.size ();
 
   // Since Time_Request messages are fixed size, read the entire
   // message in one go.
-  ssize_t n = this->peer ().recv ((void *) &this->time_request_, bytes_expected);
+  ssize_t const n = this->peer ().recv ((void *) &this->time_request_, bytes_expected);
   if (n != bytes_expected)
     {
       switch (n)
         {
         case -1:
-          /* FALLTHROUGH */
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("****************** recv_request returned -1\n")));
+          /* FALLTHROUGH */
         default:
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
diff --git a/ACE/performance-tests/TCP/tcp_test.cpp b/ACE/performance-tests/TCP/tcp_test.cpp
index 371575d0da7..783b212563d 100644
--- a/ACE/performance-tests/TCP/tcp_test.cpp
+++ b/ACE/performance-tests/TCP/tcp_test.cpp
@@ -559,6 +559,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                "\nbufsz must be <= %d\n",
                                BUFSIZ),
                               1);
+          break;
 
         case 'i':
           nsamples = ACE_OS::atoi (get_opt.opt_arg ());
diff --git a/ACE/performance-tests/UDP/udp_test.cpp b/ACE/performance-tests/UDP/udp_test.cpp
index 2912b8a5e0b..3b8cec8e6cd 100644
--- a/ACE/performance-tests/UDP/udp_test.cpp
+++ b/ACE/performance-tests/UDP/udp_test.cpp
@@ -604,7 +604,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             ACE_ERROR_RETURN ((LM_ERROR,
                                "\nBuffer size must be greater than 0!\n\n"),
                               1);
-
+          break;
         case 'n':
           nsamples = ACE_OS::atoi (getopt.opt_arg ());
           if (nsamples <= 0)
diff --git a/ACE/tests/Process_Manual_Event_Test.cpp b/ACE/tests/Process_Manual_Event_Test.cpp
index a4c8846b97b..7d1e55d0e01 100644
--- a/ACE/tests/Process_Manual_Event_Test.cpp
+++ b/ACE/tests/Process_Manual_Event_Test.cpp
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/Process.h"
 #include "ace/Manual_Event.h"
@@ -23,7 +22,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_dirent.h"
 
-
 #if (!defined (ACE_LACKS_FORK) || defined (ACE_WIN32)) && \
   (defined (ACE_WIN32) || \
    (defined (ACE_HAS_PTHREADS) && defined (_POSIX_THREAD_PROCESS_SHARED) && \
diff --git a/ACE/tests/Process_Mutex_Test.cpp b/ACE/tests/Process_Mutex_Test.cpp
index 37af2cd1b2c..74d9aa65663 100644
--- a/ACE/tests/Process_Mutex_Test.cpp
+++ b/ACE/tests/Process_Mutex_Test.cpp
@@ -8,7 +8,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/Mutex.h"
 #include "ace/Process.h"
@@ -20,8 +19,6 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/os_include/os_dirent.h"
 
-
-
 static int release_mutex = 1;
 static int child_process = 0;
 static const ACE_TCHAR *mutex_name = ACE_DEFAULT_MUTEX;
diff --git a/ACE/tests/Process_Semaphore_Test.cpp b/ACE/tests/Process_Semaphore_Test.cpp
index 84701efb0e3..80b7e1aa40b 100644
--- a/ACE/tests/Process_Semaphore_Test.cpp
+++ b/ACE/tests/Process_Semaphore_Test.cpp
@@ -9,7 +9,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/Mutex.h"
 #include "ace/Process.h"
@@ -30,8 +29,6 @@
 #include "ace/OS_NS_stdlib.h"
 #include "ace/SString.h"
 
-
-
 #if !defined (ACE_LACKS_FORK)
 static int iterations = 10;
 static int child_process = 0;
diff --git a/ACE/tests/Process_Strategy_Test.cpp b/ACE/tests/Process_Strategy_Test.cpp
index 30396675003..aa0797fe6b7 100644
--- a/ACE/tests/Process_Strategy_Test.cpp
+++ b/ACE/tests/Process_Strategy_Test.cpp
@@ -29,7 +29,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
@@ -49,8 +48,6 @@
 // Counting_Service and Options in here
 #include "Process_Strategy_Test.h"
 
-
-
 // This test does not function properly when fork() is used on HP-UX
 #if defined(__hpux)
 #define ACE_LACKS_FORK
diff --git a/ACE/tests/Process_Test.cpp b/ACE/tests/Process_Test.cpp
index da9ff2cd495..328702994b5 100644
--- a/ACE/tests/Process_Test.cpp
+++ b/ACE/tests/Process_Test.cpp
@@ -9,7 +9,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/Process.h"
 #include "ace/Get_Opt.h"
@@ -25,7 +24,6 @@
 // 'self' level and link to the opened file name.
 static const char *proc_self_fd = "/proc/self/fd/";
 
-
 int
 test_setenv (void)
 {
diff --git a/ACE/tests/RB_Tree_Test.cpp b/ACE/tests/RB_Tree_Test.cpp
index f9eddf66564..481afb8cc21 100644
--- a/ACE/tests/RB_Tree_Test.cpp
+++ b/ACE/tests/RB_Tree_Test.cpp
@@ -19,16 +19,12 @@
  */
 //=============================================================================
 
-
 #include "test_config.h" /* Include first to enable ACE_TEST_ASSERT. */
 #include "ace/RB_Tree.h"
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
-
 #include "RB_Tree_Test.h"
 
-
-
 // Type definitions for the four distinct parameterizations of the
 // test.
 
diff --git a/ACE/tests/Reactor_Dispatch_Order_Test.cpp b/ACE/tests/Reactor_Dispatch_Order_Test.cpp
index c61ee0a672a..b0032d4d36a 100644
--- a/ACE/tests/Reactor_Dispatch_Order_Test.cpp
+++ b/ACE/tests/Reactor_Dispatch_Order_Test.cpp
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Reactor.h"
@@ -20,10 +19,7 @@
 #include "ace/Pipe.h"
 #include "ace/ACE.h"
 
-
-
-static const char *message =
-"Hello there! Hope you get this message";
+static const char *message = "Hello there! Hope you get this message";
 
 class Handler : public ACE_Event_Handler
 {
diff --git a/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp
index 21ab37471cf..849f544966f 100644
--- a/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp
+++ b/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Reactor.h"
@@ -20,12 +19,9 @@
 #include "ace/Pipe.h"
 #include "ace/ACE.h"
 
-
-
 #if defined (ACE_HAS_DEV_POLL) || defined (ACE_HAS_EVENT_POLL)
 
-static const char *message =
-"Hello there! Hope you get this message";
+static const char *message = "Hello there! Hope you get this message";
 
 class Handler : public ACE_Event_Handler
 {
diff --git a/ACE/tests/Reactor_Exceptions_Test.cpp b/ACE/tests/Reactor_Exceptions_Test.cpp
index 6f452938235..2796ac8ee6a 100644
--- a/ACE/tests/Reactor_Exceptions_Test.cpp
+++ b/ACE/tests/Reactor_Exceptions_Test.cpp
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/Reactor.h"
 #include "ace/SOCK_Dgram.h"
diff --git a/ACE/tests/Reactor_Fairness_Test.cpp b/ACE/tests/Reactor_Fairness_Test.cpp
index 395826c9513..3e71285e641 100644
--- a/ACE/tests/Reactor_Fairness_Test.cpp
+++ b/ACE/tests/Reactor_Fairness_Test.cpp
@@ -11,7 +11,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "Reactor_Fairness_Test.h"
 #include "ace/Get_Opt.h"
@@ -29,8 +28,6 @@
 #include "ace/Atomic_Op.h"
 #include "ace/Thread_Mutex.h"
 
-
-
 #if defined (ACE_HAS_THREADS)
 
 namespace {
diff --git a/ACE/tests/Reactor_Notify_Test.cpp b/ACE/tests/Reactor_Notify_Test.cpp
index 3101875dac3..38207bf6aff 100644
--- a/ACE/tests/Reactor_Notify_Test.cpp
+++ b/ACE/tests/Reactor_Notify_Test.cpp
@@ -14,7 +14,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/Synch_Traits.h"
@@ -25,8 +24,6 @@
 #include "ace/Select_Reactor.h"
 #include "ace/Thread_Semaphore.h"
 
-
-
 #if defined (ACE_HAS_THREADS)
 
 static const time_t LONG_TIMEOUT = 10;
diff --git a/ACE/tests/Reactor_Performance_Test.cpp b/ACE/tests/Reactor_Performance_Test.cpp
index 63e55cbbe85..c241ebfeb3c 100644
--- a/ACE/tests/Reactor_Performance_Test.cpp
+++ b/ACE/tests/Reactor_Performance_Test.cpp
@@ -11,7 +11,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "Reactor_Performance_Test.h"
 #include "ace/Profile_Timer.h"
@@ -25,8 +24,6 @@
 #include "ace/Select_Reactor.h"
 #include "ace/Auto_Ptr.h"
 
-
-
 #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT
 
 static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
diff --git a/ACE/tests/Reactor_Registration_Test.cpp b/ACE/tests/Reactor_Registration_Test.cpp
index 92082ad5026..3f11928bfe0 100644
--- a/ACE/tests/Reactor_Registration_Test.cpp
+++ b/ACE/tests/Reactor_Registration_Test.cpp
@@ -9,7 +9,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/Pipe.h"
 #include "ace/Reactor.h"
diff --git a/ACE/tests/Reactor_Remove_Resume_Test.cpp b/ACE/tests/Reactor_Remove_Resume_Test.cpp
index 3d6b348c8ef..40a2334f103 100644
--- a/ACE/tests/Reactor_Remove_Resume_Test.cpp
+++ b/ACE/tests/Reactor_Remove_Resume_Test.cpp
@@ -13,7 +13,6 @@
  * @author  Ossama Othman
  */
 
-
 #include "test_config.h"
 #include "ace/Reactor.h"
 #include "ace/TP_Reactor.h"
diff --git a/ACE/tests/Reactor_Timer_Test.cpp b/ACE/tests/Reactor_Timer_Test.cpp
index 8a9f5b4eedc..90d2f522bef 100644
--- a/ACE/tests/Reactor_Timer_Test.cpp
+++ b/ACE/tests/Reactor_Timer_Test.cpp
@@ -12,7 +12,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/Timer_Queue.h"
 #include "ace/Reactor.h"
@@ -23,8 +22,6 @@
 #include "ace/Timer_Heap.h"
 #include "ace/Auto_Ptr.h"
 
-
-
 static int done = 0;
 static int the_count = 0;
 static int odd = 0;
diff --git a/ACE/tests/Reactors_Test.cpp b/ACE/tests/Reactors_Test.cpp
index 5a514dd7be4..0a2644cca7a 100644
--- a/ACE/tests/Reactors_Test.cpp
+++ b/ACE/tests/Reactors_Test.cpp
@@ -12,15 +12,12 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/Task.h"
 #include "ace/Reactor.h"
 #include "ace/Atomic_Op.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
-
-
 #if defined (ACE_HAS_THREADS)
 
 ACE_Thread_Manager *thr_mgr;
@@ -62,9 +59,6 @@ private:
 int Test_Task::task_count_ = 0;
 
 static ACE_Atomic_Op<ACE_Thread_Mutex, int> done_count = MAX_TASKS * 2;
-
-
-
 static ACE_Recursive_Thread_Mutex recursive_lock;
 
 Test_Task::Test_Task (void)
diff --git a/ACE/tests/Reader_Writer_Test.cpp b/ACE/tests/Reader_Writer_Test.cpp
index a2192fdbff7..a4cc9bad69c 100644
--- a/ACE/tests/Reader_Writer_Test.cpp
+++ b/ACE/tests/Reader_Writer_Test.cpp
@@ -11,7 +11,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/Thread.h"
 #include "ace/Thread_Manager.h"
@@ -22,8 +21,6 @@
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/Time_Value.h"
 
-
-
 #if defined (ACE_HAS_THREADS)
 
 // Default number of iterations.
diff --git a/ACE/tests/Recursive_Condition_Bug_Test.cpp b/ACE/tests/Recursive_Condition_Bug_Test.cpp
index 53792697d4b..04e6224dca0 100644
--- a/ACE/tests/Recursive_Condition_Bug_Test.cpp
+++ b/ACE/tests/Recursive_Condition_Bug_Test.cpp
@@ -14,7 +14,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Task_T.h"
diff --git a/ACE/tests/Recursive_Condition_Test.cpp b/ACE/tests/Recursive_Condition_Test.cpp
index b161a720cfd..e1e596edf71 100644
--- a/ACE/tests/Recursive_Condition_Test.cpp
+++ b/ACE/tests/Recursive_Condition_Test.cpp
@@ -11,7 +11,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_time.h"
@@ -21,8 +20,6 @@
 #include "ace/Timer_Heap.h"
 #include "ace/Timer_Queue_Adapters.h"
 
-
-
 #if defined (ACE_HAS_THREADS)
 
 typedef ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap> Thread_Timer_Queue;
diff --git a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp
index 0609e204cfd..a2b975baaf1 100644
--- a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp
+++ b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp
@@ -11,7 +11,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/ACE.h"
 #include "ace/Task.h"
diff --git a/ACE/tests/Reverse_Lock_Test.cpp b/ACE/tests/Reverse_Lock_Test.cpp
index 6cc26019205..f9f8cefd2d6 100644
--- a/ACE/tests/Reverse_Lock_Test.cpp
+++ b/ACE/tests/Reverse_Lock_Test.cpp
@@ -11,15 +11,12 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
 #include "ace/Reverse_Lock_T.h"
 
-
-
 typedef ACE_Reverse_Lock<ACE_SYNCH_MUTEX> REVERSE_MUTEX;
 
 int
diff --git a/ACE/tests/SOCK_Dgram_Test.cpp b/ACE/tests/SOCK_Dgram_Test.cpp
index 80935a3e167..6e4d49cec06 100644
--- a/ACE/tests/SOCK_Dgram_Test.cpp
+++ b/ACE/tests/SOCK_Dgram_Test.cpp
@@ -130,6 +130,13 @@ client (void *arg)
 
       ACE_INET_Addr to_addr = local_addr;
 
+#if defined(ACE_LACKS_RECVMSG)
+      ssize_t rcv_cnt = cli_dgram.recv (buf,
+                                        sizeof (buf),
+                                        peer_addr,
+                                        0,
+                                        &timeout);
+#else
       iovec iov[1];
       // Some platforms define iov_base as char* instead of void*.
       iov[0].iov_base = (char *)buf;
@@ -140,6 +147,8 @@ client (void *arg)
                                         peer_addr,
                                         0,
                                         &to_addr);
+#endif
+
       if (rcv_cnt == -1)
         {
           if (errno == ETIME)
diff --git a/ACE/tests/Task_Ex_Test.cpp b/ACE/tests/Task_Ex_Test.cpp
index 15b03891a2c..d9d141aaaa9 100644
--- a/ACE/tests/Task_Ex_Test.cpp
+++ b/ACE/tests/Task_Ex_Test.cpp
@@ -67,7 +67,11 @@ int Consumer::svc ()
   while(this->getq (pMsg)!=-1)
   {
     ACE_TEST_ASSERT (pMsg!=0);
+#if defined (ACE_HAS_CPP11)
+    std::unique_ptr<User_Defined_Msg> pAuto(pMsg);
+#else
     auto_ptr<User_Defined_Msg> pAuto(pMsg);
+#endif /* ACE_HAS_CPP11 */
     ACE_DEBUG((LM_DEBUG,
                ACE_TEXT("Consumer::svc got msg id=%d\n"),
                pMsg->msg_id ()));
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9fd04d86446..f247a4c434d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -85,36 +85,43 @@ jobs:
         BuildConfiguration: Debug
         vcpkgarch: x64-windows
         vcpkglibdir: debug\lib
-        OptionalFeatures: uses_wchar=1 xerces3=0
+        vcpkgpackages: 'openssl xerces-c[xmlch_wchar]'
+        OptionalFeatures: uses_wchar=1
       Debug64:
         BuildPlatform: x64
         BuildConfiguration: Debug
         vcpkgarch: x64-windows
         vcpkglibdir: debug\lib
+        vcpkgpackages: openssl xerces-c
       Release64:
         BuildPlatform: x64
         BuildConfiguration: Release
         vcpkgarch: x64-windows
         vcpkglibdir: lib
+        vcpkgpackages: openssl xerces-c
       Debug32:
         BuildPlatform: Win32
         BuildConfiguration: Debug
         vcpkgarch: x86-windows
         vcpkglibdir: debug\lib
+        vcpkgpackages: openssl xerces-c
       Release32:
         BuildPlatform: Win32
         BuildConfiguration: Release
         vcpkgarch: x86-windows
         vcpkglibdir: lib
+        vcpkgpackages: openssl xerces-c
   variables:
-    VCPKG_ROOT: C:\vcpkg
+    VCPKG_ROOT: $(Build.SourcesDirectory)\vcpkg
     XERCESC_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
     XERCESC_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
     SSL_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
     SSL_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
   steps:
   - powershell: |
-      vcpkg install --recurse --triplet $(vcpkgarch) openssl xerces-c
+      git clone --depth 1 git://github.com/Microsoft/vcpkg.git $(VCPKG_ROOT)
+      $(VCPKG_ROOT)\bootstrap-vcpkg.bat
+      $(VCPKG_ROOT)\vcpkg install --recurse --triplet $(vcpkgarch) $(vcpkgpackages)
     displayName: Install additional packages using vcpkg
   - powershell: |
       '#include "ace/config-win32.h"' > $(ACE_ROOT)/ace/config.h