ChangeLogTag:Wed Nov 21 09:07:37 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>

author: schmidt <douglascraigschmidt@users.noreply.github.com> 2001-11-21 17:12:48 +0000
committer: schmidt <douglascraigschmidt@users.noreply.github.com> 2001-11-21 17:12:48 +0000
commit: d56c392e9961ffbf780734f0463e47efb9867128 (patch)
tree: fc589713f841ba3b2af74905f14377d532d7e784
parent: a941f971a10798b86905a040ffc48e466b01c724 (diff)
download: ATCD-d56c392e9961ffbf780734f0463e47efb9867128.tar.gz
16 files changed, 860 insertions, 213 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 532e76a268b..da3e49ba497 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -192,7 +192,9 @@ supported by the DOC group, Riverace, or OCI. <P>
       </pre><p>
 
       There are likely to be build problems with older versions or
-      different patchlevels of Sun C++.<p>
+      different patchlevels of Sun C++.  Likewise, on
+      Solaris with g++ you may need to use GNU as instead of
+      /usr/ccs/bin/as, if you want -gstabs+ and -pipe support.
 
       Thanks to Susan Liebeskind &lt;shl@janis.gtri.gatech.edu&gt;
       for providing the following useful information:<p>
diff --git a/ChangeLog b/ChangeLog
index cf024bf1f49..d62ec969da1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+Wed Nov 21 09:07:37 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS.h: Updated the ACE_GUARD_ACTION macro and added a new
+	  ACE_GUARD_REACTION macro.  Then, reimplemented the ACE_GUARD and
+ 	  ACE_GUARD_RETURN macros in terms of these new macros.  Thanks to
+ 	  Don Hinton for contributing these.
+
+	* ace/Log_Msg_Callback.h: Improved the comments to explain why
+	  ACE_Log_Msg_Callback isn't inherited.  Thanks to 
+	  Alexey Chalimov <alexey@allcharge.com> for motivating this.
+
+Tue Nov 20 15:36:52 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ACE-INSTALL.html: Pointed out that on Solaris with g++ you may
+	  need to use GNU as instead of /usr/ccs/bin/as, if you want
+ 	  -gstabs+ and -pipe support.  Thanks to C Chan
+ 	  <CChan@md.aacisd.com> for reporting this.
+
+Mon Nov 19 07:24:05 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* examples/Synch/proc_sema.cpp: Added the ACE_TEXT macro so that
+	  ACE_Get_Opt works correctly.  Thanks to Johnny Willemsen for
+	  contributing this.
+
+	* tests/Aio_Platform_Test.cpp (main): Fixed the code so that it
+	  compiles when ACE_USES_WCHAR.  Thanks to Johnny Willemsen for
+ 	  reporting this.
+
+	* docs/ACE-categories.html: Updated the Doxygen URLs to use the
+	  new format.  Thanks to Peter J. Mason <peter.mason@retriever.com.au> 
+	  for reporting the problem.
+
+Fri Nov 16 10:39:52 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* docs: Moved minimumTAO.html from $TAO_ROOT/docs/ to
+ 	  $ACE_ROOT/docs.
+
+	* ace/OS.h: Added two new macros ACE_GUARD_ACTION and
+	  ACE_GUARD_ACTION_RETURN.  Thanks to Boris Kaminer
+ 	  <boris.kaminer@orcsoftware.com> for suggesting these.
+
+	* ace/NT_Service.cpp (state): Fixed a bug where calling
+	  ACE_NT_Service::state(x,x) while the service is stopped was
+ 	  causing the internal status variables of ACE_NT_Service to
+ 	  become corrupt.  If the control_mask is set to
+ 	  SERVICE_ACCEPT_STOP in the constructor, the call to state will
+ 	  cause this mask to be reset (if the service is not running).
+  	  This ultimately results in an NT Service that can be started but
+ 	  not stopped.  Thanks to Kyle Brost <Kyle.Brost@quest.com> for
+ 	  providing this fix.
+
 Wed Nov 21 10:00:20 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/config-irix6.x-common.h:
@@ -58,18 +109,19 @@ Tue Nov 20 13:30:36 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 Mon Nov 19 20:35:44 2001  Jaiganesh Balasubramanian  <jai@balar.ece.uci.edu>
 
-        * ace/SOCK_Dgram_Mcast.cpp:
-          This class allow application to subscribe a single socket to
-          many multicast groups.  However, the unsubscribe operation
-          failed to work with more than one group.  For some strange
-          reason it was storing the first multicast group subscription in
-          a class member and using that member in all the paths for the
-          unsubscribe methods.
-          We have changed the unsubscribe(const ACE_INET_Addr&,...) method
-          to work as adversited, i.e. unsubscribe the *given* multicast
-          address, not the stored one, as an added benefit the method is
-          now re-entrant.  The unsubscribe(void) method works as before.
-          The code has been re-factored to minimize duplication.
+	* ace/SOCK_Dgram_Mcast.cpp:
+	  This class allow application to subscribe a single socket to
+ 	  many multicast groups.  However, the unsubscribe operation
+ 	  failed to work with more than one group.  For some strange
+ 	  reason it was storing the first multicast group subscription in
+ 	  a class member and using that member in all the paths for the
+ 	  unsubscribe methods.	
+  
+	  We have changed the unsubscribe(const ACE_INET_Addr&,...) method
+ 	  to work as adversited, i.e. unsubscribe the *given* multicast
+ 	  address, not the stored one, as an added benefit the method is
+ 	  now re-entrant.  The unsubscribe(void) method works as before.
+  	  The code has been re-factored to minimize duplication.
 
 Mon Nov 19 11:03:07 2001  Ossama Othman  <ossama@uci.edu>
 
@@ -158,9 +210,9 @@ Sun Nov 11 09:50:52 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
           char to ACE_TCHAR.  Thanks to Johnny Willemsen for reporting
           this.
 
-        * tests/Aio_Platform_Test.cpp: The argv parameter of main() should
-          be ACE_TCHAR rather than char.  Thanks to Johnny Willemsen for
-          reporting this.
+	* tests/Aio_Platform_Test.cpp: The argv parameter of main() should
+	  be ACE_TCHAR rather than char.  Thanks to Johnny Willemsen for
+ 	  reporting this.
 
 Thu Nov 15 15:43:20 2001  Craig Rodrigues  <crodrigu@bbn.com>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index cf024bf1f49..d62ec969da1 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,54 @@
+Wed Nov 21 09:07:37 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS.h: Updated the ACE_GUARD_ACTION macro and added a new
+	  ACE_GUARD_REACTION macro.  Then, reimplemented the ACE_GUARD and
+ 	  ACE_GUARD_RETURN macros in terms of these new macros.  Thanks to
+ 	  Don Hinton for contributing these.
+
+	* ace/Log_Msg_Callback.h: Improved the comments to explain why
+	  ACE_Log_Msg_Callback isn't inherited.  Thanks to 
+	  Alexey Chalimov <alexey@allcharge.com> for motivating this.
+
+Tue Nov 20 15:36:52 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ACE-INSTALL.html: Pointed out that on Solaris with g++ you may
+	  need to use GNU as instead of /usr/ccs/bin/as, if you want
+ 	  -gstabs+ and -pipe support.  Thanks to C Chan
+ 	  <CChan@md.aacisd.com> for reporting this.
+
+Mon Nov 19 07:24:05 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* examples/Synch/proc_sema.cpp: Added the ACE_TEXT macro so that
+	  ACE_Get_Opt works correctly.  Thanks to Johnny Willemsen for
+	  contributing this.
+
+	* tests/Aio_Platform_Test.cpp (main): Fixed the code so that it
+	  compiles when ACE_USES_WCHAR.  Thanks to Johnny Willemsen for
+ 	  reporting this.
+
+	* docs/ACE-categories.html: Updated the Doxygen URLs to use the
+	  new format.  Thanks to Peter J. Mason <peter.mason@retriever.com.au> 
+	  for reporting the problem.
+
+Fri Nov 16 10:39:52 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* docs: Moved minimumTAO.html from $TAO_ROOT/docs/ to
+ 	  $ACE_ROOT/docs.
+
+	* ace/OS.h: Added two new macros ACE_GUARD_ACTION and
+	  ACE_GUARD_ACTION_RETURN.  Thanks to Boris Kaminer
+ 	  <boris.kaminer@orcsoftware.com> for suggesting these.
+
+	* ace/NT_Service.cpp (state): Fixed a bug where calling
+	  ACE_NT_Service::state(x,x) while the service is stopped was
+ 	  causing the internal status variables of ACE_NT_Service to
+ 	  become corrupt.  If the control_mask is set to
+ 	  SERVICE_ACCEPT_STOP in the constructor, the call to state will
+ 	  cause this mask to be reset (if the service is not running).
+  	  This ultimately results in an NT Service that can be started but
+ 	  not stopped.  Thanks to Kyle Brost <Kyle.Brost@quest.com> for
+ 	  providing this fix.
+
 Wed Nov 21 10:00:20 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/config-irix6.x-common.h:
@@ -58,18 +109,19 @@ Tue Nov 20 13:30:36 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 Mon Nov 19 20:35:44 2001  Jaiganesh Balasubramanian  <jai@balar.ece.uci.edu>
 
-        * ace/SOCK_Dgram_Mcast.cpp:
-          This class allow application to subscribe a single socket to
-          many multicast groups.  However, the unsubscribe operation
-          failed to work with more than one group.  For some strange
-          reason it was storing the first multicast group subscription in
-          a class member and using that member in all the paths for the
-          unsubscribe methods.
-          We have changed the unsubscribe(const ACE_INET_Addr&,...) method
-          to work as adversited, i.e. unsubscribe the *given* multicast
-          address, not the stored one, as an added benefit the method is
-          now re-entrant.  The unsubscribe(void) method works as before.
-          The code has been re-factored to minimize duplication.
+	* ace/SOCK_Dgram_Mcast.cpp:
+	  This class allow application to subscribe a single socket to
+ 	  many multicast groups.  However, the unsubscribe operation
+ 	  failed to work with more than one group.  For some strange
+ 	  reason it was storing the first multicast group subscription in
+ 	  a class member and using that member in all the paths for the
+ 	  unsubscribe methods.	
+  
+	  We have changed the unsubscribe(const ACE_INET_Addr&,...) method
+ 	  to work as adversited, i.e. unsubscribe the *given* multicast
+ 	  address, not the stored one, as an added benefit the method is
+ 	  now re-entrant.  The unsubscribe(void) method works as before.
+  	  The code has been re-factored to minimize duplication.
 
 Mon Nov 19 11:03:07 2001  Ossama Othman  <ossama@uci.edu>
 
@@ -158,9 +210,9 @@ Sun Nov 11 09:50:52 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
           char to ACE_TCHAR.  Thanks to Johnny Willemsen for reporting
           this.
 
-        * tests/Aio_Platform_Test.cpp: The argv parameter of main() should
-          be ACE_TCHAR rather than char.  Thanks to Johnny Willemsen for
-          reporting this.
+	* tests/Aio_Platform_Test.cpp: The argv parameter of main() should
+	  be ACE_TCHAR rather than char.  Thanks to Johnny Willemsen for
+ 	  reporting this.
 
 Thu Nov 15 15:43:20 2001  Craig Rodrigues  <crodrigu@bbn.com>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index cf024bf1f49..d62ec969da1 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,54 @@
+Wed Nov 21 09:07:37 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS.h: Updated the ACE_GUARD_ACTION macro and added a new
+	  ACE_GUARD_REACTION macro.  Then, reimplemented the ACE_GUARD and
+ 	  ACE_GUARD_RETURN macros in terms of these new macros.  Thanks to
+ 	  Don Hinton for contributing these.
+
+	* ace/Log_Msg_Callback.h: Improved the comments to explain why
+	  ACE_Log_Msg_Callback isn't inherited.  Thanks to 
+	  Alexey Chalimov <alexey@allcharge.com> for motivating this.
+
+Tue Nov 20 15:36:52 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ACE-INSTALL.html: Pointed out that on Solaris with g++ you may
+	  need to use GNU as instead of /usr/ccs/bin/as, if you want
+ 	  -gstabs+ and -pipe support.  Thanks to C Chan
+ 	  <CChan@md.aacisd.com> for reporting this.
+
+Mon Nov 19 07:24:05 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* examples/Synch/proc_sema.cpp: Added the ACE_TEXT macro so that
+	  ACE_Get_Opt works correctly.  Thanks to Johnny Willemsen for
+	  contributing this.
+
+	* tests/Aio_Platform_Test.cpp (main): Fixed the code so that it
+	  compiles when ACE_USES_WCHAR.  Thanks to Johnny Willemsen for
+ 	  reporting this.
+
+	* docs/ACE-categories.html: Updated the Doxygen URLs to use the
+	  new format.  Thanks to Peter J. Mason <peter.mason@retriever.com.au> 
+	  for reporting the problem.
+
+Fri Nov 16 10:39:52 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* docs: Moved minimumTAO.html from $TAO_ROOT/docs/ to
+ 	  $ACE_ROOT/docs.
+
+	* ace/OS.h: Added two new macros ACE_GUARD_ACTION and
+	  ACE_GUARD_ACTION_RETURN.  Thanks to Boris Kaminer
+ 	  <boris.kaminer@orcsoftware.com> for suggesting these.
+
+	* ace/NT_Service.cpp (state): Fixed a bug where calling
+	  ACE_NT_Service::state(x,x) while the service is stopped was
+ 	  causing the internal status variables of ACE_NT_Service to
+ 	  become corrupt.  If the control_mask is set to
+ 	  SERVICE_ACCEPT_STOP in the constructor, the call to state will
+ 	  cause this mask to be reset (if the service is not running).
+  	  This ultimately results in an NT Service that can be started but
+ 	  not stopped.  Thanks to Kyle Brost <Kyle.Brost@quest.com> for
+ 	  providing this fix.
+
 Wed Nov 21 10:00:20 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/config-irix6.x-common.h:
@@ -58,18 +109,19 @@ Tue Nov 20 13:30:36 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 Mon Nov 19 20:35:44 2001  Jaiganesh Balasubramanian  <jai@balar.ece.uci.edu>
 
-        * ace/SOCK_Dgram_Mcast.cpp:
-          This class allow application to subscribe a single socket to
-          many multicast groups.  However, the unsubscribe operation
-          failed to work with more than one group.  For some strange
-          reason it was storing the first multicast group subscription in
-          a class member and using that member in all the paths for the
-          unsubscribe methods.
-          We have changed the unsubscribe(const ACE_INET_Addr&,...) method
-          to work as adversited, i.e. unsubscribe the *given* multicast
-          address, not the stored one, as an added benefit the method is
-          now re-entrant.  The unsubscribe(void) method works as before.
-          The code has been re-factored to minimize duplication.
+	* ace/SOCK_Dgram_Mcast.cpp:
+	  This class allow application to subscribe a single socket to
+ 	  many multicast groups.  However, the unsubscribe operation
+ 	  failed to work with more than one group.  For some strange
+ 	  reason it was storing the first multicast group subscription in
+ 	  a class member and using that member in all the paths for the
+ 	  unsubscribe methods.	
+  
+	  We have changed the unsubscribe(const ACE_INET_Addr&,...) method
+ 	  to work as adversited, i.e. unsubscribe the *given* multicast
+ 	  address, not the stored one, as an added benefit the method is
+ 	  now re-entrant.  The unsubscribe(void) method works as before.
+  	  The code has been re-factored to minimize duplication.
 
 Mon Nov 19 11:03:07 2001  Ossama Othman  <ossama@uci.edu>
 
@@ -158,9 +210,9 @@ Sun Nov 11 09:50:52 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
           char to ACE_TCHAR.  Thanks to Johnny Willemsen for reporting
           this.
 
-        * tests/Aio_Platform_Test.cpp: The argv parameter of main() should
-          be ACE_TCHAR rather than char.  Thanks to Johnny Willemsen for
-          reporting this.
+	* tests/Aio_Platform_Test.cpp: The argv parameter of main() should
+	  be ACE_TCHAR rather than char.  Thanks to Johnny Willemsen for
+ 	  reporting this.
 
 Thu Nov 15 15:43:20 2001  Craig Rodrigues  <crodrigu@bbn.com>
 
diff --git a/THANKS b/THANKS
index 2a861a627f4..f31a295ff93 100644
--- a/THANKS
+++ b/THANKS
@@ -510,7 +510,7 @@ Jody Hagins <jody@atdesk.com>
 Patrice Bensoussan <pbensoussan@amadeus.net>
 Keith Brown <kalbrown@ix.netcom.com>
 Barry Hoggard <hoggard@cfx.com>
-Peter J. Mason <peterm@fl.net.au>
+Peter J. Mason <peter.mason@retriever.com.au>
 Jerry D. De Master <jdemaste@rite-solutions.com>
 Greg Gallant <gcg@micrografx.com>
 wym <wym@dekang.com>
@@ -1368,6 +1368,9 @@ Bo Balder <bba@post.utfors.se>
 Michael Sawczyn <msawczyn@columbus.rr.com>
 Ildar Gabdulline <ildar_gabdullin@mailru.com>
 David Yongqiang Wang <davidyw@avaya.com>
+Andrew Foster <awf@prismtechnologies.com>
+C Chan <CChan@md.aacisd.com>
+Alexey Chalimov <alexey@allcharge.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ace/Connector.h b/ace/Connector.h
index 5cfb4cb2945..e2a924a9aac 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -371,9 +371,9 @@ private:
  * Implements a flexible and extensible set of strategies for
  * actively establishing connections with clients.  There are
  * three main strategies: (1) creating a SVC_HANDLER, (2)
- * actively connecting a new connection from a client into the
- * SVC_HANDLER, and (3) activating the SVC_HANDLER with a
- * particular concurrency mechanism.
+ * actively initiating a new connection from the client,
+ * and (3) activating the SVC_HANDLER with a
+ * particular concurrency mechanism after the connection is established.
  */
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1>
 class ACE_Strategy_Connector : public ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2>
diff --git a/ace/Lib_Find.h b/ace/Lib_Find.h
index bfdc9cf5eb6..34bfee245a6 100644
--- a/ace/Lib_Find.h
+++ b/ace/Lib_Find.h
@@ -42,7 +42,7 @@ class ACE_Export ACE_Lib_Find
                      size_t maxlen);
 
   /**
-   * Uses <ldopen> to locate and open the appropriate <filename> and
+   * Uses <ldfind> to locate and open the appropriate <filename> and
    * returns a pointer to the file, else it returns a NULL
    * pointer. <type> specifies how the file should be open.
    */
diff --git a/ace/Log_Msg_Callback.h b/ace/Log_Msg_Callback.h
index b1f262108b1..b9c833745ad 100644
--- a/ace/Log_Msg_Callback.h
+++ b/ace/Log_Msg_Callback.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_LOG_MSG_CALLBACK_H
 #define ACE_LOG_MSG_CALLBACK_H
 #include "ace/pre.h"
@@ -45,8 +44,10 @@ class ACE_Log_Record;
  *     synchronization in the <log> method) or have a separate
  *     callback object per Log_Msg object.  Moreover,
  *     <ACE_Log_Msg_Callbacks> are not inherited when a new thread
- *     is spawned, so you'll need to reset these in each new thread.
- *
+ *     is spawned because it might have been allocated off of the
+ *     stack of the original thread, in which case all hell would
+ *     break loose...  Therefore, you'll need to reset these in each
+ *     new thread. 
  */
 class ACE_Export ACE_Log_Msg_Callback
 {
diff --git a/ace/NT_Service.cpp b/ace/NT_Service.cpp
index 614fa9dfb1f..a1989ec4957 100644
--- a/ace/NT_Service.cpp
+++ b/ace/NT_Service.cpp
@@ -380,9 +380,16 @@ ACE_NT_Service::state (DWORD *pstate,
                        ACE_Time_Value *wait_hint)
 {
   SC_HANDLE svc = this->svc_sc_handle ();
+
   if (svc == 0)
     return -1;
 
+  // Need to create a temporary copy of this variable since the
+  // QueryServiceStatus call will modify the setting depending on the
+  // current state of the Service.  If the service is currently
+  // STOPPED, the value will be cleared.
+  DWORD controls_accepted = svc_status_.dwControlsAccepted;
+
   if (QueryServiceStatus (svc,
                           &this->svc_status_) == 0)
     return -1;
@@ -391,7 +398,7 @@ ACE_NT_Service::state (DWORD *pstate,
     wait_hint->msec (this->svc_status_.dwWaitHint);
 
   *pstate = this->svc_status_.dwCurrentState;
-
+  this->svc_status_.dwControlsAccepted = controls_accepted;
   return 0;
 }
 
diff --git a/ace/OS.h b/ace/OS.h
index 9dfbe67ce74..72a31216b2c 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -1822,12 +1822,16 @@ typedef const struct rlimit ACE_SETRLIMIT_TYPE;
 
 // Convenient macro for testing for deadlock, as well as for detecting
 // when mutexes fail.
-# define ACE_GUARD(MUTEX,OBJ,LOCK) \
-  ACE_Guard< MUTEX > OBJ (LOCK); \
-    if (OBJ.locked () == 0) return;
-# define ACE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
-  ACE_Guard< MUTEX > OBJ (LOCK); \
-    if (OBJ.locked () == 0) return RETURN;
+#define ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ACTION, REACTION) \
+   ACE_Guard< MUTEX > OBJ (LOCK); \
+   if (OBJ.locked () != 0) { ACTION; } \
+   else { REACTION; }
+#define ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, REACTION) \
+  ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ;, REACTION)
+#define ACE_GUARD(MUTEX, OBJ, LOCK) \
+  ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return)
+#define ACE_GUARD_RETURN(MUTEX, OBJ, LOCK, RETURN) \
+  ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return RETURN)
 # define ACE_WRITE_GUARD(MUTEX,OBJ,LOCK) \
   ACE_Write_Guard< MUTEX > OBJ (LOCK); \
     if (OBJ.locked () == 0) return;
diff --git a/ace/Synch.h b/ace/Synch.h
index b0ab02ae349..6a7d09d1548 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -810,8 +810,8 @@ public:
  *
  * Portable implementation of an Event mechanism, which is
  * native to Win32, but must be emulated on UNIX.  Note that
- * this only provides global naming and <USYNC_PROCESS> support on
- * Win32 machines.  
+ * this only provides global naming and system-scope locking support
+ * on Win32 platforms.
  */
 class ACE_Export ACE_Event
 {
@@ -914,7 +914,7 @@ private:
  *
  * Specialization of Event mechanism which wakes up all waiting
  * threads on <signal>.  Note that this only provides
- * <USYNC_PROCESS> support on Win32 machines.
+ * global naming and system-scope locking support on Win32 platforms.
  */
 class ACE_Export ACE_Manual_Event : public ACE_Event
 {
@@ -950,7 +950,7 @@ public:
  *
  * Specialization of Event mechanism which wakes up one waiting
  * thread on <signal>.  Note that this only provides
- * <USYNC_PROCESS> support on Win32 machines.
+ * global naming and system-scope locking support on Win32 platforms.
  */
 class ACE_Export ACE_Auto_Event : public ACE_Event
 {
diff --git a/docs/ACE-categories.html b/docs/ACE-categories.html
index 7f23b88d635..c2fd9dbb6be 100644
--- a/docs/ACE-categories.html
+++ b/docs/ACE-categories.html
@@ -25,96 +25,98 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <b>[CORBA]</b>
 <ul>
+<!--
 <li><a href = "../ace/CORBA_Handler.cpp">CORBA_Handler.cpp</a></li>
 <li><a href = "../ace/CORBA_Handler.h">CORBA_Handler.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_CORBA_Handler.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__CORBA__Handler.html">[doxygen]</a></b>
 <li><a href = "../ace/CORBA_Handler.i">CORBA_Handler.i</a></li>
+-->
 <li><a href = "../ace/CORBA_Ref.cpp">CORBA_Ref.cpp</a></li>
 <li><a href = "../ace/CORBA_Ref.h">CORBA_Ref.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_CORBA_Ref.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__CORBA__Ref.html">[doxygen]</a></b>
 <li><a href = "../ace/CORBA_Ref.i">CORBA_Ref.i</a></li>
 </ul>
 <b>[Containers]</b>
 <ul>
 <li><a href = "../ace/Array.cpp">Array.cpp</a></li>
 <li><a href = "../ace/Array.h">Array.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Array.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Array.html">[doxygen]</a></b>
 <li><a href = "../ace/Array.i">Array.i</a></li>
 <li><a href = "../ace/Containers.cpp">Containers.cpp</a></li>
 <li><a href = "../ace/Containers.i">Containers.i</a></li>
 <li><a href = "../ace/Containers.h">Containers.h</a></li>
 <li><a href = "../ace/Hash_Map_Manager.cpp">Hash_Map_Manager.cpp</a></li>
 <li><a href = "../ace/Hash_Map_Manager.h">Hash_Map_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Hash_Map_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Hash__Map__Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Filecache.cpp">Filecache.cpp</a></li>
 <li><a href = "../ace/Filecache.h">Filecache.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Filecache.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Filecache.html">[doxygen]</a></b>
 <li><a href = "../ace/Free_List.cpp">Free_List.cpp</a></li>
 <li><a href = "../ace/Free_List.i">Free_List.i</a></li>
 <li><a href = "../ace/Free_List.h">Free_List.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Free_List.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Free__List.html">[doxygen]</a></b>
 <li><a href = "../ace/Managed_Object.cpp">Managed_Object.cpp</a></li>
 <li><a href = "../ace/Managed_Object.h">Managed_Object.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Managed_Object.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Managed__Object.html">[doxygen]</a></b>
 <li><a href = "../ace/Managed_Object.i">Managed_Object.i</a></li>
 <li><a href = "../ace/Map_Manager.cpp">Map_Manager.cpp</a></li>
 <li><a href = "../ace/Map_Manager.h">Map_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Map_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Map__Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Map_Manager.i">Map_Manager.i</a></li>
 <li><a href = "../ace/Object_Manager.cpp">Object_Manager.cpp</a></li>
 <li><a href = "../ace/Object_Manager.i">Object_Manager.i</a></li>
 <li><a href = "../ace/Object_Manager.h">Object_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Object_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Object__Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/SString.cpp">SString.cpp</a></li>
 <li><a href = "../ace/SString.h">SString.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SString.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SString.html">[doxygen]</a></b>
 <li><a href = "../ace/SString.i">SString.i</a></li>
 </ul>
 <b>[Concurrency]</b>
 <ul>
 <li><a href = "../ace/Activation_Queue.h">Activation_Queue.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Activation_Queue.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Activation__Queue.html">[doxygen]</a></b>
 <li><a href = "../ace/Activation_Queue.cpp">Activation_Queue.cpp</a></li>
 <li><a href = "../ace/Atomic_Op.i">Atomic_Op.i</a></li>
 <li><a href = "../ace/Future.h">Future.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Future.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Future.html">[doxygen]</a></b>
 <li><a href = "../ace/Future.cpp">Future.cpp</a></li>
 <li><a href = "../ace/Method_Request.h">Method_Request.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Method_Request.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Method__Request.html">[doxygen]</a></b>
 <li><a href = "../ace/Method_Request.cpp">Method_Request.cpp</a></li>
 <li><a href = "../ace/Process.cpp">Process.cpp</a></li>
 <li><a href = "../ace/Process.h">Process.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Process.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Process.html">[doxygen]</a></b>
 <li><a href = "../ace/Process.i">Process.i</a></li>
 <li><a href = "../ace/Process_Manager.cpp">Process_Manager.cpp</a></li>
 <li><a href = "../ace/Process_Manager.h">Process_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Process_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Process__Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Process_Manager.i">Process_Manager.i</a></li>
 <li><a href = "../ace/Sched_Params.cpp">Sched_Params.cpp</a></li>
 <li><a href = "../ace/Sched_Params.h">Sched_Params.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Sched_Params.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Sched__Params.html">[doxygen]</a></b>
 <li><a href = "../ace/Sched_Params.i">Sched_Params.i</a></li>
 <li><a href = "../ace/Synch.cpp">Synch.cpp</a></li>
 <li><a href = "../ace/Synch.h">Synch.h</a></li>
 <li><a href = "../ace/Synch.i">Synch.i</a></li>
 <li><a href = "../ace/Synch_Options.cpp">Synch_Options.cpp</a></li>
 <li><a href = "../ace/Synch_Options.h">Synch_Options.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Synch_Options.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Synch__Options.html">[doxygen]</a></b>
 <li><a href = "../ace/Synch_Options.i">Synch_Options.i</a></li>
 <li><a href = "../ace/Synch_T.cpp">Synch_T.cpp</a></li>
 <li><a href = "../ace/Synch_T.h">Synch_T.h</a></li>
 <li><a href = "../ace/Synch_T.i">Synch_T.i</a></li>
 <li><a href = "../ace/Thread.cpp">Thread.cpp</a></li>
 <li><a href = "../ace/Thread.h">Thread.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Thread.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Thread.html">[doxygen]</a></b>
 <li><a href = "../ace/Thread.i">Thread.i</a></li>
 <li><a href = "../ace/Thread_Manager.cpp">Thread_Manager.cpp</a></li>
 <li><a href = "../ace/Thread_Manager.h">Thread_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Thread_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Thread__Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Thread_Manager.i">Thread_Manager.i</a></li>
 <li><a href = "../ace/Token.cpp">Token.cpp</a></li>
 <li><a href = "../ace/Token.h">Token.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Token.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Token.html">[doxygen]</a></b>
 <li><a href = "../ace/Token.i">Token.i</a></li>
 </ul>
 <b>[Config]</b>
@@ -129,22 +131,22 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/Acceptor.cpp">Acceptor.cpp</a></li>
 <li><a href = "../ace/Acceptor.h">Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/Acceptor.i">Acceptor.i</a></li>
 <li><a href = "../ace/Asynch_Acceptor.cpp">Asynch_Acceptor.cpp</a></li>
 <li><a href = "../ace/Asynch_Acceptor.h">Asynch_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Asynch_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Asynch__Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/Asynch_Acceptor.i">Asynch_Acceptor.i</a></li>
 <li><a href = "../ace/Asynch_IO.cpp">Asynch_IO.cpp</a></li>
 <li><a href = "../ace/Asynch_IO.h">Asynch_IO.h</a></li>
 <li><a href = "../ace/Asynch_IO.i">Asynch_IO.i</a></li>
 <li><a href = "../ace/Connector.cpp">Connector.cpp</a></li>
 <li><a href = "../ace/Connector.h">Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/Connector.i">Connector.i</a></li>
 <li><a href = "../ace/Dynamic_Service.cpp">Dynamic_Service.cpp</a></li>
 <li><a href = "../ace/Dynamic_Service.h">Dynamic_Service.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Dynamic_Service.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Dynamic__Service.html">[doxygen]</a></b>
 <li><a href = "../ace/Dynamic_Service.i">Dynamic_Service.i</a></li>
 <li><a href = "../ace/Strategies.cpp">Strategies.cpp</a></li>
 <li><a href = "../ace/Strategies.h">Strategies.h</a></li>
@@ -154,7 +156,7 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Strategies_T.i">Strategies_T.i</a></li>
 <li><a href = "../ace/Svc_Handler.cpp">Svc_Handler.cpp</a></li>
 <li><a href = "../ace/Svc_Handler.h">Svc_Handler.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Svc_Handler.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Svc__Handler.html">[doxygen]</a></b>
 <li><a href = "../ace/Svc_Handler.i">Svc_Handler.i</a></li>
 </ul>
 <b>[IPC]</b>
@@ -163,40 +165,40 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/IO_SAP.cpp">IO_SAP.cpp</a></li>
 <li><a href = "../ace/IO_SAP.h">IO_SAP.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_IO_SAP.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__IO__SAP.html">[doxygen]</a></b>
 <li><a href = "../ace/IO_SAP.i">IO_SAP.i</a></li>
 <br>
 <b>[DEV_SAP]</b>
 <ul>
 <li><a href = "../ace/DEV.cpp">DEV.cpp</a></li>
 <li><a href = "../ace/DEV.h">DEV.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_DEV.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__DEV.html">[doxygen]</a></b>
 <li><a href = "../ace/DEV.i">DEV.i</a></li>
 <li><a href = "../ace/DEV_Connector.cpp">DEV_Connector.cpp</a></li>
 <li><a href = "../ace/DEV_Connector.h">DEV_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_DEV_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__DEV__Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/DEV_Connector.i">DEV_Connector.i</a></li>
 <li><a href = "../ace/DEV_IO.cpp">DEV_IO.cpp</a></li>
 <li><a href = "../ace/DEV_IO.h">DEV_IO.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_DEV_IO.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__DEV__IO.html">[doxygen]</a></b>
 <li><a href = "../ace/DEV_IO.i">DEV_IO.i</a></li>
 <li><a href = "../ace/TTY_IO.cpp">TTY_IO.cpp</a></li>
 <li><a href = "../ace/TTY_IO.h">TTY_IO.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_TTY_IO.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__TTY__IO.html">[doxygen]</a></b>
 </ul>
 <b>[FILE_SAP]</b>
 <ul>
 <li><a href = "../ace/FILE.cpp">FILE.cpp</a></li>
 <li><a href = "../ace/FILE.h">FILE.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FILE.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__FILE.html">[doxygen]</a></b>
 <li><a href = "../ace/FILE.i">FILE.i</a></li>
 <li><a href = "../ace/FILE_Connector.cpp">FILE_Connector.cpp</a></li>
 <li><a href = "../ace/FILE_Connector.h">FILE_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FILE_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__FILE__Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/FILE_Connector.i">FILE_Connector.i</a></li>
 <li><a href = "../ace/FILE_IO.cpp">FILE_IO.cpp</a></li>
 <li><a href = "../ace/FILE_IO.h">FILE_IO.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FILE_IO.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__FILE__IO.html">[doxygen]</a></b>
 <li><a href = "../ace/FILE_IO.i">FILE_IO.i</a></li>
 </ul>
 </ul>
@@ -204,163 +206,163 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/IPC_SAP.cpp">IPC_SAP.cpp</a></li>
 <li><a href = "../ace/IPC_SAP.h">IPC_SAP.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_IPC_SAP.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__IPC__SAP.html">[doxygen]</a></b>
 <li><a href = "../ace/IPC_SAP.i">IPC_SAP.i</a></li>
 <br>
 <b>[Addr]</b>
 <ul>
 <li><a href = "../ace/Addr.cpp">Addr.cpp</a></li>
 <li><a href = "../ace/Addr.h">Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/Addr.i">Addr.i</a></li>
 <li><a href = "../ace/DEV_Addr.cpp">DEV_Addr.cpp</a></li>
 <li><a href = "../ace/DEV_Addr.h">DEV_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_DEV_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__DEV__Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/DEV_Addr.i">DEV_Addr.i</a></li>
 <li><a href = "../ace/FILE_Addr.cpp">FILE_Addr.cpp</a></li>
 <li><a href = "../ace/FILE_Addr.h">FILE_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FILE_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__FILE__Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/FILE_Addr.i">FILE_Addr.i</a></li>
 <li><a href = "../ace/INET_Addr.cpp">INET_Addr.cpp</a></li>
 <li><a href = "../ace/INET_Addr.h">INET_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_INET_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__INET__Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/INET_Addr.i">INET_Addr.i</a></li>
 <li><a href = "../ace/SPIPE_Addr.cpp">SPIPE_Addr.cpp</a></li>
 <li><a href = "../ace/SPIPE_Addr.h">SPIPE_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SPIPE_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SPIPE__Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/SPIPE_Addr.i">SPIPE_Addr.i</a></li>
 <li><a href = "../ace/UNIX_Addr.cpp">UNIX_Addr.cpp</a></li>
 <li><a href = "../ace/UNIX_Addr.h">UNIX_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_UNIX_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__UNIX__Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/UNIX_Addr.i">UNIX_Addr.i</a></li>
 <li><a href = "../ace/UPIPE_Addr.h">UPIPE_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_UPIPE_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__UPIPE__Addr.html">[doxygen]</a></b>
 </ul>
 <b>[FIFO_SAP]</b>
 <ul>
 <li><a href = "../ace/FIFO.cpp">FIFO.cpp</a></li>
 <li><a href = "../ace/FIFO.h">FIFO.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FIFO.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__FIFO.html">[doxygen]</a></b>
 <li><a href = "../ace/FIFO.i">FIFO.i</a></li>
 <li><a href = "../ace/FIFO_Recv.cpp">FIFO_Recv.cpp</a></li>
 <li><a href = "../ace/FIFO_Recv.h">FIFO_Recv.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FIFO_Recv.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__FIFO__Recv.html">[doxygen]</a></b>
 <li><a href = "../ace/FIFO_Recv.i">FIFO_Recv.i</a></li>
 <li><a href = "../ace/FIFO_Recv_Msg.cpp">FIFO_Recv_Msg.cpp</a></li>
 <li><a href = "../ace/FIFO_Recv_Msg.h">FIFO_Recv_Msg.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FIFO_Recv_Msg.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__FIFO__Recv__Msg.html">[doxygen]</a></b>
 <li><a href = "../ace/FIFO_Recv_Msg.i">FIFO_Recv_Msg.i</a></li>
 <li><a href = "../ace/FIFO_Send.cpp">FIFO_Send.cpp</a></li>
 <li><a href = "../ace/FIFO_Send.h">FIFO_Send.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FIFO_Send.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__FIFO__Send.html">[doxygen]</a></b>
 <li><a href = "../ace/FIFO_Send.i">FIFO_Send.i</a></li>
 <li><a href = "../ace/FIFO_Send_Msg.cpp">FIFO_Send_Msg.cpp</a></li>
 <li><a href = "../ace/FIFO_Send_Msg.h">FIFO_Send_Msg.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FIFO_Send_Msg.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__FIFO__Send__Msg.html">[doxygen]</a></b>
 <li><a href = "../ace/FIFO_Send_Msg.i">FIFO_Send_Msg.i</a></li>
 </ul>
 <b>[SOCK_SAP]</b>
 <ul>
 <li><a href = "../ace/LOCK_SOCK_Acceptor.cpp">LOCK_SOCK_Acceptor.cpp</a></li>
 <li><a href = "../ace/LOCK_SOCK_Acceptor.h">LOCK_SOCK_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LOCK_SOCK_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__LOCK__SOCK__Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK.cpp">LSOCK.cpp</a></li>
 <li><a href = "../ace/LSOCK.h">LSOCK.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__LSOCK.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK.i">LSOCK.i</a></li>
 <li><a href = "../ace/LSOCK_Acceptor.cpp">LSOCK_Acceptor.cpp</a></li>
 <li><a href = "../ace/LSOCK_Acceptor.h">LSOCK_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__LSOCK__Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK_Acceptor.i">LSOCK_Acceptor.i</a></li>
 <li><a href = "../ace/LSOCK_CODgram.cpp">LSOCK_CODgram.cpp</a></li>
 <li><a href = "../ace/LSOCK_CODgram.h">LSOCK_CODgram.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK_CODgram.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__LSOCK__CODgram.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK_CODgram.i">LSOCK_CODgram.i</a></li>
 <li><a href = "../ace/LSOCK_Connector.cpp">LSOCK_Connector.cpp</a></li>
 <li><a href = "../ace/LSOCK_Connector.h">LSOCK_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__LSOCK__Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK_Connector.i">LSOCK_Connector.i</a></li>
 <li><a href = "../ace/LSOCK_Dgram.cpp">LSOCK_Dgram.cpp</a></li>
 <li><a href = "../ace/LSOCK_Dgram.h">LSOCK_Dgram.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK_Dgram.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__LSOCK__Dgram.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK_Dgram.i">LSOCK_Dgram.i</a></li>
 <li><a href = "../ace/LSOCK_Stream.cpp">LSOCK_Stream.cpp</a></li>
 <li><a href = "../ace/LSOCK_Stream.h">LSOCK_Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__LSOCK__Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK_Stream.i">LSOCK_Stream.i</a></li>
 <li><a href = "../ace/SOCK.cpp">SOCK.cpp</a></li>
 <li><a href = "../ace/SOCK.h">SOCK.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SOCK.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK.i">SOCK.i</a></li>
 <li><a href = "../ace/SOCK_Acceptor.cpp">SOCK_Acceptor.cpp</a></li>
 <li><a href = "../ace/SOCK_Acceptor.h">SOCK_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SOCK__Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Acceptor.i">SOCK_Acceptor.i</a></li>
 <li><a href = "../ace/SOCK_CODgram.cpp">SOCK_CODgram.cpp</a></li>
 <li><a href = "../ace/SOCK_CODgram.h">SOCK_CODgram.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_CODgram.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SOCK__CODgram.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_CODgram.i">SOCK_CODgram.i</a></li>
 <li><a href = "../ace/SOCK_Connector.cpp">SOCK_Connector.cpp</a></li>
 <li><a href = "../ace/SOCK_Connector.h">SOCK_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SOCK__Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Connector.i">SOCK_Connector.i</a></li>
 <li><a href = "../ace/SOCK_Dgram.cpp">SOCK_Dgram.cpp</a></li>
 <li><a href = "../ace/SOCK_Dgram.h">SOCK_Dgram.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Dgram.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SOCK__Dgram.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Dgram.i">SOCK_Dgram.i</a></li>
 <li><a href = "../ace/SOCK_Dgram_Bcast.cpp">SOCK_Dgram_Bcast.cpp</a></li>
 <li><a href = "../ace/SOCK_Dgram_Bcast.h">SOCK_Dgram_Bcast.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Dgram_Bcast.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SOCK__Dgram_Bcast.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Dgram_Bcast.i">SOCK_Dgram_Bcast.i</a></li>
 <li><a href = "../ace/SOCK_Dgram_Mcast.cpp">SOCK_Dgram_Mcast.cpp</a></li>
 <li><a href = "../ace/SOCK_Dgram_Mcast.h">SOCK_Dgram_Mcast.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Dgram_Mcast.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SOCK__Dgram__Mcast.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Dgram_Mcast.i">SOCK_Dgram_Mcast.i</a></li>
 <li><a href = "../ace/SOCK_IO.cpp">SOCK_IO.cpp</a></li>
 <li><a href = "../ace/SOCK_IO.h">SOCK_IO.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_IO.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SOCK__IO.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_IO.i">SOCK_IO.i</a></li>
 <li><a href = "../ace/SOCK_Stream.cpp">SOCK_Stream.cpp</a></li>
 <li><a href = "../ace/SOCK_Stream.h">SOCK_Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SOCK__Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Stream.i">SOCK_Stream.i</a></li>
 </ul>
 <b>[SPIPE_SAP]</b>
 <ul>
 <li><a href = "../ace/SPIPE.cpp">SPIPE.cpp</a></li>
 <li><a href = "../ace/SPIPE.h">SPIPE.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SPIPE.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SPIPE.html">[doxygen]</a></b>
 <li><a href = "../ace/SPIPE.i">SPIPE.i</a></li>
 <li><a href = "../ace/SPIPE_Acceptor.cpp">SPIPE_Acceptor.cpp</a></li>
 <li><a href = "../ace/SPIPE_Acceptor.h">SPIPE_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SPIPE_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SPIPE__Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/SPIPE_Acceptor.i">SPIPE_Acceptor.i</a></li>
 <li><a href = "../ace/SPIPE_Connector.cpp">SPIPE_Connector.cpp</a></li>
 <li><a href = "../ace/SPIPE_Connector.h">SPIPE_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SPIPE_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SPIPE__Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/SPIPE_Connector.i">SPIPE_Connector.i</a></li>
 <li><a href = "../ace/SPIPE_Stream.cpp">SPIPE_Stream.cpp</a></li>
 <li><a href = "../ace/SPIPE_Stream.h">SPIPE_Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SPIPE_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SPIPE__Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/SPIPE_Stream.i">SPIPE_Stream.i</a></li>
 </ul>
 <b>[TLI_SAP]</b>
 <ul>
 <li><a href = "../ace/TLI.cpp">TLI.cpp</a></li>
 <li><a href = "../ace/TLI.h">TLI.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_TLI.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__TLI.html">[doxygen]</a></b>
 <li><a href = "../ace/TLI.i">TLI.i</a></li>
 <li><a href = "../ace/TLI_Acceptor.cpp">TLI_Acceptor.cpp</a></li>
 <li><a href = "../ace/TLI_Acceptor.h">TLI_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_TLI_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__TLI__Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/TLI_Acceptor.i">TLI_Acceptor.i</a></li>
 <li><a href = "../ace/TLI_Connector.cpp">TLI_Connector.cpp</a></li>
 <li><a href = "../ace/TLI_Connector.h">TLI_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_TLI_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__TLI__Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/TLI_Connector.i">TLI_Connector.i</a></li>
 <li><a href = "../ace/TLI_Stream.cpp">TLI_Stream.cpp</a></li>
 <li><a href = "../ace/TLI_Stream.h">TLI_Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_TLI_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__TLI__Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/TLI_Stream.i">TLI_Stream.i</a></li>
 </ul>
 </ul>
@@ -368,27 +370,27 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/UPIPE_Acceptor.cpp">UPIPE_Acceptor.cpp</a></li>
 <li><a href = "../ace/UPIPE_Acceptor.h">UPIPE_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_UPIPE_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__UPIPE__Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/UPIPE_Acceptor.i">UPIPE_Acceptor.i</a></li>
 <li><a href = "../ace/UPIPE_Connector.cpp">UPIPE_Connector.cpp</a></li>
 <li><a href = "../ace/UPIPE_Connector.h">UPIPE_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_UPIPE_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__UPIPE__Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/UPIPE_Connector.i">UPIPE_Connector.i</a></li>
 <li><a href = "../ace/UPIPE_Stream.cpp">UPIPE_Stream.cpp</a></li>
 <li><a href = "../ace/UPIPE_Stream.h">UPIPE_Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_UPIPE_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__UPIPE__Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/UPIPE_Stream.i">UPIPE_Stream.i</a></li>
 </ul>
 <b>[Misc]</b>
 <ul>
 <li><a href = "../ace/IOStream.cpp">IOStream.cpp</a></li>
 <li><a href = "../ace/IOStream.h">IOStream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_IOStream.html">[doxygen]</a></b>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_IOStream_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__IOStream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__IOStream_T.html">[doxygen]</a></b>
 <li><a href = "../ace/IOStream_T.i">IOStream_T.i</a></li>
 <li><a href = "../ace/Pipe.cpp">Pipe.cpp</a></li>
 <li><a href = "../ace/Pipe.h">Pipe.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Pipe.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Pipe.html">[doxygen]</a></b>
 <li><a href = "../ace/Pipe.i">Pipe.i</a></li>
 <li><a href = "../ace/Signal.cpp">Signal.cpp</a></li>
 <li><a href = "../ace/Signal.h">Signal.h</a></li>
@@ -403,16 +405,16 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Dump_T.h">Dump_T.h</a></li>
 <li><a href = "../ace/Log_Msg.cpp">Log_Msg.cpp</a></li>
 <li><a href = "../ace/Log_Msg.h">Log_Msg.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Log_Msg.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Log__Msg.html">[doxygen]</a></b>
 <li><a href = "../ace/Log_Msg.i">Log_Msg.i</a></li>
 <li><a href = "../ace/Log_Priority.h">Log_Priority.h</a></li>
 <li><a href = "../ace/Log_Record.cpp">Log_Record.cpp</a></li>
 <li><a href = "../ace/Log_Record.h">Log_Record.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Log_Record.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Log__Record.html">[doxygen]</a></b>
 <li><a href = "../ace/Log_Record.i">Log_Record.i</a></li>
 <li><a href = "../ace/Trace.cpp">Trace.cpp</a></li>
 <li><a href = "../ace/Trace.h">Trace.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Trace.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Trace.html">[doxygen]</a></b>
 <li><a href = "../ace/Trace.i">Trace.i</a></li>
 </ul>
 <b>[Memory]</b>
@@ -421,14 +423,14 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/Mem_Map.cpp">Mem_Map.cpp</a></li>
 <li><a href = "../ace/Mem_Map.h">Mem_Map.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Mem_Map.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Mem__Map.html">[doxygen]</a></b>
 <li><a href = "../ace/Mem_Map.i">Mem_Map.i</a></li>
 </ul>
 <b>[Shared_Malloc]</b>
 <ul>
 <li><a href = "../ace/Malloc.cpp">Malloc.cpp</a></li>
 <li><a href = "../ace/Malloc.h">Malloc.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Malloc.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Malloc.html">[doxygen]</a></b>
 <li><a href = "../ace/Malloc.i">Malloc.i</a></li>
 <li><a href = "../ace/Malloc_T.cpp">Malloc_T.cpp</a></li>
 <li><a href = "../ace/Malloc_T.h">Malloc_T.h</a></li>
@@ -440,24 +442,24 @@ versions</A> of the relevant manual pages</A>. <P>
 <b>[Shared_Memory]</b>
 <ul>
 <li><a href = "../ace/Shared_Memory.h">Shared_Memory.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Shared_Memory.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Shared__Memory.html">[doxygen]</a></b>
 <li><a href = "../ace/Shared_Memory_MM.cpp">Shared_Memory_MM.cpp</a></li>
 <li><a href = "../ace/Shared_Memory_MM.h">Shared_Memory_MM.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Shared_Memory_MM.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Shared__Memory__MM.html">[doxygen]</a></b>
 <li><a href = "../ace/Shared_Memory_MM.i">Shared_Memory_MM.i</a></li>
 <li><a href = "../ace/Shared_Memory_SV.cpp">Shared_Memory_SV.cpp</a></li>
 <li><a href = "../ace/Shared_Memory_SV.h">Shared_Memory_SV.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Shared_Memory_SV.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Shared__Memory__SV.html">[doxygen]</a></b>
 <li><a href = "../ace/Shared_Memory_SV.i">Shared_Memory_SV.i</a></li>
 </ul>
 <b>[Utils]</b>
 <ul>
 <li><a href = "../ace/Obstack.cpp">Obstack.cpp</a></li>
 <li><a href = "../ace/Obstack.h">Obstack.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Obstack.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Obstack.html">[doxygen]</a></b>
 <li><a href = "../ace/Read_Buffer.cpp">Read_Buffer.cpp</a></li>
 <li><a href = "../ace/Read_Buffer.h">Read_Buffer.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Read_Buffer.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Read__Buffer.html">[doxygen]</a></b>
 <li><a href = "../ace/Read_Buffer.i">Read_Buffer.i</a></li>
 </ul>
 </ul>
@@ -465,141 +467,141 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/ARGV.cpp">ARGV.cpp</a></li>
 <li><a href = "../ace/ARGV.h">ARGV.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_ARGV.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__ARGV.html">[doxygen]</a></b>
 <li><a href = "../ace/ARGV.i">ARGV.i</a></li>
 <li><a href = "../ace/Auto_Ptr.cpp">Auto_Ptr.cpp</a></li>
 <li><a href = "../ace/Auto_Ptr.h">Auto_Ptr.h</a></li>
 <li><a href = "../ace/Auto_Ptr.i">Auto_Ptr.i</a></li>
 <li><a href = "../ace/Date_Time.cpp">Date_Time.cpp</a></li>
 <li><a href = "../ace/Date_Time.h">Date_Time.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Date_Time.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Date__Time.html">[doxygen]</a></b>
 <li><a href = "../ace/Date_Time.i">Date_Time.i</a></li>
 <li><a href = "../ace/Dynamic.cpp">Dynamic.cpp</a></li>
 <li><a href = "../ace/Dynamic.h">Dynamic.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Dynamic.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Dynamic.html">[doxygen]</a></b>
 <li><a href = "../ace/Dynamic.i">Dynamic.i</a></li>
 <li><a href = "../ace/Get_Opt.cpp">Get_Opt.cpp</a></li>
 <li><a href = "../ace/Get_Opt.h">Get_Opt.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Get_Opt.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Get__Opt.html">[doxygen]</a></b>
 <li><a href = "../ace/Get_Opt.i">Get_Opt.i</a></li>
 <li><a href = "../ace/Registry.cpp">Registry.cpp</a></li>
 <li><a href = "../ace/Registry.h">Registry.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Registry.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Registry.html">[doxygen]</a></b>
 <li><a href = "../ace/Singleton.cpp">Singleton.cpp</a></li>
 <li><a href = "../ace/Singleton.h">Singleton.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Singleton.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Singleton.html">[doxygen]</a></b>
 <li><a href = "../ace/Singleton.i">Singleton.i</a></li>
 <li><a href = "../ace/System_Time.cpp">System_Time.cpp</a></li>
 <li><a href = "../ace/System_Time.h">System_Time.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_System_Time.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__System__Time.html">[doxygen]</a></b>
 </ul>
 <b>[Name_Service]</b>
 <ul>
 <li><a href = "../ace/Local_Name_Space.cpp">Local_Name_Space.cpp</a></li>
 <li><a href = "../ace/Local_Name_Space.h">Local_Name_Space.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Local_Name_Space.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Local__Name__Space.html">[doxygen]</a></b>
 <li><a href = "../ace/Local_Name_Space_T.cpp">Local_Name_Space_T.cpp</a></li>
 <li><a href = "../ace/Local_Name_Space_T.h">Local_Name_Space_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Name_Options.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Name__Options.html">[doxygen]</a></b>
 <li><a href = "../ace/Name_Proxy.cpp">Name_Proxy.cpp</a></li>
 <li><a href = "../ace/Name_Proxy.h">Name_Proxy.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Name_Proxy.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Name__Proxy.html">[doxygen]</a></b>
 <li><a href = "../ace/Name_Request_Reply.cpp">Name_Request_Reply.cpp</a></li>
 <li><a href = "../ace/Name_Request_Reply.h">Name_Request_Reply.h</a></li>
 <li><a href = "../ace/Name_Space.cpp">Name_Space.cpp</a></li>
 <li><a href = "../ace/Name_Space.h">Name_Space.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Name_Space.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Name__Space.html">[doxygen]</a></b>
 <li><a href = "../ace/Naming_Context.cpp">Naming_Context.cpp</a></li>
 <li><a href = "../ace/Naming_Context.h">Naming_Context.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Naming_Context.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Naming__Context.html">[doxygen]</a></b>
 <li><a href = "../ace/Registry_Name_Space.cpp">Registry_Name_Space.cpp</a></li>
 <li><a href = "../ace/Registry_Name_Space.h">Registry_Name_Space.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Registry_Name_Space.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Registry__Name__Space.html">[doxygen]</a></b>
 <li><a href = "../ace/Remote_Name_Space.cpp">Remote_Name_Space.cpp</a></li>
 <li><a href = "../ace/Remote_Name_Space.h">Remote_Name_Space.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Remote_Name_Space.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Remote__Name__Space.html">[doxygen]</a></b>
 </ul>
 <b>[OS Adapters]</b>
 <ul>
 <li><a href = "../ace/ACE.cpp">ACE.cpp</a></li>
 <li><a href = "../ace/ACE.h">ACE.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE.html">[doxygen]</a></b>
 <li><a href = "../ace/ACE.i">ACE.i</a></li>
 <li><a href = "../ace/OS.cpp">OS.cpp</a></li>
 <li><a href = "../ace/OS.h">OS.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_OS.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__OS.html">[doxygen]</a></b>
 <li><a href = "../ace/OS.i">OS.i</a></li>
 </ul>
 <b>[Reactor]</b>
 <ul>
 <li><a href = "../ace/Event_Handler.cpp">Event_Handler.cpp</a></li>
 <li><a href = "../ace/Event_Handler.h">Event_Handler.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Event_Handler.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Event__Handler.html">[doxygen]</a></b>
 <li><a href = "../ace/Event_Handler.i">Event_Handler.i</a></li>
 <li><a href = "../ace/Event_Handler_T.cpp">Event_Handler_T.cpp</a></li>
 <li><a href = "../ace/Event_Handler_T.h">Event_Handler_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Event_Handler_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Event__Handler__T.html">[doxygen]</a></b>
 <li><a href = "../ace/Event_Handler_T.i">Event_Handler_T.i</a></li>
 <li><a href = "../ace/Handle_Set.cpp">Handle_Set.cpp</a></li>
 <li><a href = "../ace/Handle_Set.h">Handle_Set.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Handle_Set.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Handle__Set.html">[doxygen]</a></b>
 <li><a href = "../ace/Handle_Set.i">Handle_Set.i</a></li>
 <li><a href = "../ace/Priority_Reactor.cpp">Priority_Reactor.cpp</a></li>
 <li><a href = "../ace/Priority_Reactor.i">Priority_Reactor.i</a></li>
 <li><a href = "../ace/Priority_Reactor.h">Priority_Reactor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Priority_Reactor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Priority__Reactor.html">[doxygen]</a></b>
 <li><a href = "../ace/Proactor.h">Proactor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Proactor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Proactor.html">[doxygen]</a></b>
 <li><a href = "../ace/Proactor.i">Proactor.i</a></li>
 <li><a href = "../ace/Proactor.cpp">Proactor.cpp</a></li>
 <li><a href = "../ace/Reactor.cpp">Reactor.cpp</a></li>
 <li><a href = "../ace/Reactor.h">Reactor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Reactor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Reactor.html">[doxygen]</a></b>
 <li><a href = "../ace/Reactor.i">Reactor.i</a></li>
 <li><a href = "../ace/Reactor_Impl.h">Reactor_Impl.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Reactor_Impl.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Reactor__Impl.html">[doxygen]</a></b>
 <li><a href = "../ace/Select_Reactor.cpp">Select_Reactor.cpp</a></li>
 <li><a href = "../ace/Select_Reactor.h">Select_Reactor.h</a></li>
 <li><a href = "../ace/Select_Reactor.i">Select_Reactor.i</a></li>
 <li><a href = "../ace/WFMO_Reactor.cpp">WFMO_Reactor.cpp</a></li>
 <li><a href = "../ace/WFMO_Reactor.h">WFMO_Reactor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_WFMO_Reactor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__WFMO__Reactor.html">[doxygen]</a></b>
 <li><a href = "../ace/WFMO_Reactor.i">WFMO_Reactor.i</a></li>
 <li><a href = "../ace/XtReactor.cpp">XtReactor.cpp</a></li>
 <li><a href = "../ace/XtReactor.h">XtReactor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_XtReactor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__XtReactor.html">[doxygen]</a></b>
 </ul>
 <b>[Service_Configurator]</b>
 <ul>
 <li><a href = "../ace/DLL.cpp">DLL.cpp</a></li>
 <li><a href = "../ace/DLL.h">DLL.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_DLL.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__DLL.html">[doxygen]</a></b>
 <li><a href = "../ace/Parse_Node.cpp">Parse_Node.cpp</a></li>
 <li><a href = "../ace/Parse_Node.h">Parse_Node.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Parse_Node.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Parse__Node.html">[doxygen]</a></b>
 <li><a href = "../ace/Parse_Node.i">Parse_Node.i</a></li>
 <li><a href = "../ace/Service_Config.cpp">Service_Config.cpp</a></li>
 <li><a href = "../ace/Service_Config.h">Service_Config.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Service_Config.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Service__Config.html">[doxygen]</a></b>
 <li><a href = "../ace/Service_Config.i">Service_Config.i</a></li>
 <li><a href = "../ace/Service_Manager.cpp">Service_Manager.cpp</a></li>
 <li><a href = "../ace/Service_Manager.h">Service_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Service_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Service__Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Service_Manager.i">Service_Manager.i</a></li>
 <li><a href = "../ace/Service_Object.cpp">Service_Object.cpp</a></li>
 <li><a href = "../ace/Service_Object.h">Service_Object.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Service_Object.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Service__Object.html">[doxygen]</a></b>
 <li><a href = "../ace/Service_Object.i">Service_Object.i</a></li>
 <li><a href = "../ace/Service_Repository.cpp">Service_Repository.cpp</a></li>
 <li><a href = "../ace/Service_Repository.h">Service_Repository.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Service_Repository.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Service__Repository.html">[doxygen]</a></b>
 <li><a href = "../ace/Service_Repository.i">Service_Repository.i</a></li>
 <li><a href = "../ace/Service_Types.cpp">Service_Types.cpp</a></li>
 <li><a href = "../ace/Service_Types.i">Service_Types.i</a></li>
 <li><a href = "../ace/Service_Types.h">Service_Types.h</a></li>
 <li><a href = "../ace/Shared_Object.cpp">Shared_Object.cpp</a></li>
 <li><a href = "../ace/Shared_Object.h">Shared_Object.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Shared_Object.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Shared__Object.html">[doxygen]</a></b>
 <li><a href = "../ace/Shared_Object.i">Shared_Object.i</a></li>
 <li><a href = "../ace/Svc_Conf.h">Svc_Conf.h</a></li>
 <li><a href = "../ace/Svc_Conf_l.cpp">Svc_Conf_l.cpp</a></li>
@@ -610,37 +612,37 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/IO_Cntl_Msg.cpp">IO_Cntl_Msg.cpp</a></li>
 <li><a href = "../ace/IO_Cntl_Msg.h">IO_Cntl_Msg.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_IO_Cntl_Msg.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__IO__Cntl__Msg.html">[doxygen]</a></b>
 <li><a href = "../ace/IO_Cntl_Msg.i">IO_Cntl_Msg.i</a></li>
 <li><a href = "../ace/Message_Block.cpp">Message_Block.cpp</a></li>
 <li><a href = "../ace/Message_Block.h">Message_Block.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Message_Block.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Message__Block.html">[doxygen]</a></b>
 <li><a href = "../ace/Message_Block.i">Message_Block.i</a></li>
 <li><a href = "../ace/Message_Queue.cpp">Message_Queue.cpp</a></li>
 <li><a href = "../ace/Message_Queue.h">Message_Queue.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Message_Queue.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Message__Queue.html">[doxygen]</a></b>
 <li><a href = "../ace/Message_Queue.i">Message_Queue.i</a></li>
 <li><a href = "../ace/Message_Queue_T.cpp">Message_Queue_T.cpp</a></li>
 <li><a href = "../ace/Message_Queue_T.h">Message_Queue_T.h</a></li>
 <li><a href = "../ace/Message_Queue_T.i">Message_Queue_T.i</a></li>
 <li><a href = "../ace/Module.cpp">Module.cpp</a></li>
 <li><a href = "../ace/Module.h">Module.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Module.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Module.html">[doxygen]</a></b>
 <li><a href = "../ace/Module.i">Module.i</a></li>
 <li><a href = "../ace/Multiplexor.cpp">Multiplexor.cpp</a></li>
 <li><a href = "../ace/Multiplexor.h">Multiplexor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Multiplexor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Multiplexor.html">[doxygen]</a></b>
 <li><a href = "../ace/Multiplexor.i">Multiplexor.i</a></li>
 <li><a href = "../ace/Stream.cpp">Stream.cpp</a></li>
 <li><a href = "../ace/Stream.h">Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/Stream.i">Stream.i</a></li>
 <li><a href = "../ace/Stream_Modules.cpp">Stream_Modules.cpp</a></li>
 <li><a href = "../ace/Stream_Modules.h">Stream_Modules.h</a></li>
 <li><a href = "../ace/Stream_Modules.i">Stream_Modules.i</a></li>
 <li><a href = "../ace/Task.cpp">Task.cpp</a></li>
 <li><a href = "../ace/Task.h">Task.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Task.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Task.html">[doxygen]</a></b>
 <li><a href = "../ace/Task.i">Task.i</a></li>
 <li><a href = "../ace/Task_T.cpp">Task_T.cpp</a></li>
 <li><a href = "../ace/Task_T.h">Task_T.h</a></li>
@@ -652,38 +654,38 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/SV_Message.cpp">SV_Message.cpp</a></li>
 <li><a href = "../ace/SV_Message.h">SV_Message.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SV_Message.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SV__Message.html">[doxygen]</a></b>
 <li><a href = "../ace/SV_Message.i">SV_Message.i</a></li>
 <li><a href = "../ace/SV_Message_Queue.cpp">SV_Message_Queue.cpp</a></li>
 <li><a href = "../ace/SV_Message_Queue.h">SV_Message_Queue.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SV_Message_Queue.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SV__Message__Queue.html">[doxygen]</a></b>
 <li><a href = "../ace/SV_Message_Queue.i">SV_Message_Queue.i</a></li>
 <li><a href = "../ace/Typed_SV_Message.cpp">Typed_SV_Message.cpp</a></li>
 <li><a href = "../ace/Typed_SV_Message.h">Typed_SV_Message.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Typed_SV_Message.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Typed__SV__Message.html">[doxygen]</a></b>
 <li><a href = "../ace/Typed_SV_Message.i">Typed_SV_Message.i</a></li>
 <li><a href = "../ace/Typed_SV_Message_Queue.cpp">Typed_SV_Message_Queue.cpp</a></
 li>
 <li><a href = "../ace/Typed_SV_Message_Queue.h">Typed_SV_Message_Queue.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Typed_SV_Message_Queue.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Typed__SV__Message__Queue.html">[doxygen]</a></b>
 <li><a href = "../ace/Typed_SV_Message_Queue.i">Typed_SV_Message_Queue.i</a></li>
 </ul>
 <b>[System_V_Semaphores]</b>
 <ul>
 <li><a href = "../ace/SV_Semaphore_Complex.cpp">SV_Semaphore_Complex.cpp</a></li>
 <li><a href = "../ace/SV_Semaphore_Complex.h">SV_Semaphore_Complex.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SV_Semaphore_Complex.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SV__Semaphore__Complex.html">[doxygen]</a></b>
 <li><a href = "../ace/SV_Semaphore_Complex.i">SV_Semaphore_Complex.i</a></li>
 <li><a href = "../ace/SV_Semaphore_Simple.cpp">SV_Semaphore_Simple.cpp</a></li>
 <li><a href = "../ace/SV_Semaphore_Simple.h">SV_Semaphore_Simple.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SV_Semaphore_Simple.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SV__Semaphore__Simple.html">[doxygen]</a></b>
 <li><a href = "../ace/SV_Semaphore_Simple.i">SV_Semaphore_Simple.i</a></li>
 </ul>
 <b>[System_V_Shared_Memory]</b>
 <ul>
 <li><a href = "../ace/SV_Shared_Memory.cpp">SV_Shared_Memory.cpp</a></li>
 <li><a href = "../ace/SV_Shared_Memory.h">SV_Shared_Memory.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SV_Shared_Memory.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__SV__Shared__Memory.html">[doxygen]</a></b>
 <li><a href = "../ace/SV_Shared_Memory.i">SV_Shared_Memory.i</a></li>
 </ul>
 </ul>
@@ -691,31 +693,31 @@ li>
 <ul>
 <li><a href = "../ace/High_Res_Timer.cpp">High_Res_Timer.cpp</a></li>
 <li><a href = "../ace/High_Res_Timer.h">High_Res_Timer.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_High_Res_Timer.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__High__Res__Timer.html">[doxygen]</a></b>
 <li><a href = "../ace/High_Res_Timer.i">High_Res_Timer.i</a></li>
 <li><a href = "../ace/Profile_Timer.cpp">Profile_Timer.cpp</a></li>
 <li><a href = "../ace/Profile_Timer.h">Profile_Timer.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Profile_Timer.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Profile__Timer.html">[doxygen]</a></b>
 <li><a href = "../ace/Profile_Timer.i">Profile_Timer.i</a></li>
 <li><a href = "../ace/Time_Request_Reply.cpp">Time_Request_Reply.cpp</a></li>
 <li><a href = "../ace/Time_Request_Reply.h">Time_Request_Reply.h</a></li>
 <li><a href = "../ace/Time_Value.h">Time_Value.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Time_Value.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Time__Value.html">[doxygen]</a></b>
 <li><a href = "../ace/Timer_Hash.cpp">Timer_Hash.cpp</a></li>
 <li><a href = "../ace/Timer_Hash.h">Timer_Hash.h</a></li>
 <li><a href = "../ace/Timer_Hash_T.cpp">Timer_Hash_T.cpp</a></li>
 <li><a href = "../ace/Timer_Hash_T.h">Timer_Hash_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Timer_Hash_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Timer__Hash__T.html">[doxygen]</a></b>
 <li><a href = "../ace/Timer_Heap.cpp">Timer_Heap.cpp</a></li>
 <li><a href = "../ace/Timer_Heap.h">Timer_Heap.h</a></li>
 <li><a href = "../ace/Timer_Heap_T.cpp">Timer_Heap_T.cpp</a></li>
 <li><a href = "../ace/Timer_Heap_T.h">Timer_Heap_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Timer_Heap_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Timer__Heap__T.html">[doxygen]</a></b>
 <li><a href = "../ace/Timer_List.cpp">Timer_List.cpp</a></li>
 <li><a href = "../ace/Timer_List.h">Timer_List.h</a></li>
 <li><a href = "../ace/Timer_List_T.cpp">Timer_List_T.cpp</a></li>
 <li><a href = "../ace/Timer_List_T.h">Timer_List_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Timer_List_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Timer__List__T.html">[doxygen]</a></b>
 <li><a href = "../ace/Timer_Queue.cpp">Timer_Queue.cpp</a></li>
 <li><a href = "../ace/Timer_Queue.h">Timer_Queue.h</a></li>
 <li><a href = "../ace/Timer_Queue.i">Timer_Queue.i</a></li>
@@ -724,13 +726,13 @@ li>
 <li><a href = "../ace/Timer_Queue_Adapters.i">Timer_Queue_Adapters.i</a></li>
 <li><a href = "../ace/Timer_Queue_T.cpp">Timer_Queue_T.cpp</a></li>
 <li><a href = "../ace/Timer_Queue_T.h">Timer_Queue_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Timer_Queue_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Timer__Queue__T.html">[doxygen]</a></b>
 <li><a href = "../ace/Timer_Queue_T.i">Timer_Queue_T.i</a></li>
 <li><a href = "../ace/Timer_Wheel.cpp">Timer_Wheel.cpp</a></li>
 <li><a href = "../ace/Timer_Wheel.h">Timer_Wheel.h</a></li>
 <li><a href = "../ace/Timer_Wheel_T.cpp">Timer_Wheel_T.cpp</a></li>
 <li><a href = "../ace/Timer_Wheel_T.h">Timer_Wheel_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Timer_Wheel_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Timer__Wheel__T.html">[doxygen]</a></b>
 </ul>
 <b>[Token_Service]</b>
 <ul>
@@ -742,11 +744,11 @@ li>
 <li><a href = "../ace/Remote_Tokens.i">Remote_Tokens.i</a></li>
 <li><a href = "../ace/Token_Collection.cpp">Token_Collection.cpp</a></li>
 <li><a href = "../ace/Token_Collection.h">Token_Collection.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Token_Collection.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Token__Collection.html">[doxygen]</a></b>
 <li><a href = "../ace/Token_Collection.i">Token_Collection.i</a></li>
 <li><a href = "../ace/Token_Manager.cpp">Token_Manager.cpp</a></li>
 <li><a href = "../ace/Token_Manager.h">Token_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Token_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/classACE__Token__Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Token_Manager.i">Token_Manager.i</a></li>
 <li><a href = "../ace/Token_Request_Reply.cpp">Token_Request_Reply.cpp</a></li>
 <li><a href = "../ace/Token_Request_Reply.h">Token_Request_Reply.h</a></li>
diff --git a/docs/ACE-subsets.html b/docs/ACE-subsets.html
index 27e56b8aaf0..174701e735e 100644
--- a/docs/ACE-subsets.html
+++ b/docs/ACE-subsets.html
@@ -436,7 +436,6 @@ XtReactor
 </code></pre>
 
 <hr><p>
-<hr><p>
 <h3><a name="ACE Library Size Breakdown">ACE Library Size Breakdown</a></h3>
 
 Here is an example size breakdown, by ACE library component.  It is
@@ -783,7 +782,6 @@ Please note the current limitations:<p>
       projects on Win32 do not support the specification of components.<br><br></li>
 </ol>
 
-
 <hr><p>
 <h3><a name="ACE_OS Adaptation Layer">ACE_OS Adaptation Layer</a></h3>
 
@@ -827,7 +825,7 @@ verified systems.  When complete, it will offer these benefits: <P>
     statically linked applications. 
 </OL><P>
 
-<a name="minimumTAO"><!--#include virtual="../TAO/docs/minimumTAO.html" --></a>
+<a name="minimumTAO"><!--#include virtual="minimumTAO.html" --></a>
 
 <P><HR><P>
 Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</A>
diff --git a/docs/minimumTAO.html b/docs/minimumTAO.html
new file mode 100644
index 00000000000..db4d70fd15e
--- /dev/null
+++ b/docs/minimumTAO.html
@@ -0,0 +1,475 @@
+<!-- $Id$ -->
+
+<html>
+  <head>
+    <title>Minimum TAO</title>
+    <link rev=made href="mailto:tao-users@cs.wustl.edu">
+  </head>
+
+<body text = "#000000"
+      link="#000fff"
+      vlink="#ff0f0f"
+      bgcolor="#ffffff">
+
+<hr>
+<p>
+
+<strong>Minimum TAO</strong>
+<p>
+
+In addition to our work on <A HREF="ACE-subsets.html">ACE
+subsetting</A>, we have also been reducing the footprint of TAO.  We
+are pursuing two complementary strategies to reduce TAO's footprint:
+
+<OL>
+
+<LI> <B><EM>Implicit subsetting</EM></B>, e.g., by reducing
+    dependencies in the TAO library so that programs need not link
+    unused TAO components. <P>
+    
+<LI> <B><EM>Explicit subsetting</EM></B>, e.g., by supporting the <a
+href="http://www.omg.org/cgi-bin/doc?orbos/98-08-04.pdf"><em>minimumCORBA
+</em></a> specification to <a href =
+"http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>.  The <em>
+minimumCORBA </em> specification removes the following features from
+the <a href
+="http://www.omg.org/technology/documents/formal/">CORBA</a>
+specification. <P>
+<ul>
+<li>Dynamic Skeleton Interface<br>
+<li>Dynamic Invocation Interface<br>
+<li>Dynamic Any<br>
+<li>Interceptors<br>
+<li>Interface Repository<br>
+<li>Advanced POA features<br>
+<li>CORBA/COM interworking<br>
+</ul>
+</OL>
+
+The implicit subsetting of TAO requires no explicit application
+programmer intervention.  In contrast, to minimize the footprint of
+TAO explicitly, you must
+<OL>
+<LI> <a
+href="../ACE-INSTALL.html">Configure</a> ACE to support only those
+components that are required by TAO and <P>
+<LI> <a href =
+"../TAO/TAO-INSTALL.html">Configure</a> TAO to only support the
+components specified by the <em>minimumCORBA</em> specification.  
+</OL>
+
+The following two tables show the footprint reduction achievable via
+explicit subsetting.  Note that the IDL Compiler column refers to the
+code required to collaborate between the IDL compiler and the ORB, and
+not to the code for the IDL compiler itself.
+
+<p><hr width=50% align=left> <p>
+
+Note: All measurement are for ACE 5.0 and TAO 1.0 using egcs-2.91.60
+on SunOS5.7<P>
+
+The <a
+href="../ACE-INSTALL.html#flags">make
+flags</a> options used were: <P>
+
+<code> debug=0 optimize=1 static_libs_only=1 DEFFLAGS=-DACE_USE_RCSID=0 </code> <P>
+
+These options translate into:<P>
+<UL>
+<LI> No debugging
+<LI> Optimization is set to -O2
+<LI> Static ACE and TAO libraries
+<LI> Use of RCS Ids is turned off
+</UL>
+<p>
+
+To build a TAO static library, if shared libraries are the default,
+use <code>make static_libs_only=1</code> (make sure to do this for
+ACE, as well).  If you're using recent versions of GNU GCC, you can
+use the <A HREF="../ACE-INSTALL.html#repo">-frepo</A> option, which
+typically reduces the footprint by another 25 percent. <P>
+
+<p><hr width=50% align=left> <p>
+
+<center><table cellpadding=4 border=4>
+  <tr>
+    <th>Configuration
+    <th>Component
+    <th>Total
+    <th>OS
+    <th>Utils
+    <th>Logging
+    <th>Threads
+    <th>Demux
+    <th>Connection
+    <th>Sockets
+    <th>IPC
+    <th>Svcconf
+    <th>Streams
+    <th>Memory
+    <th>Token
+    <th>Other
+  <tr>
+    <th rowspan=2>ACE (all components)
+    <th>Size, bytes
+    <td align=center>709.5
+    <td align=center>11.9
+    <td align=center>115.3
+    <td align=center>13.7
+    <td align=center>63.0
+    <td align=center>88.0
+    <td align=center>68.6
+    <td align=center>16.9
+    <td align=center>43.0
+    <td align=center>99.8
+    <td align=center>21.4
+    <td align=center>29.2
+    <td align=center>76.0
+    <td align=center>62.9
+  <tr>
+    <th>Percentage of<br>total size
+    <td align=center>100
+    <td align=center>1.7
+    <td align=center>16.2
+    <td align=center>1.9
+    <td align=center>8.9
+    <td align=center>12.4
+    <td align=center>9.7
+    <td align=center>2.4
+    <td align=center>6.0
+    <td align=center>14.1
+    <td align=center>3.0
+    <td align=center>4.1
+    <td align=center>10.7
+    <td align=center>8.9
+  <tr>
+    <th rowspan=2>ACE (TAO components)
+    <th>Size, bytes
+    <td align=center>570.7
+    <td align=center>11.9
+    <td align=center>115.3
+    <td align=center>13.7
+    <td align=center>63.0
+    <td align=center>88.0
+    <td align=center>68.6
+    <td align=center>16.9
+    <td align=center>43.0
+    <td align=center>99.8
+    <td align=center>21.4
+    <td align=center>29.2
+    <td align=center>0
+    <td align=center>0
+  <tr>
+    <th>Percentage of<br>total size
+    <td align=center>100
+    <td align=center>2.1
+    <td align=center>20.2
+    <td align=center>2.4
+    <td align=center>11.0
+    <td align=center>15.4
+    <td align=center>12.0
+    <td align=center>3.0
+    <td align=center>7.5
+    <td align=center>17.5
+    <td align=center>3.7
+    <td align=center>5.1
+    <td align=center>0
+    <td align=center>0
+  <tr>
+    <th>Reduction
+    <th>%
+    <td align=center>19.6
+    <td align=center>0
+    <td align=center>0
+    <td align=center>0
+    <td align=center>0
+    <td align=center>0
+    <td align=center>0
+    <td align=center>0
+    <td align=center>0
+    <td align=center>0
+    <td align=center>0
+    <td align=center>0
+    <td align=center>100
+    <td align=center>100
+</table></center>
+
+<p><hr width=50% align=left> <p>
+
+<center><table cellpadding=4 border=4>
+  <tr>
+    <th>Configuration
+    <th>Component
+    <th>Total
+    <th>POA
+    <th>Pluggable Protocols
+    <th>Default Resources
+    <th>Interpretive Marshaling
+    <th>IDL Compiler
+    <th>ORB Core
+    <th>Dynamic Any
+  <tr>
+    <th rowspan=2>Complete TAO
+    <th>Size, Kbytes
+    <td align=center>1617.2
+    <td align=center>412.5
+    <td align=center>281.0
+    <td align=center>32.1
+    <td align=center>73.4
+    <td align=center>10.7
+    <td align=center>595.2
+    <td align=center>212.3
+  <tr>
+    <th>Percentage of<br>total size
+    <td align=center>100
+    <td align=center>25.5
+    <td align=center>17.4
+    <td align=center>2.0
+    <td align=center>4.5
+    <td align=center>0.7
+    <td align=center>36.8
+    <td align=center>13.1
+  <tr>
+    <th rowspan=2>Minimum TAO
+    <th>Size, Kbytes
+    <td align=center>1359.2
+    <td align=center>376.2
+    <td align=center>281.0
+    <td align=center>32.1
+    <td align=center>73.4
+    <td align=center>10.7
+    <td align=center>585.5
+    <td align=center>0.0
+  <tr>
+    <th>Percentage of<br>total size
+    <td align=center>100
+    <td align=center>27.7
+    <td align=center>20.7
+    <td align=center>2.4
+    <td align=center>5.4
+    <td align=center>0.8
+    <td align=center>43.1
+    <td align=center>0.0
+  <tr>
+    <th>Reduction
+    <th>%
+    <td align=center>16.0
+    <td align=center>8.8
+    <td align=center>0
+    <td align=center>0
+    <td align=center>0
+    <td align=center>0
+    <td align=center>1.6
+    <td align=center>100
+</table></center><p>
+
+<HR>
+
+<h3><a name="Status">ACE+TAO Subsetting Work in Progress</a></h3>
+
+We've been tracking the footprint reduction of ACE+TAO periodically
+since April, 2000.  All the statistics are available <A
+HREF="http://doc.ece.uci.edu/Stats/">online</A>.  As the result of
+this prior work, we've identified various areas for improvement that
+we're now addressing.  For example, the following are the remaining
+areas for ACE subsetting:
+
+  <ul>
+    <li><EM><B>Log_Msg decoupling</EM></B> --  We have a good start on this, but it needs work
+      to finish.  It might be easiest to make an abstract
+      base class, then have ACE_Log_Msg derive from it.  That way
+      we could remove the exposure of all the #includes in Log_Msg.cpp
+      to applications that don't need it.  Another alternative would
+      be to disable compilation of Log_Msg.cpp when ACE_NLOGGING is
+      enabled.<p>
+
+    <li><EM><B>Higher layer interdependencies</EM></B> -- We haven't
+    exhaustively tested all possible combinations of subsets.  It's possible
+      that there are interdependencies between some layers that
+      we haven't yet identified and removed.<p>
+
+    <li><EM><B>Remove reliance on multiple inheritance</EM></B> -- Multiple
+        inheriance is only used in a few
+      places in ACE.  This
+      isn't really a subsetting problem, but is necessary to
+      fully take advantage of optimizations available on C++ compilers for
+      embedded systems.<p>
+  </ul>
+
+We anticipate that these changes should reduce the default size of ACE
+by around 100-200 kbytes.<P>
+
+As the effort to reduce TAO's footprint continues, we are planning
+several modifications for TAO that should reduce the footprint for
+both the full CORBA and minimum CORBA configurations by around 300-400
+Kbytes.  The list below contains an estimate of the impact of each one
+of these changes, along with the estimated effort to implement them.
+</P>
+
+<P>
+  <TABLE CELLPADDING=4 BORDER=4>
+    <TR>
+      <TD>Component</TD><TD>Impact</TD><TD>Effort</TD>
+      <TD>Description</TD>
+    </TR>
+    <TR>
+      <TD>TAO</TD><TD>~95 Kb</TD><TD>2 weeks</TD>
+        <TD>
+	Make RT CORBA 1.0 support optional, thereby allowing  CORBA-compliant
+	applications to link without incurring the overhead of TAO's
+        RT CORBA features.
+        </TD>
+    </TR>
+    <TR>
+      <TD>TAO</TD><TD>~50 kB</TD><TD>3 weeks</TD>
+        <TD>
+	Make the CORBA Messaging components optional.
+	This change requires making RT-CORBA optional first.
+        </TD>
+    </TR>
+    <TR>
+      <TD>ACE</TD><TD>14 Kb</TD><TD>4 weeks</TD>
+        <TD>
+	Implement a TAO-specific Reactor.
+	ACE's reactor supports a number of features that TAO does not
+	require.  Thus, a TAO-specific implementation is an important way to
+	reduce the footprint.
+        </TD>
+    </TR>
+    <TR>
+      <TD>ACE</TD><TD>20 Kb</TD><TD>4 weeks</TD>
+        <TD>
+	Implement a TAO-specific Service Configurator.
+	TAO uses the ACE Service Configurator to dynamically configure
+	its strategies.  In many embedded applications the set of
+	strategies are selected at design-time, on those platforms it
+	would be appropriate to disable all the features to
+	dynamically load components into the ORB.
+        </TD>
+    </TR>
+    <TR>
+      <TD>TAO</TD><TD>10-15 Kb</TD><TD>1-2 weeks</TD>
+        <TD>
+	Eliminate duplicate code due to instantiations of string ->
+	pointer maps.  TAO uses several such maps, they could be replaced by a
+	generic version, wrapped with a fully inlined (i.e. zero
+	footprint) adapter for type-safety.
+        </TD>
+    </TR>
+    <TR>
+      <TD>TAO</TD><TD>3-10 Kb</TD><TD>1-2 weeks</TD>
+        <TD>
+	Make message buffering strategies optional.
+	TAO supports policy extensions to control the outgoing oneway and AMI
+	request buffers.  Those policies are not used by all
+	applications.
+        </TD>
+    </TR>
+    <TR>
+      <TD>TAO</TD><TD>10 Kb</TD><TD>2 weeks</TD>
+        <TD>
+	Make support for multiple ORBs optional.
+	TAO can support multiple ORBs in the same process, but most
+	applications only require one.
+        </TD>
+    </TR>
+    <TR>
+      <TD>TAO</TD><TD>&lt;20 Kb</TD><TD>1 weeks</TD>
+        <TD>
+	Use lower footprint alternatives to the
+	<CODE>ACE_Strategy_Acceptor</CODE> and
+	<CODE>ACE_Strategy_Connector</CODE> classes.
+	TAO is using the most flexible classes in ACE to implement
+	acceptors and connector, but does not take advantage of this
+	flexibility.
+        </TD>
+    </TR>
+    <TR>
+      <TD>TAO</TD><TD>5 Kb</TD><TD>1 week</TD>
+        <TD>
+	Move the less common transport muxing and reply waiting
+	strategies to an optional library.
+        </TD>
+    </TR>
+    <TR>
+      <TD>ACE+TAO</TD><TD>30 Kb</TD><TD>8 weeks</TD>
+        <TD>
+	Decouple ACE (and then TAO) from the
+	<CODE>ACE_Thread_Manager</CODE> component.
+	This component is only used in the thread-per-connection
+	model, if we could decouple it in ACE then TAO could be
+	modified to only link this component when that concurrency
+	model is enabled.
+        </TD>
+    </TR>
+    <TR>
+      <TD>TAO</TD><TD>&gt;50 Kb</TD><TD>6 weeks</TD>
+        <TD>
+	Move <CODE>&lt;&lt;=</CODE> and <CODE>&gt;&gt;=</CODE>
+	operators to separate files.
+	Currently TAO includes nearly 500 such operators, moving them
+	to separate files (grouped by component?) would eliminate them
+	from most applications.
+        </TD>
+    </TR>
+  </TABLE>
+</P>
+
+<P>In parallel with the activities described above we are pursuing
+other avenues of research to find sources of rarely used or unused
+code in ACE+TAO, and to modify the software to eliminate such code.
+These activities include the following:</P>
+
+<UL>
+  <LI><P>
+  Using profiling tools, such as gprof, Quantify and True Coverage
+  to find unreachable code, or code only reachable in certain
+  applications.
+  </P></LI>
+  <LI><P>
+  The code TAO's IDL compiler generates for <CODE>CORBA::Any</CODE>
+  operators is large, so we are evaluating designs that reduce the impact of the <CODE>CORBA::Any</CODE>
+  type support.  TAO's IDL compiler already makes that support optional.
+  However, for applications that require <CODE>Anys</CODE> it may be useful to separate that code
+  in another file to reduce the size of generated stubs and skeletons,
+  without losing the opportunity to use more dynamic CORBA invocation
+  modes.
+  </P></LI>
+  <LI><P>
+  The Notification Service currently depends on the Trading service to
+  implement the Trader Constraint Language.  We are planning to break that
+  dependency and factor the TCL parser into a smaller library shared
+  by both services.
+  </P></LI>
+  <LI><P>
+  TAO still contains features that are rarely or never used.
+  Examples include the interfaces to query the well-known services and
+  to dynamically discover the level of security support.  Those
+  components should only be linked (dynamically) in applications that require them.
+  </P></LI>
+  <LI><P>
+  The support for interceptors currently generated by the IDL compiler
+  can be partially refactored into common ORB code.
+  Moreover, we evaluating a new implementation of interceptors
+  that can be configured dynamically, thereby eliminating the need for
+  compile-time configuration flags.
+  </P></LI>
+  <LI><P>
+  We are planning to provide compile-time flags to eliminate certain mandatory features
+  in CORBA that are not used in all applications, such as IOR
+  parsers (corbaloc, corbaname, etc.).
+  </P></LI>
+  <LI><P>
+  Finally, we will perfom more code inspections to determine if template code can be
+  refactored into base classes and thereby shared by many objects in
+  the ACE+TAO implementations.
+  </P></LI>
+</UL>
+
+Although we do not yet have sufficient insights to know how much
+footprint reduction these activities will afford, we anticipate these
+enhancements could reduce the default footprint of TAO by another
+100-200 Kbytes.
+
+</body>
+</html>
diff --git a/examples/Synch/proc_sema.cpp b/examples/Synch/proc_sema.cpp
index 03c5130d163..a0a15099b3c 100644
--- a/examples/Synch/proc_sema.cpp
+++ b/examples/Synch/proc_sema.cpp
@@ -41,10 +41,9 @@ int consumer (ACE_SYNCH_PROCESS_SEMAPHORE &sema,
   return 0;
 }
 
-
 int main (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, "csn:xi:d:");
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("csn:xi:d:"));
 
   int is_consumer = 1;          // By default, make us a consumer.
   int delete_sema = 0;
diff --git a/tests/Aio_Platform_Test.cpp b/tests/Aio_Platform_Test.cpp
index 1add359f631..a8eb439f22f 100644
--- a/tests/Aio_Platform_Test.cpp
+++ b/tests/Aio_Platform_Test.cpp
@@ -166,7 +166,7 @@ have_asynchio (void)
 int
 main (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST ("Aio_Platform_Test");
+  ACE_START_TEST (ACE_TEXT ("Aio_Platform_Test"));
   
   // Test the #defined and constants and runtime values.
   errno = 0;
author	schmidt <douglascraigschmidt@users.noreply.github.com>	2001-11-21 17:12:48 +0000
committer	schmidt <douglascraigschmidt@users.noreply.github.com>	2001-11-21 17:12:48 +0000
commit	d56c392e9961ffbf780734f0463e47efb9867128 (patch)
tree	fc589713f841ba3b2af74905f14377d532d7e784
parent	a941f971a10798b86905a040ffc48e466b01c724 (diff)
download	ATCD-d56c392e9961ffbf780734f0463e47efb9867128.tar.gz