ChangeLogTag:Mon May 23 16:38:13 2005 Steve Huston <shuston@riverace.com>

2 files changed, 31 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d28b007d9b..bfe21d21780 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon May 23 16:38:13 2005  Steve Huston  <shuston@riverace.com>
+
+	* examples/Reactor/Proactor/post_completions.cpp: Made use of the
+	  ACE_POSIX_SIG_Proactor-based test dependent on
+	  ACE_HAS_POSIX_REALTIME_SIGNALS, not ACE_POSIX_SIG_PROACTOR.
+	  ACE_POSIX_SIG_PROACTOR indicates a preference for that proactor
+	  implementation when one is not specified; it's not a capability
+	  indicator. The presence of the ACE_POSIX_SIG_Proactor implementation
+	  is based on the ACE_HAS_POSIX_REALTIME_SIGNALS setting, so that's
+	  what's used to decide whether to explicitly use
+	  ACE_POSIX_SIG_Proactor. This fixes a build error on Mac OS X Tiger
+	  with autoconfigure, as well as any other platform with AIO
+	  support that doesn't declare a Proactor implementation preference.
+	  Thanks to J.T. Conklin for raising this issue and working on testing
+	  fixes.
+
 Mon May 23 14:52:19 2005  Justin Michel  <michel_j@ociweb.com>
 
         * ACEXML/tests/util/util.mpc:
@@ -10,24 +26,25 @@ Mon May 23 13:02:25 2005  Justin Michel  <michel_j@ociweb.com>
         * ACEXML/common/XML_Util.cpp:
 
           Added new ACEXML_escape_string() functions to allow replacement of
-        illegal characters, (', ", &, <, >, etc.) with the escaped versions.
- 	(&quot;, &lt;, etc.)
+          illegal characters, (', ", &, <, >, etc.) with the escaped versions.
+ 	  (&quot;, &lt;, etc.)
 
         * ACEXML/tests/util/test.cpp:
         * ACEXML/tests/util/util.mpc:
 
           This is a performance test used while making the above functions, and
-        testing performance with ACE_String_Base.
+          testing performance with ACE_String_Base.
 
         * ace/String_Base.h:
         * ace/String_Base.inl:
         * ace/String_Base.cpp:
 
-          Fixed some documentation bugs, and added some new features to this class.
-        New efficient overloads for string concatenation.
-        Fixed clear(1) to work as documented.
-        Used a more optimal string growth when concatenating strings.
-        Performance optimizations for string concatenation.
+	  Fixed some documentation bugs, and added some new features to
+	  this class.
+          New efficient overloads for string concatenation.
+          Fixed clear(1) to work as documented.
+          Used a more optimal string growth when concatenating strings.
+          Performance optimizations for string concatenation.
 
         * tests/SString_Test.cpp:
 
@@ -36,6 +53,7 @@ Mon May 23 13:02:25 2005  Justin Michel  <michel_j@ociweb.com>
         * bin/tao_other_tests.lst:
 
           Enabled new ImR tests, and grouped all ImR tests together.
+
 Mon May 23 12:26:19 2005  Steve Huston  <shuston@riverace.com>
 
         * ace/Thread.h: Doxygen-ized the join() comments.
diff --git a/examples/Reactor/Proactor/post_completions.cpp b/examples/Reactor/Proactor/post_completions.cpp
index 4323b8f85e4..59011ce569a 100644
--- a/examples/Reactor/Proactor/post_completions.cpp
+++ b/examples/Reactor/Proactor/post_completions.cpp
@@ -10,8 +10,8 @@
 //     real-time signals to post completions. The Real-time signal
 //     based completion strategy is implemented with
 //     ACE_POSIX_SIG_PROACTOR.
-//     (So, it can be used only if ACE_HAS_AIO_CALLS is defined and
-//      ACE_POSIX_AIOCB_PROACTOR is not defined)
+//     (So, it can be used only if both ACE_HAS_AIO_CALLS and
+//     ACE_HAS_POSIX_REALTIME_SIGNALS are defined.)
 //     Since it is faking results, you have to pay by knowing and
 //     using platform-specific implementation objects for Asynchronous
 //     Result classes.
@@ -194,7 +194,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   // Proactor1. SIGRTMIN Proactor. (default).
 
   // = Proactor2. SIGRTMAX Proactor.
-#if defined (ACE_HAS_AIO_CALLS) && !defined (ACE_POSIX_AIOCB_PROACTOR)
+#if defined (ACE_HAS_AIO_CALLS) && defined (ACE_HAS_POSIX_REALTIME_SIGNALS)
 
   ACE_DEBUG ((LM_DEBUG, "Using ACE_POSIX_SIG_Proactor\n"));
 
@@ -219,9 +219,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_POSIX_SIG_Proactor posix_proactor (signal_set);
   // Get the Proactor interface out of it.
   ACE_Proactor proactor2 (&posix_proactor);
-#else /* ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR */
+#else /* ACE_HAS_AIO_CALLS && ACE_HAS_POSIX_REALTIME_SIGNALS */
   ACE_Proactor proactor2;
-#endif /* ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR */
+#endif /* ACE_HAS_AIO_CALLS && ACE_HAS_POSIX_REALTIME_SIGNALS */
 
   // = Create Tasks. One pool of threads to handle completions on
   //   SIGRTMIN and the other one to handle completions on SIGRTMAX.