Merge pull request #370 from jwillemsen/master

Android improvements, Fuzz fixes and features file for Visual Studio 2017

18 files changed, 86 insertions, 81 deletions

diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp
index d2812fe45d2..781ef3077eb 100644
--- a/ACE/ace/ACE.cpp
+++ b/ACE/ace/ACE.cpp
@@ -2398,11 +2398,10 @@ ACE::format_hexdump (const char *buffer,
   return size;
 }
 
-// Returns the current timestamp in the form
-// "hour:minute:second:microsecond."  The month, day, and year are
-// also stored in the beginning of the date_and_time array
-// using ISO-8601 format.
-
+/// Returns the current timestamp in the form
+/// "hour:minute:second:microsecond."  The month, day, and year are
+/// also stored in the beginning of the date_and_time array
+/// using ISO-8601 format.
 ACE_TCHAR *
 ACE::timestamp (ACE_TCHAR date_and_time[],
                 size_t date_and_timelen,
@@ -2414,13 +2413,12 @@ ACE::timestamp (ACE_TCHAR date_and_time[],
                          return_pointer_to_first_digit);
 }
 
-// Returns the given timestamp in the form
-// "hour:minute:second:microsecond."  The month, day, and year are
-// also stored in the beginning of the date_and_time array
-// using ISO-8601 format.
-// 012345678901234567890123456
-// 2010-12-02 12:56:00.123456<nul>
-
+/// Returns the given timestamp in the form
+/// "hour:minute:second:microsecond."  The month, day, and year are
+/// also stored in the beginning of the date_and_time array
+/// using ISO-8601 format.
+/// 012345678901234567890123456
+/// 2010-12-02 12:56:00.123456<nul>
 ACE_TCHAR *
 ACE::timestamp (const ACE_Time_Value& time_value,
                 ACE_TCHAR date_and_time[],
@@ -2457,8 +2455,7 @@ ACE::timestamp (const ACE_Time_Value& time_value,
   return &date_and_time[10 + (return_pointer_to_first_digit != 0)];
 }
 
-// This function rounds the request to a multiple of the page size.
-
+/// This function rounds the request to a multiple of the page size.
 size_t
 ACE::round_to_pagesize (size_t len)
 {
@@ -2640,8 +2637,7 @@ ACE::handle_timed_complete (ACE_HANDLE h,
   return h;
 }
 
-// Wait up to <timeout> amount of time to accept a connection.
-
+/// Wait up to @a timeout amount of time to accept a connection.
 int
 ACE::handle_timed_accept (ACE_HANDLE listener,
                           ACE_Time_Value *timeout,
@@ -2710,9 +2706,8 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
     }
 }
 
-// Make the current process a UNIX daemon.  This is based on Stevens
-// code from APUE.
-
+/// Make the current process a UNIX daemon.  This is based on Stevens
+/// code from APUE.
 int
 ACE::daemonize (const ACE_TCHAR pathname[],
                 bool close_all_handles,
@@ -2916,7 +2911,7 @@ ACE::set_handle_limit (int new_limit,
   return 0;
 }
 
-// Euclid's greatest common divisor algorithm.
+/// Euclid's greatest common divisor algorithm.
 u_long
 ACE::gcd (u_long x, u_long y)
 {
@@ -2931,7 +2926,7 @@ ACE::gcd (u_long x, u_long y)
 }
 
 
-// Calculates the minimum enclosing frame size for the given values.
+/// Calculates the minimum enclosing frame size for the given values.
 u_long
 ACE::minimum_frame_size (u_long period1, u_long period2)
 {
diff --git a/ACE/ace/Reactor_Impl.h b/ACE/ace/Reactor_Impl.h
index 44d5d55afd5..dd02f9857b9 100644
--- a/ACE/ace/Reactor_Impl.h
+++ b/ACE/ace/Reactor_Impl.h
@@ -52,12 +52,12 @@ public:
   virtual int close (void) = 0;
 
   /**
-   * Called by a thread when it wants to unblock the <Reactor_Impl>.
-   * This wakeups the <Reactor_Impl> if currently blocked.  Pass over
-   * both the <Event_Handler> *and* the @a mask to allow the caller to
-   * dictate which <Event_Handler> method the <Reactor_Impl> will
+   * Called by a thread when it wants to unblock the Reactor_Impl.
+   * This wakeups the Reactor_Impl if currently blocked.  Pass over
+   * both the Event_Handler *and* the @a mask to allow the caller to
+   * dictate which Event_Handler method the Reactor_Impl will
    * invoke.  The ACE_Time_Value indicates how long to blocking
-   * trying to notify the <Reactor_Impl>.  If @a timeout == 0, the
+   * trying to notify the Reactor_Impl.  If @a timeout == 0, the
    * caller will block until action is possible, else will wait until
    * the relative time specified in *@a timeout elapses).
    */
@@ -66,29 +66,29 @@ public:
                       ACE_Time_Value *timeout = 0) = 0;
 
   /// Handles pending threads (if any) that are waiting to unblock the
-  /// <Reactor_Impl>.
+  /// Reactor_Impl.
   virtual int dispatch_notifications (int &number_of_active_handles,
                                       ACE_Handle_Set &rd_mask) = 0;
 
   /// Returns the ACE_HANDLE of the notify pipe on which the reactor
   /// is listening for notifications so that other threads can unblock
-  /// the <Reactor_Impl>
+  /// the Reactor_Impl
   virtual ACE_HANDLE notify_handle (void) = 0;
 
   /// Verify whether the buffer has dispatchable info  or not.
   virtual int is_dispatchable (ACE_Notification_Buffer &buffer)= 0;
 
-  /// Handle one of the notify call on the <handle>. This could be
-  /// because of a thread trying to unblock the <Reactor_Impl>
+  /// Handle one of the notify call on the handle. This could be
+  /// because of a thread trying to unblock the Reactor_Impl
   virtual int dispatch_notify (ACE_Notification_Buffer &buffer) = 0;
 
   /// Read one of the notify call on the @a handle into the
   /// @a buffer. This could be because of a thread trying to unblock
-  /// the <Reactor_Impl>
+  /// the Reactor_Impl
   virtual int read_notify_pipe (ACE_HANDLE handle,
                                 ACE_Notification_Buffer &buffer) = 0;
   /**
-   * Set the maximum number of times that the <handle_input> method
+   * Set the maximum number of times that the @c handle_input method
    * will iterate and dispatch the ACE_Event_Handlers that are
    * passed in via the notify queue before breaking out of the event
    * loop.  By default, this is set to -1, which means "iterate until
@@ -99,7 +99,7 @@ public:
   virtual void max_notify_iterations (int) = 0;
 
   /**
-   * Get the maximum number of times that the <handle_input> method
+   * Get the maximum number of times that the @c handle_input method
    * will iterate and dispatch the ACE_Event_Handlers that are
    * passed in via the notify queue before breaking out of its event
    * loop.
@@ -181,8 +181,8 @@ public:
    * dispatched, 0 if the @a max_wait_time elapsed without dispatching
    * any handlers, or -1 if an error occurs.
    *
-   * The only difference between <alertable_handle_events> and
-   * <handle_events> is that in the alertable case, the eventloop will
+   * The only difference between alertable_handle_events() and
+   * handle_events() is that in the alertable case, the eventloop will
    * return when the system queues an I/O completion routine or an
    * Asynchronous Procedure Call.
    */
@@ -194,8 +194,8 @@ public:
    * @a max_wait_time value is a reference and can therefore never be
    * NULL.
    *
-   * The only difference between <alertable_handle_events> and
-   * <handle_events> is that in the alertable case, the eventloop will
+   * The only difference between alertable_handle_events() and
+   * handle_events() is that in the alertable case, the eventloop will
    * return when the system queues an I/O completion routine or an
    * Asynchronous Procedure Call.
    */
@@ -206,8 +206,8 @@ public:
 
   /**
    * Return the status of Reactor.  If this function returns 0, the reactor is
-   * actively handling events.  If it returns non-zero, <handling_events> and
-   * <handle_alertable_events> return -1 immediately.
+   * actively handling events.  If it returns non-zero, handling_events() and
+   * handle_alertable_events() return -1 immediately.
    */
   virtual int deactivated (void) = 0;
 
@@ -221,12 +221,12 @@ public:
   // = Register and remove Handlers.
 
   /// Register @a event_handler with @a mask.  The I/O handle will always
-  /// come from <get_handle> on the @a event_handler.
+  /// come from get_handle() on the @a event_handler.
   virtual int register_handler (ACE_Event_Handler *event_handler,
                                 ACE_Reactor_Mask mask) = 0;
 
   /// Register @a event_handler with @a mask.  The I/O handle is provided
-  /// through the <io_handle> parameter.
+  /// through the @a io_handle parameter.
   virtual int register_handler (ACE_HANDLE io_handle,
                                 ACE_Event_Handler *event_handler,
                                 ACE_Reactor_Mask mask) = 0;
@@ -242,8 +242,8 @@ public:
 
   /**
    * Register an @a event_handler that will be notified when
-   * <event_handle> is signaled.  Since no event mask is passed
-   * through this interface, it is assumed that the <event_handle>
+   * event_handle is signaled.  Since no event mask is passed
+   * through this interface, it is assumed that the @a event_handler
    * being passed in is an event handle and not an I/O handle.
    */
   virtual int register_handler (ACE_Event_Handler *event_handler,
@@ -253,7 +253,7 @@ public:
 
   /**
    * Register an @a event_handler that will be notified when
-   * <event_handle> is signaled.  @a mask specifies the network events
+   * event_handle is signaled.  @a mask specifies the network events
    * that the @a event_handler is interested in.
    */
   virtual int register_handler (ACE_HANDLE event_handle,
@@ -261,7 +261,7 @@ public:
                                 ACE_Event_Handler *event_handler,
                                 ACE_Reactor_Mask mask) = 0;
 
-  /// Register @a event_handler with all the @a handles in the <Handle_Set>.
+  /// Register @a event_handler with all the @a handles in the Handle_Set.
   virtual int register_handler (const ACE_Handle_Set &handles,
                                 ACE_Event_Handler *event_handler,
                                 ACE_Reactor_Mask mask) = 0;
@@ -285,8 +285,8 @@ public:
 
   /**
    * Removes @a event_handler.  Note that the I/O handle will be
-   * obtained using <get_handle> method of @a event_handler .  If
-   * @a mask == ACE_Event_Handler::DONT_CALL then the <handle_close>
+   * obtained using get_handle() method of @a event_handler .  If
+   * @a mask == ACE_Event_Handler::DONT_CALL then the handle_close()
    * method of the @a event_handler is not invoked.
    */
   virtual int remove_handler (ACE_Event_Handler *event_handler,
@@ -294,7 +294,7 @@ public:
 
   /**
    * Removes @a handle.  If @a mask == ACE_Event_Handler::DONT_CALL
-   * then the <handle_close> method of the associated <event_handler>
+   * then the handle_close() method of the associated event_handler
    * is not invoked.
    */
   virtual int remove_handler (ACE_HANDLE handle,
@@ -302,8 +302,8 @@ public:
 
   /**
    * Removes all handles in @a handle_set.  If @a mask ==
-   * ACE_Event_Handler::DONT_CALL then the <handle_close> method of
-   * the associated <event_handler>s is not invoked.
+   * ACE_Event_Handler::DONT_CALL then the handle_close() method of
+   * the associated event_handlers is not invoked.
    */
   virtual int remove_handler (const ACE_Handle_Set &handle_set,
                               ACE_Reactor_Mask mask) = 0;
@@ -319,13 +319,13 @@ public:
                               ACE_Sig_Action *old_disp = 0,
                               int sigkey = -1) = 0;
 
-  /// Calls <remove_handler> for every signal in @a sigset.
+  /// Calls remove_handler() for every signal in @a sigset.
   virtual int remove_handler (const ACE_Sig_Set &sigset) = 0;
 
   // = Suspend and resume Handlers.
 
-  /// Suspend @a event_handler temporarily.  Use
-  /// <ACE_Event_Handler::get_handle> to get the handle.
+  /// Suspend @a event_handler temporarily.  Uses
+  /// ACE_Event_Handler::get_handle() to get the handle.
   virtual int suspend_handler (ACE_Event_Handler *event_handler) = 0;
 
   /// Suspend @a handle temporarily.
@@ -337,7 +337,7 @@ public:
   /// Suspend all <handles> temporarily.
   virtual int suspend_handlers (void) = 0;
 
-  /// Resume @a event_handler. Use <ACE_Event_Handler::get_handle> to
+  /// Resume @a event_handler. Uses ACE_Event_Handler::get_handle() to
   /// get the handle.
   virtual int resume_handler (ACE_Event_Handler *event_handler) = 0;
 
@@ -347,7 +347,7 @@ public:
   /// Resume all @a handles in handle set.
   virtual int resume_handler (const ACE_Handle_Set &handles) = 0;
 
-  /// Resume all <handles>.
+  /// Resume all handles.
   virtual int resume_handlers (void) = 0;
 
   /// Does the reactor allow the application to resume the handle on
@@ -388,7 +388,7 @@ public:
   /**
    * Resets the interval of the timer represented by @a timer_id to
    * @a interval, which is specified in relative time to the current
-   * <gettimeofday>.  If @a interval is equal to
+   * gettimeofday().  If @a interval is equal to
    * ACE_Time_Value::zero, the timer will become a non-rescheduling
    * timer.  Returns 0 if successful, -1 if not.
    */
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h
index 9cefc12bdf0..6301b8294e0 100644
--- a/ACE/ace/config-android.h
+++ b/ACE/ace/config-android.h
@@ -49,6 +49,7 @@
 #if __ANDROID_API__ < 21
 # define ACE_LACKS_UCONTEXT_H
 #else
+# define ACE_HAS_CLOCK_SETTIME
 # define ACE_HAS_UCONTEXT_T
 #endif
 
diff --git a/ACE/bin/MakeProjectCreator/config/em3.features b/ACE/bin/MakeProjectCreator/config/em3.features
index 8d442a15983..ef609219456 100644
--- a/ACE/bin/MakeProjectCreator/config/em3.features
+++ b/ACE/bin/MakeProjectCreator/config/em3.features
@@ -1,5 +1,3 @@
-// $Id$
-
 ssl=0
 qos=1
 rwho=0
diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features
index e5bc8b03dc6..b2497431214 100644
--- a/ACE/bin/MakeProjectCreator/config/global.features
+++ b/ACE/bin/MakeProjectCreator/config/global.features
@@ -1,4 +1,3 @@
-// $Id$
 // The global features file contains the default feature settings.
 // By default, if a feature isn't listed here then it is enabled.
 // If it is listed, then the value assigned to the feature is interpreted
@@ -40,7 +39,7 @@ lzo2          = 0
 ipv6          = 0
 mfc           = 0
 rpc           = 0
-sctp 	      = 0
+sctp          = 0
 boost         = 0
 dummy_label   = 0
 wince         = 0
diff --git a/ACE/bin/MakeProjectCreator/config/gnuace.features b/ACE/bin/MakeProjectCreator/config/gnuace.features
index 3c7f564fdab..fdea234cf42 100644
--- a/ACE/bin/MakeProjectCreator/config/gnuace.features
+++ b/ACE/bin/MakeProjectCreator/config/gnuace.features
@@ -1,5 +1,3 @@
-// $Id$
-
 ssl=1
 qt4=1
 fl=1
diff --git a/ACE/bin/MakeProjectCreator/config/nmake.features b/ACE/bin/MakeProjectCreator/config/nmake.features
index 8d442a15983..ef609219456 100644
--- a/ACE/bin/MakeProjectCreator/config/nmake.features
+++ b/ACE/bin/MakeProjectCreator/config/nmake.features
@@ -1,5 +1,3 @@
-// $Id$
-
 ssl=0
 qos=1
 rwho=0
diff --git a/ACE/bin/MakeProjectCreator/config/vc10.features b/ACE/bin/MakeProjectCreator/config/vc10.features
index 8d442a15983..ef609219456 100644
--- a/ACE/bin/MakeProjectCreator/config/vc10.features
+++ b/ACE/bin/MakeProjectCreator/config/vc10.features
@@ -1,5 +1,3 @@
-// $Id$
-
 ssl=0
 qos=1
 rwho=0
diff --git a/ACE/bin/MakeProjectCreator/config/vc11.features b/ACE/bin/MakeProjectCreator/config/vc11.features
index 8d442a15983..ef609219456 100644
--- a/ACE/bin/MakeProjectCreator/config/vc11.features
+++ b/ACE/bin/MakeProjectCreator/config/vc11.features
@@ -1,5 +1,3 @@
-// $Id$
-
 ssl=0
 qos=1
 rwho=0
diff --git a/ACE/bin/MakeProjectCreator/config/vc12.features b/ACE/bin/MakeProjectCreator/config/vc12.features
index 8d442a15983..ef609219456 100644
--- a/ACE/bin/MakeProjectCreator/config/vc12.features
+++ b/ACE/bin/MakeProjectCreator/config/vc12.features
@@ -1,5 +1,3 @@
-// $Id$
-
 ssl=0
 qos=1
 rwho=0
diff --git a/ACE/bin/MakeProjectCreator/config/vc14.features b/ACE/bin/MakeProjectCreator/config/vc14.features
index 8d442a15983..ef609219456 100644
--- a/ACE/bin/MakeProjectCreator/config/vc14.features
+++ b/ACE/bin/MakeProjectCreator/config/vc14.features
@@ -1,5 +1,3 @@
-// $Id$
-
 ssl=0
 qos=1
 rwho=0
diff --git a/ACE/bin/MakeProjectCreator/config/vc15.features b/ACE/bin/MakeProjectCreator/config/vc15.features
new file mode 100644
index 00000000000..ef609219456
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/vc15.features
@@ -0,0 +1,4 @@
+ssl=0
+qos=1
+rwho=0
+sctp=0
diff --git a/ACE/bin/MakeProjectCreator/config/vc15nmake.mpb b/ACE/bin/MakeProjectCreator/config/vc15nmake.mpb
new file mode 100644
index 00000000000..84ea914a679
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/vc15nmake.mpb
@@ -0,0 +1,24 @@
+// -*- MPC -*-
+feature (nmake_avoid_Wp64) {
+  specific(nmake) {
+    add_compile -= /Wp64
+  }
+}
+
+feature(vc_avoid_hides_local_declaration) {
+  specific(nmake) {
+    DisableSpecificWarnings += 4456
+  }
+}
+
+feature(vc_avoid_hides_global_declaration) {
+  specific(nmake) {
+    DisableSpecificWarnings += 4459
+  }
+}
+
+feature(vc_avoid_hides_class_member) {
+  specific(nmake) {
+    DisableSpecificWarnings += 4458
+  }
+}
diff --git a/ACE/bin/MakeProjectCreator/config/vc71.features b/ACE/bin/MakeProjectCreator/config/vc71.features
index 8d442a15983..ef609219456 100644
--- a/ACE/bin/MakeProjectCreator/config/vc71.features
+++ b/ACE/bin/MakeProjectCreator/config/vc71.features
@@ -1,5 +1,3 @@
-// $Id$
-
 ssl=0
 qos=1
 rwho=0
diff --git a/ACE/bin/MakeProjectCreator/config/vc8.features b/ACE/bin/MakeProjectCreator/config/vc8.features
index 8d442a15983..ef609219456 100644
--- a/ACE/bin/MakeProjectCreator/config/vc8.features
+++ b/ACE/bin/MakeProjectCreator/config/vc8.features
@@ -1,5 +1,3 @@
-// $Id$
-
 ssl=0
 qos=1
 rwho=0
diff --git a/ACE/bin/MakeProjectCreator/config/vc9.features b/ACE/bin/MakeProjectCreator/config/vc9.features
index 8d442a15983..ef609219456 100644
--- a/ACE/bin/MakeProjectCreator/config/vc9.features
+++ b/ACE/bin/MakeProjectCreator/config/vc9.features
@@ -1,5 +1,3 @@
-// $Id$
-
 ssl=0
 qos=1
 rwho=0
diff --git a/ACE/bin/MakeProjectCreator/config/wb26.features b/ACE/bin/MakeProjectCreator/config/wb26.features
index 46dfdb183d3..6882450cd2d 100644
--- a/ACE/bin/MakeProjectCreator/config/wb26.features
+++ b/ACE/bin/MakeProjectCreator/config/wb26.features
@@ -1,4 +1,2 @@
-// $Id$
-
 // We're always cross-compiling with wb26
 cross_compile = 1
diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl
index 0d7ced3a25f..5053b0b6115 100755
--- a/ACE/bin/fuzz.pl
+++ b/ACE/bin/fuzz.pl
@@ -54,6 +54,7 @@ use PerlACE::Run_Test;
 @files_doxygen = ();
 @files_conf = ();
 @files_rb = ();
+@files_features = ();
 
 # To keep track of errors and warnings
 $errors = 0;
@@ -187,6 +188,9 @@ sub store_file ($)
     elsif ($name =~ /\.(rb|erb)$/i) {
         push @files_rb, ($name);
     }
+    elsif ($name =~ /\.features$/i) {
+        push @files_features, ($name);
+    }
     elsif ($name =~ /\.vcproj$/i) {
         push @files_vcproj, ($name);
     }
@@ -296,7 +300,7 @@ sub check_for_id_string ()
     print "Running \$Id\$ string check\n";
     foreach $file (@files_cpp, @files_inl, @files_h, @files_mpc, @files_bor,
                    @files_gnu, @files_html, @files_idl, @files_pl,
-                   @files_cdp, @files_py, @files_conf, @files_generic) {
+                   @files_cdp, @files_py, @files_conf, @files_generic, @files_features) {
         my $found = 0;
         if (open (FILE, $file)) {
             print "Looking at file $file\n" if $opt_d;