This commit was manufactured by cvs2svn to create tagami_phase4_end

'ami_phase4_end'.

992 files changed, 20147 insertions, 124595 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index edcb2281150..114ac1f36d2 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -237,17 +237,6 @@ make: *** [libACE.so] Error 8
       install patched versions of the C++ libraries, which correctly
       define this symbol.<p>
 
-      To build ACE on AIX with Visual Age C++, use the
-      $ACE_ROOT/ace/ace-dll.icc (or ace-lib.icc) along with the appropriate
-      version-specific config file (e.g. config-aix-4.3.x.h). All of the
-      version-specific config files set the version number macros and
-      include the general config-aix-4.x.h file which has support for all
-      of the OS versions and compilers supported on AIX. Using the general
-      config file is the recommended practice for egcs, C Set++, and IBM
-      C/C++ compilers. However, the Visual Age C++ compiler does not make
-      use of the platform_macros.GNU file, which is how the OS version
-      information generally gets set.<p>
-
       BTW, here's a technique from Rob Jordan &lt<A
       HREF="mailto:jordan@hursley.ibm.com">jordan@hursley.ibm.com</A>&gt
       that can reduce the size of the ACE libraries by about one
@@ -283,11 +272,7 @@ make: *** [libACE.so] Error 8
       1999 (R5), with glibc 2.1.1.<p>
 
       If you run out of memory, it's easy to add virtual memory on
-      Linux.  Please see the <code>mkswap</code> man page.  You'll
-      need around 256 to 300 Mb of virtual memory (RAM + swap) to
-      compile all of ACE+TAO.  The <a href="#resource_requirements">System
-      Resource Requirements section</a> has some suggestions on how
-      to reduce the memory requirement.<p>
+      Linux.  Please see the <code>mkswap</code> man page.<p>
 
       The glibc 2.0 dynamic loader isn't thread safe. If you want to
       use the Invocation API you'll have to set
@@ -397,15 +382,6 @@ make: *** [libACE.so] Error 8
       of CXX 6.1, notably versions -021 and earlier.  It's best to use
       V6.1-022 or later.<p>
 
-      NOTE: if you use Digital UNIX 4.0f or later, you <strong>must</strong>
-      use <code>ace/config-tru64.h</code> instead of
-      <code>ace/config-osf1-4.0.h</code>.  <code>ace/config-tru64.h</code>
-      can be used for all supported compilers on any version of
-      Digital UNIX after and include 4.0.  And, with 4.0f and later when
-      using Digital CXX, you <strong>must</strong> use
-      <code>include/makeinclude/platform_tru64_cxx.GNU</code> instead of
-      <code>include/makeinclude/platform_osf1_4.0.GNU</code>.
-
       GNU gcc 2.7.2.1 compiles without problems. All tests run
       (besides minor problems).  Thanks to Thilo Kielmann &lt<A
       HREF="mailto:kielmann@informatik.uni-siegen.de">kielmann@informatik.uni-siegen.de</A>&gt
@@ -510,6 +486,14 @@ make: *** [libACE.so] Error 8
       provided <a href="os-patches/vxworks-5.1.txt">notes for using
       ACE with VxWorks 5.1.</a><P>
 
+      Please note that ACE and TAO build with Tornado II.  The version
+      of egcs that is provided with Tornado II produces some spurious
+      warnings about uninitialized variables (including "this" :-).
+      This was a problem in older versions of egcs, but has since been
+      fixed.  If you'd like to disable the warnings, you can add
+      <code>-Wno-uninitialized</code> to your <code>CCFLAGS</code> in
+      <code>$ACE_ROOT/include/makeinclude/platform_macros.GNU</code><p>
+
       Tornado II/VxWorks 5.4 support IP multicast.  That is not enabled
       by default in ACE for VxWorks, because it probably depends on
       kernel configuration.  To enable it, add
@@ -753,7 +737,7 @@ If you use the GNU GCC g++ compiler please note the following:
       for reporting the problem with ACE_Singleton on g++, and for
       helping to find and implement these solutions.<P>
 
-  <LI>On VxWorks only, g++ (thru version 2.7.2, distributed
+  <LI>On VxWorks only, g++ (thru version 2.7.2, at least, distributed
       with Tornado 1.0.1/VxWorks 5.3.1), -fno-implicit-templates is
       broken.  In addition, -O2 is not supported on some targets.<P>
 </UL>
@@ -880,7 +864,7 @@ need to do:<P>
       contains the compiler and Makefile directives that are
       platform/compiler-specific<P>
 
-  <LI>Note that because ACE builds shared libraries, you'll need to set
+  <LI>Note that since ACE builds shared libraries, you'll need to set
       LD_LIBRARY_PATH to whereever you put the binary version of the
       ACE library.  For example, you probably want to do something
       like the following<P>
@@ -933,9 +917,11 @@ IBM's VisualAge C++ compiler (*.icc).  There are also Makefile.bor
 files to compile ACE, the ACE one-button tests, and TAO with Borland
 C++ Builder 4.0. <P>
 
-The Borland C++ Builder 4.0 port has been done by <A
-HREF="mailto:jody@atdesk.com">Jody Hagins</A>, so contact him for any
-questions.<P>
+The port of ACE and TAO to the VisualAge C++ compiler has been done by
+<A HREF="mailto:matteau@ca.ibm.com">Rene Matteau</A>, whom you should
+contact if you have any problems.  Likewise, the Borland C++ Builder
+4.0 port has been done by <A HREF="mailto:jody@atdesk.com">Jody
+Hagins</A>, so contact him for any questions.<P>
 
 <EM>Note concerning MSVC 5.0 and Service Pack 3:</EM> There has been
 confusion regarding MSVC 5 and its Service Pack 3.  Some ACE users
@@ -1141,7 +1127,7 @@ easiest way to fix it is as above, recreate it.</P>
 For the most part, you should be able to follow the instructions above
 to build ACE and applications that use it.  Start with the
 <a href="#unix">Unix instructions</a> above to build ACE and the
-applications that use it.  Please see below for more information on
+applications that use it.  Please see below for mroe information on
 <a href="#VxWorks/NT">building ACE on NT hosts for VxWorks targets</a>.<P>
 
 A few notes on VxWorks builds (thanks to
@@ -1173,13 +1159,13 @@ are several ways to do this; please see the
 platform file for detailed information.<P>
 
 The VxWorks platform_vxworks*.GNU files are set up so that shared
-libraries are not built on VxWorks, by default.  Only static
-libraries, with .a extension, are built.  Therefore, it's not
-necessary to set the LD_LIBRARY_PATH environment variable on your host
-system when building for VxWorks targets.  Please note, however, if
-you use TAO on VxWorks that you will need to set your LD_LIBRARY_PATH
-to find the TAO IDL compiler libraries (installed in the ace
-directory) on the host.<P>
+libraries are not built on VxWorks.  Only static libraries,
+with .a extension, are built.  Therefore, it's not necessary
+to set the LD_LIBRARY_PATH environment variable on your host
+system when building for VxWorks targets.  Please note, however,
+if you use TAO on VxWorks that you will need to set your LD_LIBRARY_PATH
+to find the TAO IDL compiler libraries (installed in the ace directory)
+on the host.<P>
 
 With g++, $ACE_ROOT/bin/ace_ld is used to munch object files and
 libraries to set up calls to static constructors and destructors.
@@ -1230,6 +1216,10 @@ Please note that those VxWorks kernel configuration parameters
 are set in the VxWorks configAll.h file.  You must rebuild your
 VxWorks kernel after modifying that file.<p>
 
+It probably wouldn't take much effort to modify the
+ACE library to not require <code>INCLUDE_CPLUS_IOSTREAMS</code>,
+if necessary.<p>
+
 If you're first getting started with ACE and/or VxWorks, I recommend
 just building the ACE library and tests first.  (Some of the ACE
 examples, in System_V_IPC, don't build on VxWorks yet.)  Then try
@@ -1261,31 +1251,17 @@ spa ace_main, "arg1" [, ...]
 
 All arguments must be quoted, even numbers.<p>
 
-The ACE <a href="tests/">tests</a> write their output files in a
-directory named <code>log/</code>, below the current
-(<code>tests</code>) directory.  If you don't have NFS included in
-your VxWorks kernel, you can use these steps, provided by
-<a href="mailto:clarence_m_weaver@md.northgrum.com">Clarence M. Weaver</a>,
-to run the tests and capture their output:<p>
-<ol>
-  <li>What I did was create a log directory on the boot NT host of my vxworks
-    target.<p>
-  <li>I copied all the test applications and the run_tests.vxworks script to
-    the parent of the log directory.<p>
-  <li>Using the target shell not the host shell, I "cd" to the directory
-    containing the script and test programs.<p>
-  <li>Invoked the script &lt; run_tests.vxworks from this target shell.<p>
-</ol>
-
+By default, the ACE Makefiles link the ACE library into every
+executable.  If you want to run multiple ACE executables but just use
+a single ACE library, it should be possible, though I haven't tried
+it.  Just link the first executable to be loaded onto the target with
+the ACE library, as usual.  All other executables can be linked
+without the ACE library by added <code>ACELIB=</code> to the make
+invocation when building them.  When they are loaded onto the target,
+the should load against the symbols from the ACE library from the
+first executable that was loaded.<p>
 
 <h5><a name="VxWorks/SharedLibs">Building Shared Libraries for VxWorks</a>.</h5>
-
-<strong>NOTE</strong>: The ACE support for shared libraries is
-under development.  If you use any writeable global (static)
-data in a shared library, it probably won't work for you.  A
-fix is under development, and should be ready shortly after
-the release of ACE 5.0.<p>
-
 ACE now supports shared libraries for VxWorks, but only with the
 g++ compiler.  To build shared libraries instead of the default
 static libraries, added <code>shared_libs_only=1</code> to either
@@ -1322,7 +1298,6 @@ A few additional Windows Notes, from Paul von Behren:<p>
       ``generic'' Unix environment.  Using this library, they have ported a
       large collection of GNU tools to WinNT/95 - including a port of
       gcc/g++.  See <A href="http://www.cygnus.com/misc/gnu-win32/">http://www.cygnus.com/misc/gnu-win32/</A>
-      A related link is <a href="ftp://ftp.cygnus.com/pub/gnu-win32/latest/">ftp://ftp.cygnus.com/pub/gnu-win32/latest/</a>
       WindRiver provides a subset of these tools - including make
       and gcc cross-compilers.  (Note:  it appears that the make
       that is provided with Tornado 2.0 cannot be used to build ACE.
@@ -1352,7 +1327,12 @@ Using the Cygnus tools, this approach should work:
     <code>ACE_wrappers/include/makeinclude/platform_macros.GNU</code>
     as usual for VxWorks.  See
     <a href="include/makeinclude/platform_vxworks5.x_g++.GNU">the
-    g++/VxWorks platform file</a> for more information.<p>
+    g++/VxWorks platform file</a> for more information.  You may
+    also want to add this line, because there's no need to install
+    libraries in the VxWorks build:
+<pre>
+INSTALL=
+</pre><p>
   <li>Create an <code>ACE_wrappers/ace/config.h</code> file that looks
     something like the following.  tao_idl should be built to not support
     native exception handling, because that's not available on VxWorks.
@@ -1374,6 +1354,21 @@ And Chris Ryan's instructions for building for VxWorks targets
 on Windows NT hosts:
 
 <ol>
+  <li>Create UNIX-like environment in NT Command Prompt windows by
+      downloading GNU bash, perl, and so forth from your favorite ftp
+      site. I went to <a href="ftp://ftp.cygnus.com/pub/gnu-win32/latest/">ftp://ftp.cygnus.com/pub/gnu-win32/latest/</a>
+      and downloaded <code>cdk.exe</code> and installed that on my NT box.
+      I downloaded perl5.0 from where I can't remember.  There may have been
+      bits and pieces from other places for things like <code>vi</code> and
+      <code>less</code>.
+
+  <li>Download latest ACE.  Create 2 parallel trees, say
+      <code>/ace/ACE_wrappers.NT</code> and
+      <code>/ace/ACE_wrappers.vxworks</code>.  The NT tree is for building
+      <code>aced.dll</code> and <code>tao_idl.exe</code> as currently
+      documented for ACE/TAO on NT/VC++5.0. The VxWorks tree is the
+      cross compilation tree.
+
   <li>Path setting that seems to be working is:<p>
       <pre>
       /tornado/host/x86-win32/bin:
@@ -1421,20 +1416,42 @@ on Windows NT hosts:
       <code>cygwin.dll</code> is from the Cygnus GNU software download and install.
 
   <li>Basically, follow documented procedure for ACE build/install on UNIX
-      platform.  Create a <code>$ACE_ROOT/ace/config.h</code> that looks
-      like:<p>
+      platform. Create a <code>$ACE_ROOT/ace/config.h</code> that looks like:<p>
       <pre>
       #include "config-vxworks5.x.h"
       </pre>
 
-      And create a
-      <code>$ACE_ROOT/include/makeinclude/platform_macros.GNU</code>
+      And create a <code>$ACE_ROOT/include/makeinclude/platform_macros.GNU</code>
       that looks like:<p>
       <pre>
       WIND_BASE = /tornado
       WIND_HOST_TYPE = x86-win32
+      PATH += :$(WIND_BASE)/host/$(WIND_HOST_TYPE)/bin
       CPU = I80486
-      include $(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_g++.GNU
+      include $(ACE_ROOT)/include/makeinclude/platform_NTvxworks5.x_g++.GNU
+      </pre>
+
+      (But, I guess the PATH+= line is superfluous based on the PATH as shown
+      previously).
+
+      Finally, create a
+      <code>$ACE_ROOT/include/makeinclude/platform_NTvxworks5.x_g++.GNU</code>
+      with diff output from 'diff platform_vxworks5.x_g++.GNU
+      platform_NTvxworks5.x_g++.GNU' that looks like:
+
+      <pre>
+      58c58
+      &lt; HOST_DIR        = $(WIND_BASE)/host/sun4-solaris2
+      ---
+      &gt; HOST_DIR        = $(WIND_BASE)/host/x86-win32
+      62,63c62,63
+      &lt; CXX             = g++$(TOOLENV)
+      &lt; CFLAGS          += -DVXWORKS -D_REENTRANT -ansi -fno-builtin
+      -fno-defer-pop -fvolatile -nostdinc -nostdlib -pipe -Wall
+      ---
+      &gt; CXX             = $(CC)
+      &gt; CFLAGS          += -DVXWORKS -D_REENTRANT -ansi -fno-builtin -fno-defer-pop \
+      -fvolatile -nostdinc -nostdlib -Wall #-pipe
       </pre>
 
   <li>Now, follow the existing documentation for a UNIX platform build of ACE
@@ -1444,8 +1461,8 @@ on Windows NT hosts:
       </pre>
 
   <li>To build $ACE_ROOT/tests, I had to use the <code>make.exe</code> in the
-      <code>/gnuwin32/b18/H-i386-cygwin32/bin</code> directory as I couldn't
-      get make shipped with Tornado to run ace_ld and I couldn't figure out any
+      <code>/gnuwin32/b18/H-i386-cygwin32/bin</code> directory as I couldn't get
+      make shipped with Tornado to run ace_ld and I couldn't figure out any
       other work around.<p>
 
       <pre>
@@ -1461,17 +1478,21 @@ on Windows NT hosts:
   <li>Build ACE and TAO_IDL in the NT tree as already documented. As
       mentioned above, I put <code>aced.dll</code> in <code>/bin</code>.
 
-  <li>Build $TAO_ROOT/tao
+  <li>Copy TAO_IDL/tao_idl.exe to TAO_IDL directory in the ACE/TAO vxworks
+      source tree. (I didn't spend any time yet looking for the place where the
+      makefiles are using the absolute path to tao_idl.exe.)
+
+  <li>Build orbsvcs.
       <pre>
       CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.exe
-      cd $TAO_ROOT/tao
+      cd $TAO_ROOT/orbsvcs/orbsvcs
       /gnuwin32/b18/H-i386-cygwin32/bin/make
       </pre>
 
-  <li>Build orbsvcs.
+  <li>Build $TAO_ROOT/tao
       <pre>
       CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.exe
-      cd $TAO_ROOT/orbsvcs/orbsvcs
+      cd $TAO_ROOT/tao
       /gnuwin32/b18/H-i386-cygwin32/bin/make
       </pre>
 
@@ -1547,8 +1568,8 @@ in your PATH.<P>
 The amount of system resources required to build ACE and TAO varies
 greatly.  Platform, build options, and components built primarily
 influence the required system resources.  As a rough guide, the
-typical peak memory requirement could be well over 256 Mb (notably,
-for TAO's orbsvcs).  An <strong>entire</strong> build of ACE and TAO
+typical peak memory requirement could be about 256 Mb (notably, for
+TAO's orbsvcs).  An <strong>entire</strong> build of ACE and TAO
 can use well over 1300 Mb of disk space.  It's usually not necessary
 to build <strong>all</strong> of ACE and TAO, though.<p>
 
diff --git a/ASNMP/ChangeLog b/ASNMP/ChangeLog
index 61c2fe5c2dc..046975f76fc 100644
--- a/ASNMP/ChangeLog
+++ b/ASNMP/ChangeLog
@@ -1,24 +1,3 @@
-Wed Jul 14 08:26:42 1999  Brian Raven <brianr@liffe.com>
-
-        * asnmp/snmp.{h,cpp},wpdu.cpp:
-          SYNOPSIS:
-          1) The agent IP address in traps originating from logical
-             domains on an Enterprise 10000 is that of the physical domain.
-
-          2) The code that gets the IP address uses gethostbyname
-             which is unsafe in a MT environment (according to the man page).
-
-          DESCRIPTION:
-          1) The problem seems to be caused by hostname only returning
-             the physical domain name.
-
-          SAMPLE FIX/WORKAROUND:
-          1) To get around this problem I added the capability to
-             override the local host name.
-
-          2) I would suggest using the GenAddress class to obtain the
-             IP address.
-
 Tue Jun 22 13:34:54 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * agent/Makefile: replaced rm -f with $(RM).
diff --git a/ASNMP/asnmp/snmp.cpp b/ASNMP/asnmp/snmp.cpp
index f6ad69fb25a..f14d07bcccb 100644
--- a/ASNMP/asnmp/snmp.cpp
+++ b/ASNMP/asnmp/snmp.cpp
@@ -54,8 +54,6 @@ const authenticationFailureOid authenticationFailure;
 const egpNeighborLossOid egpNeighborLoss;
 const snmpTrapEnterpriseOid snmpTrapEnterprise;
 
-char Snmp::host_name_[MAXHOSTNAMELEN] = "";
-
 Snmp::Snmp(unsigned short port): result_(0), construct_status_(SNMP_CLASS_ERROR), last_transaction_status_(0)
 {
   ACE_TRACE("Snmp::Snmp");
@@ -248,36 +246,4 @@ int Snmp::trap( Pdu &pdu, UdpTarget &target)
   return -1;
 }
 
-// Allow host name to be overriden. Supplying a null pointer or zero
-// length string removes the override.
-void Snmp::override_host_name(const char* name)
-{
-        if (name)
-        {
-                ACE_OS::strncpy(host_name_, name, MAXHOSTNAMELEN);
-                host_name_[MAXHOSTNAMELEN-1] = 0;
-        }
-        else {
-                host_name_[0] = 0;
-        }
-}
-
-// Returns the current host name in the supplied string.
-void Snmp::get_host_name(char* name, int len)
-{
-        if (name)
-        {
-                if (ACE_OS::strlen(host_name_) > 0)
-                {
-                        ACE_OS::strncpy(name, host_name_, len);
-                        name[len-1] = 0;
-                }
-                else
-                {
-                        if (ACE_OS::hostname(name, len-1) == -1)
-                                name[0] = 0;
-                }
-        }
-}
-
 Snmp_Result::~Snmp_Result() {}
diff --git a/ASNMP/asnmp/snmp.h b/ASNMP/asnmp/snmp.h
index d57a9711324..65a7700721b 100644
--- a/ASNMP/asnmp/snmp.h
+++ b/ASNMP/asnmp/snmp.h
@@ -102,12 +102,6 @@ class ACE_Export Snmp : public transaction_result
     void result(transaction * t, int rc);
     // for async transaction results
 
-        static void override_host_name(const char* name);
-        // allow the host name to be overriden
-
-        static void get_host_name(char* name, int len);
-        // returns the overriden host name
-
  protected:
   void check_default_port(UdpTarget& target,unsigned short port=DEF_AGENT_PORT);
   int run_transaction(Pdu& pdu, UdpTarget& target);
@@ -127,8 +121,7 @@ class ACE_Export Snmp : public transaction_result
 
   unsigned req_id_;
   // transaction request id
-
-  static char host_name_[MAXHOSTNAMELEN];
 };
 
 #endif //SNMP_CLS_
+
diff --git a/ASNMP/asnmp/wpdu.cpp b/ASNMP/asnmp/wpdu.cpp
index 43c38d9a5e6..973d8fe430f 100644
--- a/ASNMP/asnmp/wpdu.cpp
+++ b/ASNMP/asnmp/wpdu.cpp
@@ -175,14 +175,11 @@ int wpdu::set_trap_info(snmp_pdu *raw_pdu, const Pdu& pdu) const
 
   // HDN - set agent addr using the local hostname if possible
   char localHostName[MAXHOSTNAMELEN];
-  Snmp::get_host_name(localHostName, MAXHOSTNAMELEN);
-  if (ACE_OS::strlen(localHostName) > 0) {
-    GenAddress addr(localHostName);
-    OctetStr octet;
-    addr.to_octet(octet);
-    ACE_OS::memcpy(&(raw_pdu->agent_addr.sin_addr),
-                   octet.data(),
-                   octet.length());
+  if (ACE_OS::hostname(localHostName, sizeof(localHostName)) != -1) {
+    struct hostent* hostInfo;
+    if ((hostInfo = ACE_OS::gethostbyname(localHostName))) {
+      ACE_OS::memcpy(&(raw_pdu->agent_addr.sin_addr), hostInfo->h_addr, hostInfo->h_length);
+    }
   }
 
   return 0;
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 8af6d177972..84f142b8627 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,1440 +1,7 @@
-Mon Jul 26 12:32:41 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.46 released.
-
-Fri Jul 23 18:20:11 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* ace/config-irix6.x-sgic++-nothreads.h:
-	  Enabled namespaces with MIPSPro 7.2 or higher.
-
-Fri Jul 23 16:40:15 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* ace/ACE.cpp:
-	  Fixed typos in error return values for ACE::execname()
-
-Fri Jul 23 14:51:48 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* examples/Service_Configurator/IPC-tests/Handle_L_CODgram,
-  	  examples/Service_Configurator/IPC-tests/Handle_L_Dgram,
-    	  examples/Service_Configurator/IPC-tests/Handle_L_Pipe:
-	  Cleaned this stuff up so that it builds correctly when
-	  ACE_LACKS_UNIX_DOMAIN_SOCKETS is enabled.  Thanks to
-	  David for reporting this.
-
-	* examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe:
-	  Made upper_case() a method in the Handle_L_Pipe class.
-
-	* examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp,
-	  examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp: 
-	  Removed the bizarre hacks for SunOS4.  This stuff probably
- 	  hasn't been tested since 1992!
-
-Fri Jul 23 14:16:22 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.i (ACE_OS::read): (only non-Win32), if call fails and
-          errno is EAGAIN, change it to EWOULDBLOCK. Improve portability for
-          platforms where EAGAIN and EWOULDBLOCK are different values and
-          both used, like HP-UX.
-
-        * ace/Malloc_T.cpp (ACE_Malloc<> ctor): Added missing newline in error
-          message.
-
-Fri Jul 23 12:09:18 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-	* ace/OS.i: Fixed some mismatched ifdef/endif comments.
-
-	* ace/ACE.cpp (execname): Fixed some misuses of ACE_HAS_WIN32
-	  macros where they should have been ACE_WIN32.  Thanks to Andy
-	  for noticing this.
-
-Fri Jul 23 11:28:17 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* ace/Memory_Pool.cpp (init_acquire): shmat() returns -1 on
-	  failure, not 0.  Thanks to Kevin Liu
- 	  <kliu@fitch.math.uwaterloo.ca> for reporting this.
-
-Fri Jul 23 11:35:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Connection/non_blocking/tests_lsock_{acceptor,
-          connector.cpp}: disabled if ACE_LACKS_UNIX_DOMAIN_SOCKETS.
-          Thanks to Alain Magloire <alain@qnx.com> for reporting this.
-
-        * examples/Connection/non_blocking/Makefile: removed unneeded
-          LIBS (=$(ACELIB)) and BUILD macro definitions.
-
-Fri Jul 23 10:07:05 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_qnx_neutrino.GNU: added
-          CROSS-COMPILE macro definition.  Thanks to
-          Alain Magloire <alain@qnx.com> for reporting this.
-
-Fri Jul 23 08:58:56 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Service_Config.h: Clarified the fact that the
-          ACE_Service_Config uses the Monostate pattern, so there can only
-          be one of them per-process.  Thanks to Ralf Kluthe
-          <kluthe@iti.mu-luebeck.de> for reporting this.
-
-Fri Jul 23 07:49:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU: added
-          comment about options for producing 64-bit binaries.
-          Thanks to Jeff Franks <Jeffrey_Franks@i-o.com> for
-          raising this issue.
-
-Fri Jul 23 03:10:31 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Strategies_T.cpp (find_or_create_svc_handler_i):
-        * ace/Cached_Connect_Strategy_T.cpp (cached_connect):
-
-          I had added the new_connection() method that lets go of the lock
-          for the duration of the connect(), but forgot to use it in the
-          above functions ;)  It should be fine now.
-
-        * tests/Cached_Conn_Test.cpp (cached_connect):
-        * tests/Cached_Accept_Conn_Test.cpp (cached_connect):
-
-          Host of the remote address should be ACE_LOCALHOST instead of
-          ACE_DEFAULT_SERVER_HOST.
-
-Thu Jul 22 23:23:26 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Handle_Gobbler.h (class ACE_Handle_Gobbler): Inlined
-          declaration of the functions.
-
-Thu Jul 22 20:03:54 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Acceptor.cpp: For sanity's sake, initialize all the data
-          members to 0 in the ACE_Strategy_Acceptor constructor.  Thanks
-          to Jody Hagins <jody@atdesk.com> for reporting this.
-
-        * ace/Acceptor.cpp: The service_port_ data member in the
-          ACE_Strategy_Acceptor wasn't being initialized to 0.  Thanks to
-          Jody Hagins <jody@atdesk.com> for reporting this.
-
-        * ace/Acceptor.cpp: Modified the dump() and info() methods so that
-          don't do bad things if service_name_ and service_description_
-          are NULL.  Thanks to Jody Hagins <jody@atdesk.com> for this
-          suggestion.
-
-        * ace/Message_Queue_T.h: Clarified what the errnos get set to when
-          timeouts occur or queues are deactivated.  Thanks to
-          John Forest <forestj@res.raytheon.com> for suggesting this.
-
-Thu Jul 22 16:55:14 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Stats.cpp:
-          Fixed message that had a %s but no argument!
-
-Thu Jul 22 15:12:18 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Codeset_IBM1047.{h,cpp}: wrapped with #ifdef ACE_MVS
-          so that the code doesn't occupy any space on platforms
-          other than MVS.
-
-Thu Jul 22 14:22:41 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Shared_Malloc/Malloc.cpp: fixed explicit
-          template instantiations so that there are no duplications
-          with ACE_LACKS_SBRK and ACE_LACKS_SYSV_SHMEM.
-
-Thu Jul 22 12:17:26 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-lynxos.h: removed ACE_LACKS_FORK on PowerPC.
-          All of the ACE tests that fork now succeed.
-
-Thu Jul 22 11:54:58 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/SV_Shared_Memory_Test.cpp (child): added a one
-          second sleep to give the parent a chance to create the
-          semaphore.  This allows the test to succeed on LynxOS/PPC
-          (with fork ()).
-
-        * tests/Process_Mutex_Test.cpp,Process_Strategy_Test.cpp (main):
-          added a one second sleep after spawning each server, to give it
-          a chance to start.  Also, wrapped some string literals with
-          ASYS_TEXT.  Again, success on LynxOS/PPC with fork ().
-
-Thu Jul 22 10:42:06 1999  Clarence M. Weaver  <clarence_m_weaver@md.northgrum.com>
-
-        * ACE-INSTALL.html: added steps for running the ACE tests
-          on VxWorks platforms that lack NFS.
-
-Thu Jul 22 10:25:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Log_Record.cpp,SString.cpp: wrapped #include of
-          ace/streams.h with #ifndef ACE_LACKS_IOSTREAMS_TOTALLY.
-          [Bug 84]
-
-Thu Jul 22 09:55:10 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: updated commit message guideline
-          to show ChangeLogTag example.
-
-Thu Jul 22 02:15:46 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Handle_Gobbler (class ACE_Handle_Gobbler): New class that
-          gobbles up handles :) This class is useful when we need to
-          control the number of handles available for a process.  Mostly
-          used for testing purposes.
-
-          Note that even though the new files are in the ace directory,
-          they are not part of the ace library.  The files only contain
-          inline functions and Handle_Gobbler.h is only included where
-          needed.
-
-        * tests/Cached_Conn_Test.cpp:
-        * tests/Cached_Accept_Conn_Test.cpp:
-
-          Added Handle_Gobbler to the test to reduce the iterations
-          required before handles run out and purging starts.
-
-Wed Jul 21 21:45:22 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Reactor.cpp: Applied ACE_NOTREACHED to several
-          run_*_event_loop methods.
-
-        * docs/ACE-guidelines.html: Updated ASYS_TEXT usage.
-
-        * ace/RB_Tree.cpp:
-        * tests/Cache_Map_Manager_Test.cpp: Applied ASYS_TEXT liberally.
-
-Wed Jul 21 21:19:36 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: added note about ACE support for
-          shared libraries on VxWorks.  It's still under
-          development.
-
-Wed Jul 21 18:38:00 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Strategies_T.h (ACE_Cached_Connect_Strategy): Renamed
-          <connection_cache_> to <connection_map_>.
-
-        * ace/Hash_Cache_Map_Manager_T.cpp (find): Finding and updating
-          the attributes is faster through the find() that uses an entry.
-          Therefore, for find (key, value) and find (key) we go to
-          find (key, entry) instead of going to the base class.
-
-        * ace/Cached_Connect_Strategy_T.cpp:
-
-          - ACE_Cached_Connect_Strategy_Ex::check_hint_i
-          - ACE_Cached_Connect_Strategy_Ex::find
-
-          Update the caching attributes directly since we don't do a
-          find() on the cache map.
-
-Wed Jul 21 15:54:25 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/DLL.cpp: ACE_HAS_MOSTLY_UNICODE_APIS fixes.
-
-        * ace/OS.i (ctime):
-        * ace/OS.cpp (ctime): One copy should only be available when
-          ACE_HAS_MOSTLY_UNICODE_APIS is defined.  Thanks to Steve for
-          reporting this.
-
-Wed Jul 21 15:21:32 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Env_Value_Test.cpp (main): use the single-process
-          version if ACE_LACKS_FORK, in addition to if
-          ACE_HAS_NONSTATIC_OBJECT_MANAGER.
-
-        * tests/Time_Service_Test.cpp (main): neuter if ACE_LACKS_FORK,
-          because the test uses ACE_Process::spawn ().
-
-          Thanks to Riaz Syed <syed@Lynx.COM> for reporting these.
-
-Wed Jul 21 11:48:53 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU:
-          use full path to $(CC) in egcs version check, to avoid
-          warning if it is not on the user's PATH.
-
-Wed Jul 21 11:44:19 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.h:
-          Simplified the definition of the ACE_THR_PRI_*_DEF macros from
-          (MIN+(MAX-MIN)/2) to ((MIN+MAX)/2), the new definition is not
-          only easier to read, makes less operations (and function calls)
-          but it is also safer when the the priorities are "backwards" and
-          PRI_MAX < PRI_MIN
-
-Wed Jul 21 11:40:31 1999  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_aix4_cset++.GNU:
-        * include/makeinclude/platform_hpux_aCC.GNU: Replaced lines like
-          "debug=1" with ifeq (,$(debug)) debug=1 endif.
-
-        * include/makeinclude/platform_aix4_g++.GNU:
-          Above change for variables, also added -Wl,-bbigtoc when linking
-          TAO_IDL, else it runs out of toc space. Don't do it for all links
-          because bigtoc introduces a run-time performance penalty.
-
-Wed Jul 21 10:25:07 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.{h,cpp} (tss_base,tss_open): with TSS emulation,
-          no longer return indication of whether tss_base allocated
-          the ts_storage array.  Instead, added an (optional)
-          argument that tss_open can use for that purpose.  This
-          allows threads that haven't been spawned by ACE to use
-          ACE's TSS emulation.  Thanks to David Hauck
-          <davidh@realtimeint.com> for reporting this and testing
-          the fix on NT.  And, thanks to Terry Rosenbaum
-          <Terry.Rosenbaum@Radiology.MSU.edu> for originally reporting it.
-
-Wed Jul 21 09:34:09 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Shared_Malloc/test_position_independent_malloc.cpp (main):
-          removed declarations of unused argc and argv.
-
-Wed Jul 21 04:32:20 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Reactor.cpp:
-        * ace/Reactor.h:
-        * ace/Reactor.i:
-        * ace/Reactor_Impl.h:
-        * ace/Select_Reactor_T.cpp:
-        * ace/Select_Reactor_T.h:
-        * ace/Select_Reactor_T.i:
-        * ace/TP_Reactor.cpp:
-        * ace/WFMO_Reactor.cpp:
-        * ace/WFMO_Reactor.h:
-        * ace/WFMO_Reactor.i: The change was motivated by removing a race
-          condition in TP_Reactor during shutdown.  There was a small time
-          gap between a thread running TP_Reactor event loop checking its
-          end_event_loop flag to the thread actually grabing the token in
-          TP_Reactor.  Since the token return to its "normal" state after
-          broadcasting, this thread has no chance to notice that the
-          reactor has already been shutdowned and thus a deadlock occured.
-          In order to fix the problem, we must keep a state indicating
-          whether the reactor has been shutdowned or not in the reactor.
-
-          An added benefit of adding this state is that every reactor now
-          has its own run_reactor_event_loop which mimic the behavior of
-          the static ACE_Reactor::run_event_loop but instead of working on
-          the singleton reactor, the added function work on an instance of
-          reactor object.  In fact, all event_loop control functions have
-          been added.  They are named *_reactor_event_loop to
-          differentiate their behavior.   These newly added function use
-          the added state in the reactor to control the looping of event
-          handling.  All run_reactor_event_loop methods take an extra
-          argument of a function pointer.  The function will be called in
-          every iteration if it is set.
-
-          Notice that the singleton event loop control functions are still
-          available.  Although these function merely forward the call to
-          the singleton reactor's *_reactor_event_loop functions, you can
-          still use them to control the "main" event loop.  In fact, it is
-          required that you use these functions to run the main event loop
-          because it facilitates Service_Configurator's "reconfigure"
-          feature.
-
-          All reactors now also have two extra functions namely
-          "deactivated" which is used to query whether the reactor will
-          handle more incoming event or not, and "deactivate" which is
-          used to control this new feature.
-
-          An side effect of the change is that, once a reactor get
-          deactivated, calls to handle_events will return -1 immediately.
-          You can use the "deactivated" method to check if there's
-          actually an error in the handle_events method or it simply
-          returned because the reactor has been deactivated.  This is also
-          how the various "run_reactor_event_loop" handle the situation.
-          Notice that this should not cause any backward compatibility
-          problem becuase if a user is using his own end_event_loop flag,
-          he will not (and should not) invoke any more handle_events after
-          the flag has been set.  Also, if he is using the global
-          run_event_loop methods (for controling singleton reactor,) they
-          should still behave the same.
-
-          To summarize the change:
-
-          1. The run_event_loop control logic has been "pushed" down into
-          each individual reactor.  The methods supporting the logic are
-          defined in ACE_Reactor and are:
-
-             run_reactor_event_loop ()
-             run_alertable_reactor_event_loop ()
-             end_reactor_event_loop ()
-             reactor_event_loop_done ()
-             reset_reactor_event_loop ()
-
-          2. The origianl run_event_loop methods in ACE_Reactor are still
-          working but they now use the run_reactor_event_loop methods in
-          the implementation of the reactor.
-
-          3. Reactors now keep a state to indicate handle_events should be
-          called or not.  They can be controlled thru:
-
-             deactivated ()
-             deactivate ()
-
-          methods.
-
-Tue Jul 20 21:31:50 1999  Jim Rogers  jrogers@viasoft.com
-
-        * ace/config-mvs.h: added ACE_HAS_EXCEPTIONS.
-
-Tue Jul 20 21:23:19 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.* (next_key,total_keys):  with TSS_EMULATION,
-          added guard (using preallocated ACE_TSS_KEY_LOCK)
-          to access of next_key_.  Uninlined both of these
-          functions because they now have the guards.  Thanks
-          to Jake Hamby <jehamby@anobject.com> for reporting this.
-
-Tue Jul 20 21:11:02 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU:
-          fixed test of g++ for whether it's egcs.  Thanks to
-          Erik Johannes <ejohannes@oresis.com> for reporting this.
-          (The symptom was that TAO's IORManipulation.cpp wouldn't
-          compile due to an internal compiler error.  Adding
-          -fno-exceptions works around that.)
-
-Tue Jul 20 18:30:22 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Cached_Connect_Strategy_T.h:  All functions in
-          ACE_Cached_Connect_Strategy_Ex and ACE_Cached_Connect_Strategy
-          that contain specific information about the map used by the
-          class should not be virtual.
-
-        * ace/Future_Set.cpp (next_readable): Removed extra code that was
-          left behind from a debugging stage.  Thanks to author John
-          Tucker <jtucker@infoglide.com> for helping with this.
-
-Tue Jul 20 12:02:47 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Threads/task_five.cpp (main): removed
-          ACE_NOTREACHED wrapper around the final return statement.
-          It's reachable now.
-
-Tue Jul 20 11:46:09 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * examples/Shared_Malloc/test_position_independent_malloc.cpp:
-          Completely #ifdef'd this example out until we get it working.
-          Thanks to David Levine for reporting this.
-
-Tue Jul 20 11:15:23 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: updated memory requirements discussions.
-
-Tue Jul 20 09:43:36 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Future_Set.cpp (next_readable):
-
-          Fixed unused variable warnings.
-
-Tue Jul 20 09:33:02 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.{h,i} (sigwait): only use the DIGITAL_UNIX sigwait
-          massaging with cxx, not with any other compiler.  Thanks to
-          Doug Anderson <dla@home.com> for suggesting this, because
-          egcs issued warnings with it.
-
-Tue Jul 20 07:06:28 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_osf1_4.0.GNU:
-          removed -ptr ptrepository.  Let the compiler use its
-          default template repository.
-
-        * include/makeinclude/rules.local.GNU (realclean): added
-          cxx_repository, for DU cxx.
-
-Tue Jul 20 07:01:57 1999  Doug Anderson  <doug@clark.net>
-
-        * ace/OS.i (sigwait,thr_sigsetmask): added support for
-          Cray UNICOS 9.
-
-Mon Jul 19 22:46:54 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Strategies_T.cpp
-          (ACE_Cached_Connect_Strategy::new_connection):: We use a reverse
-          lock to let go of the lock for the duration of the actual
-          connect.  This will allow other threads to hack on the
-          connection cache while this thread creates the new connection.
-          Thanks to James Whitledge <jwhitledge@spyglass.com> for
-          suggesting this.
-
-        * tests/Cached_Accept_Conn_Test.cpp
-        * tests/Cached_Conn_Test.cpp
-        * tests/Conn_Test.cpp
-
-          Added reverse lock template instantiations.
-
-        * ace/Synch_T: Since the reverse lock constructor that created the
-          regular lock was removed, there was no need for the
-          <delete_lock_> variable, and <lock_> could be changed into a
-          reference (instead of pointer).
-
-Mon Jul 19 23:04:15 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * netsvcs/lib/Logging_Strategy.cpp (init): The ACE_LOG_MSG->open()
-          call at the end of the ACE_Logging_Strategy::init() method
-          *must* specify the flags and logger key or an application will
-          not connect to the client logger daemon automatically when the
-          ACE_Log_Msg::LOGGER flag is set in a svc.conf file.  Thanks to
-          Jerry De Master <jdemaste@ipdinc.com> for reporting this.
-
-Mon Jul 19 22:11:13 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: cleaned up instructions for building
-          on NT for VxWorks target.  Thanks to Stephane Chatre
-          <schatre@oresis.com> for reporting that the instructions
-          were out of date.
-
-Mon Jul 19 21:38:16 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/run_tests.vxworks:
-          Re-enable the Cached_Conn_Test and Cached_Accept_Conn_Test, it
-          works on Linux, NT, Solaris, IRIX and HP-UX so we should be
-          pretty close. Thanks to Irfan for fixing the problems with this
-          test.
-
-Mon Jul 19 21:26:57 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.{h,i}: reverted sigwait () changes on Digital
-          Unix.  They cause examples/Threads/process_manager.cpp
-          to not compile on DU 5.0 with cxx 6.2-021.  See
-          Mon Jul 19 21:13:16 1999  Doug Anderson  <doug@clark.net>.
-
-Mon Jul 19 21:13:16 1999  Doug Anderson  <doug@clark.net>
-
-        * ace/ACE.cpp,ace/Basic_Types.h,ace/CDR_Stream.{h,cpp},
-          ace/SOCK_Dgram_Bcast.cpp,ace/config-cray.h,
-          tests/Basic_Types_Test.cpp,tests/Handle_Set_Test.cpp,
-          include/makeinclude/platform_cray.GNU
-
-          I finally managed to get the latest and greatest to work on
-          the Cray.  Still no CDR support, but that will be post 5.0.
-
-        * ace/OS.{h,i}: added support for egcs on Digital Unix (4.0d & e).
-          Fixe problem with legacy workarounds in OS.* for sigwait() and
-          cxx/GNU that don't appear to be necessary on 4.0d/e/f with
-          neither cxx nor GNU.
-
-        * include/makeinclude/platform_tru64_g++.GNU: added.  Works
-          with ace/config-tru64.h.
-
-Mon Jul 19 19:46:50 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/OS.h: Added ACE_*_cast_*_ptr and ACE_*_cast_*_ref for const,
-          static, and reinterpret casts.
-
-        * ace/Strategies_T.cpp (find):
-        * ace/Cached_Connect_Strategy_T.cpp (find):
-
-          The comparison should be between ACE_PEER_CONNECTOR_ADDR and not
-          REFCOUNTED_HASH_RECYCLABLE_ADDRESS.
-
-        * ace/Svc_Handler: Changed <state> to <recycle_state>.  <state>
-          was too generic and in some cases a <state> method was already
-          present in classes deriving from Svc_Handler.
-
-          Also, added a <recycle_state> accessor.
-
-          The following files were effected:
-
-          - ace/Cached_Connect_Strategy_T.cpp
-          - ace/Cached_Connect_Strategy_T.h
-          - ace/Caching_Utility_T.cpp
-          - ace/Strategies.h
-          - ace/Strategies.i
-          - ace/Strategies_T.cpp
-          - ace/Strategies_T.h
-          - ace/Strategies_T.i
-          - tests/Cached_Accept_Conn_Test.cpp
-          - tests/Cached_Conn_Test.cpp
-
-Mon Jul 19 20:08:15 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Strategies_T.cpp:
-          Fixed lookup of connections in the Cached_Connect_Strategy,
-          thanks to Irfan for providing this fix.
-
-Mon Jul 19 12:26:20 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU,
-          ace/config-g++-common.h:
-          don't #define ACE_HAS_GNUG_PRE_2_8 with Tornado II's
-          g++.  It's egcs, though it's version identifier says
-          it's 2.7.  Thanks to Thomas Lockhart
-          <Thomas.G.Lockhart@jpl.nasa.gov> for reporting this. [Bug 80]
-
-Mon Jul 19 09:50:31 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/Future.cpp: Added ACE_TYPENAME to template-qualified types.
-        * ace/Future.cpp: Added #include "ace/Containers.h" to be sure the
-          types necessary for this class is available at template link
-          time.
-
-        * apps/gperf/src/Options.h: If on PharLap ETS, clear out its definition
-          of EOS to avoid compile errors. Thanks to David Hauck
-          <davidh@realtimeint.com> for this fix.
-
-Mon Jul 19 08:12:30 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_tru64_cxx.GNU: added support
-          for DU 4.0E and D.
-
-Mon Jul 19 08:08:25 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-hpux-(10 11).x-hpc++.h: In the aC++ section, if __HP_aCC
-          is not set, set it. Some parts of TAO rely on it, but it's not set
-          until the most recent versions of the compiler. Thanks to Brian
-          Wallis <Brian.Wallis@sr.com.au> for helping figure this out.
-
-Mon Jul 19 07:53:59 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/SOCK_Dgram_Mcast.cpp (open): added unnecessary const_cast
-          of mcast_addr to ACE_Addr &, so that Sun C++ 4.2 will compile
-          without error.  Thanks to Andy for this fix.
-
-Sun Jul 18 21:36:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * OS.cpp (sched_params): wrapped DIGITAL_UNIX preprocessor
-          symbol in parenthesis.
-
-Sun Jul 18 14:30:54 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/run_tests.sh: Reenabled the Future_Set_Test.  Hopefully,
-          this will work on Solaris and the other platforms now!
-
-        * ace/Future*: Added some fixes for Future_Set that should prevent
-          it from hanging indefinitely on certain platforms.  Also,
-          removed the Future_Node.h and Future_Node.cpp files since they
-          are no longer used.  Thanks to John Tucker
-          <jtucker@infoglide.com> for contributing these fixes.
-
-        * ace/SOCK_Dgram_Mcast: Finished implementing the QoS-enabled APIs for
-          socket datagram multicast.  This required refactoring quite a
-          bit of code and adding some new methods that take the
-          ACE_QoS_Params.
-
-        * ace/SOCK_Dgram.cpp: Finished integrating the QoS support
-          for SOCK dgrams.
-
-        * ace/SOCK_Dgram.cpp: Factored out common code in the
-          ACE_SOCK_Dgram constructors.
-
-        * ace/SOCK_Connector: Finished implementing the QoS-enabled
-          connect() methods.  To make this cleaner, I've created a new
-          "shared_open()" method that factors out the common code.
-
-        * ace/SOCK_Acceptor: Finished implementing the QoS-enabled open()
-          method.  To make this cleaner, I've created a new
-          "shared_open()" method that factors out the common code.
-
-Sat Jul 17 13:36:03 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/High_Res_Timer.cpp (get_cpuinfo):
-
-          Removed extra `FILE *cpuinfo' declaration.
-
-Sat Jul 17 12:20:25 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/High_Res_Timer: Added integrated support for Alpha and
-          Pentium that will eliminate the 5sec startup delay for Linux/PII
-          clients using the ACE high resolution timer.  Thanks to Thomas
-          Lockhart <Thomas.G.Lockhart@jpl.nasa.gov> for these fixes.
-
-        * netsvcs/servers/main.cpp (main): Fixed a typo caused by recent
-          integration of Jerry De Master's fixes.
-
-Fri Jul 16 19:41:05 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/ACE.cpp (out_of_handles): Added a function to check if a
-          process is out of handles (file descriptors).  This is required
-          to avoid repeating this code in many places.  Also, note that
-          all platform specific quirks can be captured in this function.
-
-        * ace/Cached_Connect_Strategy_T.cpp (cached_connect):
-        * tests/Cached_Conn_Test.cpp (out_of_sockets_handler):
-        * tests/Cached_Accept_Conn_Test.cpp (out_of_sockets_handler):
-
-          Changed the above to use the new ACE::out_of_handles() function.
-
-        * ace/OS.h (ENFILE): Added ENFILE if missing on platform.  In that
-          case, ENFILE will equal to EMFILE.
-
-Fri Jul 16 13:55:34 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * include/makeinclude/{build_dll.bor,build_exe.bor,compiler.bor},
-          ace/{Makefile.bor,ace.rc}:
-          Updated these files to add version information to the DLLs so
-          when you right click them in windows explorer you can see what
-          version the file is (e.g., "4.6.45").  Thanks to Christopher
-          Kohlhoff <chris@kohlhoff.com> for contributing this.
-
-        * netsvcs/servers/main.cpp (main): Disable debugging messages
-          if the -d option isn't given to ACE_Service_Config.  Thanks to
-          Jerry De Master <jdemaste@ipdinc.com> for reporting this.
-
-        * ace/config-win32-borland.h: Updated this file to enable some
-          necessary macros.  Thanks to Christopher Kohlhoff
-          <chris@kohlhoff.com> for reporting this.
-
-        * tests/DLL_Test.cpp,
-          tests/run_test.bat: Updated these to handle the appropriate
-          directory where the Borland tests are built.  Thanks to
-          Christopher Kohlhoff <chris@kohlhoff.com> for reporting this.
-
-        * netsvcs/lib/Logging_Strategy.cpp (init): When the application
-          program is started, none of the log output is sent to the
-          Client_Logging_Service.  Further investigation shows that the
-          ACE_Log_Msg::open() method is responsible for connecting to the
-          client logger if the ACE_Log_Msg::LOGGER flag is set.  However,
-          the connections never attempted because the ACE_Log_Msg::open()
-          method is called before the Logging_Strategy flags have been
-          parsed.  This problem was fixed by rearranging the point at
-          which the ACE_LOG_MSG->open() method was called.  Thanks to
-          Jerry De Master <jdemaste@ipdinc.com> for contributing this.
-
-        * netsvcs/lib/Client_Logging_Handler.cpp (send),
-          netsvcs/lib/Log_Message_Receiver.cpp (log_output):
-          All log message output in ACE is done through one of the
-          ACE_Log_Record::print() methods.  Each of the overloaded methods
-          has a <flags> argument as the second argument.  However, all
-          uses of the ACE_Log_Record::print() method in
-          Log_Message_Receiver.cpp and Client_Logging_Handler.cpp pass
-          zero for the flags argument.  To fix this, simply pass
-          ACE_Log_Msg::instance()->flags() instead of 0.  Thanks to Jerry
-          De Master <jdemaste@ipdinc.com> for contributing this.
-
-        * ace/Log_Record.cpp (format_msg): Added code for the new
-          ACE_Log_Record::format_msg() method that adds the date/time
-          stamp to the ACE_Log_Msg::VERBOSE_LITE output.  Thanks to Jerry
-          De Master <jdemaste@ipdinc.com> for contributing this.
-
-        * netsvcs/lib/Logging_Strategy.cpp (init): Make sure the
-          ACE_Log_Msg::VERBOSE_LITE flag is OR'd into the clr_flags()
-          call.  Thanks to Jerry De Master <jdemaste@ipdinc.com> for
-          reporting this.
-
-        * netsvcs/lib/Logging_Strategy.cpp (tokenize): Make sure that
-          the ACE_Log_Msg::VERBOSE_LITE flag is correctly parsed.  Thanks
-          to Jerry De Master <jdemaste@ipdinc.com> for reporting this.
-
-        * ace/Memory_Pool.h: Added a way to set the segment_size in
-          ACE_Shared_Memory_Pool_Options and ACE_Shared_Memory_Pool.
-          Thanks to Serge Kolgan <skolgan@cisco.com> for this fix.  [This
-          feature was actually added a couple of beta releases ago, but
-          somehow the ChangeLog entry got lost.]
-
-Fri Jul 16 16:41:22 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Stats.cpp (print_summary):
-
-          Fixed format specifier that was expecting an integer argument.
-          It needed an additional percent specifier.
-
-Fri Jul 16 09:20:42 1999  Arturo Montes <mitosys@colomsat.net.co>
-
-        * ace/OS.i: Patch the dl* family to keep ACE
-          compatible in SCO OpenServer 5.0.0, 5.0.2, 5.0.4 with 5.0.5
-
-        * ace/config-sco-5.0.0.h: Bring OpenServer up to date.
-
-        * include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU:
-          Use gcc-2.95.
-
-Fri Jul 16 11:50:24 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Log_Msg.cpp (log):
-        * tests/Basic_Types_Test.cpp (main): Reverted my previous
-          change.  It was not a safe assumption.
-
-Fri Jul 16 02:28:10 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Log_Msg.cpp (log): Changed (*va_arg (argp,PTF))(), which
-          extracts a function pointer from va_list and makes a call using
-          the pointer pointer to ACE_reinterpret_cast (PTF, va_arg (argp,
-          long))().  This assumes the sizeof (long) is exactly equal to
-          the size of a function pointer.
-
-        * tests/Basic_Types_Test.cpp (main): Narrow down the check to
-          ensure sizeof(long) == sizeof (a function pointer) (which is
-          true for all the platforms that ACE runs on.)
-
-Fri Jul 16 00:07:23 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Cached_Accept_Conn_Test.cpp (test_connection_management):
-          Changed the test to allow for both one listen endpoint or
-          multiple listen endpoints.
-
-Thu Jul 15 22:42:36 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Message_Queue.h: (ACE_MESSAGE_QUEUE_DEFAULT_TYPE):
-        * ace/Future_Set.{h,cpp} (ACE_Future_Set): Typedef'ed the
-          ACE_Message_Queue to ACE_MESSAGE_QUEUE_DEFAULT_TYPE and use the
-          typedef'ed name in ACE_Future_Set's contstructor to get around a
-          bug in vxworks' g++ compiler.
-
-Thu Jul 15 22:14:18 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Cached_Connect_Strategy_T.cpp
-        * ace/Cached_Connect_Strategy_T.h
-        * ace/Strategies_T.cpp
-        * ace/Strategies_T.h
-
-          Changed find()'s signature to help g++.
-
-        * tests/Cached_Accept_Conn_Test.cpp
-        * tests/Conn_Test.cpp
-
-          Added template instantiations.
-
-Thu Jul 15 21:32:26 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/create_ace_build: removed # -*- perl -*- on first
-          line so that t/csh users don't trip over it.  Thanks
-          to Irfan for reporting this.
-
-Thu Jul 15 20:23:39 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Cached_Conn_Test.cpp (test_connection_management): Changed
-          the test to allow for both one listen endpoint or multiple
-          listen endpoints.
-
-        * ace/Cached_Connect_Strategy_T.cpp:
-        * ace/Strategies_T.cpp
-
-          - find: Since the comparison of
-            REFCOUNTED_HASH_RECYCLABLE_ADDRESS doesn't work very well when
-            trying to find an idle connection (because there are many idle
-            states), we now use the new backet iterator to find a idle
-            connection.
-
-          - check_hint_i: Explicitly checks for idleness; previously it
-            was simple checking !closed.
-
-        * ace/Strategies.h (ACE_Recyclable): Changed ACE_Recyclable::State
-          to ACE_Recyclable_State.
-
-        * ace/Strategies_T.h (ACE_Refcounted_Hash_Recyclable):
-
-          - Added operator!=(ACE_Refcounted_Hash_Recyclable<T>)
-          - Removed operator==(T)
-          - Added T &subject()
-          - Change operator==(ACE_Refcounted_Hash_Recyclable<T>) to check
-            for equality in state and subject.
-
-        * ace/Caching_Utility_T.cpp (minimum): Entries marked
-          ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE should also be considered
-          for purging.
-
-        * ace/Cleanup_Strategies_T.cpp (cleanup): The hash map of the
-          connection cache may contain duplicates.  Therefore, we are not
-          exactly sure which map entry will be removed when calling
-          unbind().  Therefore, we use the other unbind() which gives us
-          back the value of the entry that was removed.  This way will
-          close the correct handler.
-
-        * ace/Svc_Handler.cpp (state): Added a new method that allows the
-          user to explcitly set the state of the Svc_Handler. If the
-          Svc_Handler does not have a recycler, this method will have no
-          effect.
-
-Thu Jul 15 16:39:06 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * Makefile:
-        * NEWS:
-
-          The NEWS file is no longer a generated file so it was added to
-          the list of controlled files.
-
-Thu Jul 15 16:20:43 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Service_Manager.cpp (init): Check to see the acceptor handle
-          is ACE_INVALID_HANDLE before the actual initialization to
-          prevent this service from being initialized twice.
-          (fini): Must call remove_handler with
-          ACE_Event_Handler::DONT_CALL since the service manager won't be
-          around when the reactor is being destroyed.  Thanks to Gheorghe
-          Aprotosoaie <gaprotosoaie@paragonms.com> for reporting this.
-
-Thu Jul 15 16:26:28 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (spa): use ACE_NEEDS_HUGE_THREAD_STACKSIZE
-          instead of hard-coded value.
-
-        * ace/config-vxworks5.x.h: added default
-          ACE_NEEDS_HUGE_THREAD_STACKSIZE of 64000.
-
-Thu Jul 15 16:08:48 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/config-win32-common.h: Moved ACE_HAS_IP_MULTICAST down
-          *after* ACE_HAS_WINSOCK2 is defined.  Thanks to Marina for
-          reporting this.
-
-Thu Jul 15 16:11:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Basic_Types.h (ACE_U_LongLong): removed user-defined
-          conversion to ptr_arith_t.  Replaced with new macro,
-          ACE_LONGLONG_TO_PTR.
-
-Thu Jul 15 15:31:49 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/ACE.cpp (timestamp):
-        * ace/High_Res_Timer.cpp (print_ave):
-        * ace/Local_Tokens.cpp (open):
-        * ace/Log_Msg.cpp (log):
-        * ace/Log_Record.cpp (format_msg):
-        * ace/Naming_Context.cpp (parse_args):
-        * ace/OS.cpp (unique_name):
-
-          Fixed warnings and generated by gcc 2.95; mostly due to format
-          specifier mismatches and inefficient conversion operator usage.
-
-Thu Jul 15 14:21:32 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: reverted to the original
-          perl magic that goes at the top of every script.  The
-          fix that was supposed to work on HP/UX doesn't.  See
-          Thu Jul 08 22:15:50 1999  David L. Levine  <levine@cs.wustl.edu>
-
-Thu Jul 15 12:19:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/make_release: added -u option, to allow updating the
-          version stamps from any directory.  Also, added suppression
-          of cvs checkout warning about empty ("New") directories.
-
-        * Makefile: added -u to make_release invocations.
-
-Thu Jul 15 11:39:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE version 4.6.45 released.
-
-Thu Jul 15 11:26:43 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * Makefile: made NEWS a dependency of release.
-
-Thu Jul 15 10:05:40 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: removed reference to
-          ACE_OS::scanf ().  No such thing.
-
-Thu Jul 15 10:01:31 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.h: TRANSMIT_FILE_BUFFERS are not defined on PharLap ETS -
-          it's a Microsoft-specific extension to Winsock 1.1.
-
-        * ace/config-win32-common.h: ACE_HAS_IP_MULTICAST is only set for
-          Winsock 2.
-
-        Thanks to David Hauck <davidh@realtimeint.com> for these fixes.
-
-Thu Jul 15 09:28:32 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_tru64_cxx.GNU: changed
-          4.0f to 4.0F, because that's what sizer -v returns
-          on DU 4.0F.  Thanks to Doug Anderson <dla@home.com>
-          for reporting this.
-
-        * ace/config-tru64.h: only #define _LIBC_POLLUTION_H_
-          with DU >= 5.0.  Thanks to Doug Anderson <dla@home.com>
-          for reporting that it's not necessary on DU 4.0F.
-
-Thu Jul 15 09:15:11 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.x.h: Corrected template settings for IBM C/C++
-          3.6 compiler. It does not get ACE_HAS_STD_TEMPLATE_SPECIALIZATION.
-
-        * include/makeinclude/platform_aix4_cset++.GNU: Delete the
-          testAIXCompilerVersion.cpp file after getting the compiler version.
-
-Thu Jul 15 07:33:30 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-tru64.h,config-osf1.h,config-osf1-4.0.h,
-          include/makeinclude/platform_tru64_cxx.GNU,platform_osf1_cxx.GNU,
-          ACE-INSTALL.html: moved config-osf1.h to config-tru64.h,
-          and platform_osf1_cxx.GNU to platform_tru64_cxx.GNU.
-          Thanks to Doug Anderson <dla@home.com> for this suggestion.
-
-Wed Jul 14 22:23:10 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-cray.h: replaced ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
-          with ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION.  The standard
-          "template class" explicit instantiations work with version
-          3.2.0.1 of the compiler.  Thanks to Doug Anderson <dla@home.com>
-          for reporting this.
-
-        * ace/config-ghs-common.h: use
-          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION with Green Hills 1.8.9
-          and later.  Thanks to Carlos for suggesting that we give it
-          whirl.  It worked :-)
-
-Wed Jul 14 22:03:08 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-osf1-4.0.h: enable pragma message disable declbutnotref
-          with Digital Unix 4.0f, as well as 5.0.  Thanks to
-          Doug Anderson <dla@home.com> for reporting that
-          it's necessary.
-
-        * ACE-INSTALL.html: updated config/platform info for
-          Digital UNIX 4.0f (and 5.0).
-
-          [Bug 65]
-
-Wed Jul 14 19:44:21 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/Thread_Manager.cpp (spawn_i): Defer acquiring the thread
-          descriptor's lock until just before attempting to start the thread
-          to avoid places where the thread descriptor could be destroyed
-          while holding the lock (doing that is an undefined operation in
-          pthreads, and has particularly bad results on HP-UX 11). If the
-          thread creation does fail, release the lock before returning
-          the error indication (taking care to guard errno). Removed an
-          unreachable block of code which put the thread descriptor on the
-          wrong list anyway.
-          Removed the #if 1, #else, #endif around the auto_ptr for
-          new_thr_desc - if it's still working this close the ACE 5 release,
-          it wins. Besides, the use of the auto_ptr was ingrained in the
-          rest of the function, without the #if checks.
-
-Wed Jul 14 19:03:57 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * etc/purify.solaris2: added another UMR suppression for
-          __sigprocmask in the Solaris 2.6 threads library.  Thanks
-          to Andy for reporting this.
-
-Wed Jul 14 16:30:48 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Hash_Map_Manager_T.h (class ACE_Hash_Map_Bucket_Iterator):
-          Added a new class that allows the iteration over the entries of
-          a of a particular bucket in a hash map.
-
-        * tests/Hash_Map_Bucket_Iterator_Test.cpp: A test for the new
-          ACE_Hash_Map_Bucket_Iterator class.
-
-Wed Jul 14 16:37:33 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * Makefile:
-
-          Added Makefile.am and NEWS to the list of controlled files.  The
-          file `NEWS' will get generated when a release is made.
-
-        * TODO:
-        * acconfig.h:
-        * configure.in:
-        * configure:
-
-          Minor ACE Configuration Project related updates and fixes.
-
-Wed Jul 14 13:38:12 1999  Steve Huston  <shuston@riverace.com>
-
-        * tests/Cached_Accept_Conn_Test.cpp: Moved defs of Client_Svc_Handler
-          and Server_Svc_Handler classes to new file, Cached_Accept_Conn_Test.h
-          to make AIX xlC happy.
-
-        * tests/Cached_Conn_Test.cpp: Moved definition of Svc_Handler class
-          new file, Cached_Conn_Test.h to make AIX xlC happy.
-
-        * tests/Cached_Accept_Conn_Test.cpp, Cached_Conn_Test.cpp: Don't
-          even try to build these on AIX C Set++ 3.1. It can't hack the
-          auto template instantiation - overwrites a template generator
-          file and tosses its cookies. ACE is still the best C++ compiler
-          test on the planet.
-
-Wed Jul 14 16:24:38 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.cpp:
-          Added new method to efficiently steal the contents of a CDR
-          stream and store them in another.
-
-Wed Jul 14 12:05:13 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/rules.local.GNU (LN_S): on WIN32
-          hosts, use cp -p instead of ln -s, because symbolic
-          links aren't supported.
-
-Wed Jul 14 11:22:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU,
-          ACE_INSTALL.html: with egcs (Tornado II) and without
-          exception handling, add -Wno-uninitialized to CCFLAGS.
-          The version of egcs that is provided with Tornado II
-          produces some spurious warnings about uninitialized
-          variables (including "this" :-).  This was a problem
-          in older versions of egcs, but has since been fixed.
-          To avoid the warning, we always disable the warning
-          with VxWorks' egcs.
-
-Wed Jul 14 11:20:31 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.x.h: Add ACE_LACKS_SETSCHED for pre-4.3 AIX.
-
-Wed Jul 14 11:15:24 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Shared_Malloc/Malloc.cpp: only explicitly
-          instantiate ACE_Read_Guard<ACE_SYNCH_MUTEX> and
-          ACE_Write_Guard<ACE_SYNCH_MUTEX> ifndef ACE_HAS_THREADS.
-          With threads, they're explicitly instantiated in
-          ace/Synch.cpp.
-
-Wed Jul 14 10:58:30 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.cpp:
-          Clarified the relationship between this implementation and the
-          original SunSoft version.
-
-Wed Jul 14 10:47:45 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_qnx_neutrino.GNU:
-          added ACE_HAS_GNUG_PRE_2_8 := 0, so that exception
-          handling will be disabled by default.
-
-Wed Jul 14 10:34:37 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp: fixed typo,
-          ACE_LACKS_UNIX_DOMAIN_SOCKETS instead of
-          ACE_HAS_UNIX_DOMAIN_SOCKETS.
-
-Wed Jul 14 10:22:29 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Singleton.*: added ACE_Unmanaged_Singleton and
-          ACE_Unmanaged_TSS_Singleton template class.  They're
-          identical to ACE_Singleton and ACE_TSS_Singleton,
-          respectively, except that they don't register for
-          cleanup with the ACE_Object_Manager.  Therefore,
-          the application is responsible for explicitly destroying
-          the instance after it is no longer needed (if it wants to
-          avoid memory leaks, at least).  The close () static member
-          function must be used to explicitly destroy the Singleton.
-          Thanks to Valery Arkhangorodsky <valerya@servicesoft.com>
-          for suggesting this and providing the code.
-
-Wed Jul 14 10:01:47 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h (ACE_{,U_}ONE_SECOND_IN*): made the trailing
-          L or U upper case, for readability.  Thanks to Chris
-          for noticing this.
-
-Wed Jul 14 09:40:37 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/wrapper_macros.GNU: when setting
-          ACE_HAS_GNUG_PRE_2_8, if not g++:  don't override
-          the value to null if it was non-null.  Also, clarified
-          use of ACE_HAS_GNUG_PRE_2_8:  1 for g++ < 2.8.0,
-          0 for g++ >= 2.8.0, undefined for non-g++.
-
-Wed Jul 14 09:29:57 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Makefile (realclean): remove log/compilations.log*.
-
-Tue Jul 13 22:25:18 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * include/makeinclude/wrapper_macros.GNU:
-          Disable the "unitialized" warnings with EGCS+exceptions, it
-          gives too many bogus warnings to take care of them.
-
-Tue Jul 13 22:16:17 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * bin/ACEutils.pm:
-          Wait for non empty files, sometimes the process creates the
-          files but does not have enough time to fill its contents.
-
-Tue Jul 13 21:32:44 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * acconfig.h:
-        * ltconfig:
-        * ltmain.sh:
-        * ace/Makefile.am:
-        * tests/Makefile.am:
-
-          ACE Configuration Project updates.  Synchronized with current
-          version of ACE in CVS repository.
-
-Tue Jul 13 15:22:51 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU:
-          set ACE_HAS_GNUG_PRE_2_8 to 0 with egcs (Tornado II).
-
-Tue Jul 13 15:15:43 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/ace-dll.icc, ace-lib.icc: Corrected source file set; now builds
-          (still with some warnings) on AIX, Visual Age C++ 4.
-
-Tue Jul 13 15:11:28 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * bin/run_all_win32.pl: Fixed program output redirection problem.
-          Unfortunately, the fix requires one to have either 'sh' or '4nt'
-          to redirect output from another perl script correctly.
-
-Tue Jul 13 15:04:35 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_qnx_neutrino.GNU:
-          removed full paths from commands, because they're
-          prefixed with i386-nto-.
-
-        * ace/config-qnx-neutrino.h: updated to build with egcs.
-
-Tue Jul 13 15:03:01 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Pipe.cpp (open): moved declaration of local variable
-          "one" inside the ACE_LACKS_TCP_NODELAY #ifndef block.
-
-Tue Jul 13 14:57:56 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/SV_Semaphore_Simple.{h,cpp} (init,open,name_2_key):
-          added static cast of ACE_INVALID_SEM_KEY to key_t.  key_t
-          is unsigned on QNX Neutrino, but we want to keep
-          ACE_INVALID_SEM_KEY as -1.
-
-Tue Jul 13 11:57:53 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/config-win32.h: Changed CApplication to CWinApp.  Thanks to
-          John Morey <jmorey@tbi.com> for pointing this out.
-
-Tue Jul 13 11:13:52 1999  Steve Huston  <shuston@riverace.com>
-
-        * ACE_INSTALL.html: Added some info for building on AIX with
-          Visual Age C++.
-
-        * ace/config-aix-4.3.x.h: New file - these version-specific configs
-          are particularly useful with Visual Age C++, which has its own
-          funky make system that doesn't use the platform_macros.GNU files,
-          and so doesn't pick up the ACE_AIX_MAJOR/MINOR_VERS settings which
-          are used in config-aix-4.x.h.
-
-        * ace/config-aix-4.x.h: Corrected template settings for Visual Age C++
-          and added ACE_HAS_TYPENAME for VAC++ also.
-
-Tue Jul 13 10:40:31 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Cached_Connect_Strategy_T.cpp (purge_connections): There is
-          no need to set the purge percentage again.
-
-Tue Jul 13 10:39:57 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * ace/Containers_T.h,i: Altered private member list_ of
-          DLList_Iterator to be a pointer rather than a reference. This
-          allows the reset method to work because it was overwriting the
-          contents of list_ rather than iterating over a different list
-
-Tue Jul 13 09:14:31 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/Cached_Connect_Strategy_T.cpp (dtor): Added ACE_TYPENAME
-          to 'iter' declaration since its type depends on template parameters.
-
-Tue Jul 13 09:11:24 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_ghs.GNU:
-          moved LIBS setting for Green Hills 1.8.9 from
-          x86-only to all targets.  Thanks to Dale Wood
-          <dale_wood@Mitel.com> for confirming that this
-          is necessary for PowerPC targets.
-
-Tue Jul 13 08:18:56 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-osf1.h,config-osf1-4.0.h,
-          include/makeinclude/platform_osf1_cxx.GNU:
-          added another significant figure to the version identifer,
-          e.g., 0x40F and 0x500. [Bug 65]
-
-Tue Jul 13 06:45:53 1999  Steve Huston  <shuston@riverace.com>
-
-        * examples/Shared_Malloc/test_position_independent_malloc.cpp: Moved
-          definition of Dummy_Data to test_position_independent_malloc.h, a
-          new file, to satisfy AIX IBM C++ template instantiation.
-
-        * include/makeinclude/platform_aix4_cset++.GNU: Turn on/off warnings
-          based on compiler version, not OS version. Thanks to Craig
-          Rodrigues <rodrigc@mediaone.net> for sending the code in!
-
-        * THANKS: Added Craig Rodrigues to the hall of fame.
-
-        * ace/config-aix-4.1.x.h, config-aix-4.2.x.h: Added setting for
-          ACE_AIX_MAJOR_VERS and ACE_AIX_MINOR_VERS if they weren't set
-          already. Eases backwards compatibility for those who don't use
-          the ACE build macros (horrors! :-). Thanks to Jeff Donner
-          <jdonner@schedsys.com> for this suggestion.
-
-Mon Jul 12 18:24:34 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/Cached_Accept_Conn_Test.cpp:
-          This tests explicit purging from the server's point of view.
-          When the acceptor in either its accept_svc_handler () or open ()
-          runs out of descriptors, purging of unused svc_handlers from the
-          connecton cache is requested.
-
-        * tests/Cached_Conn_Test.cpp:
-          Defined ACE_HAS_BROKEN_EXTENDED_TEMPLATES for the
-          Caching_Strategy_Adapter. If this condition is true, then only
-          Least Recently Used Caching Strategy is available. This was
-          necessary for compilers which dont accept long template lists,
-          for example GNUC version < 8.0. Total credit for this hack
-          to get through the old GNUC compiler goes to Irfan
-          <irfan@cs.wustl.edu> of the DOC group.
-
-        * tests/Makefile:
-          Added Cached_Accept_Conn_Test.cpp.
-
-        * tests/Makefile:
-        * tests/run_tests.sh:
-        * tests/run_pharlap_tests.bat:
-        * tests/run_tests.bat:
-        * tests/run_tests.psosim:
-        * tests/run_tests.vxworks:
-          Added Cached_Conn_Test, Map_Manager_Test and
-          Cache_Map_Manager_Test to the above.
-
-Mon Jul 12 17:31:28 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * bin/run_all_win32.pl: Fixed the missing execution output problem
-          and simplified how the script gets invoked.  See comments for
-          more details.
-
-        * ace/config-win32.h:
-        * ace/Object_Manager.h: Updated some unclear comments regarding
-          the use and instantiation of non-static object manager.  Thanks
-          to John Morey and David for pointing this out.
-
-        * ace/ace_dll.dsp: Merged additional MFC configuration.  Thanks to
-          John Morey <jmorey@tbi.com> for submitting the patch.
-
-Mon Jul 12 15:27:37 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-osf1.h,config-osf1-4.0.h,
-          include/makeinclude/platform_osf1_cxx.GNU,
-          ACE-INSTALL.html: added support for DU 4.0f.  It needs the
-          same #defines that we use on DU 5.0. [Bug 65]
-
-Mon Jul 12 14:41:14 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-win32.h,Object_Manager.h: cleaned up comments
-          about the non-static ACE_Object_Manager.  Thanks to
-          John Morey <jmorey@tbi.com> for reporting this.
-
-Mon Jul 12 13:54:34 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * ace/Cache_Map_Manager_T.{h,i,cpp}:
-          Defined ACE_T1 and ACE_T2 which contain the template parameter
-          list and added ACE_HAS_BROKEN_EXTENDED_TEMPLATES macro where
-          needed. This takes care of the template list for compilers which
-          cant accept a long template list, for example: GCC 2.7.2.
-          Also changed the purge() to now call the <caching_utility> for
-          purging entries form the cache.
-
-        * ace/Hash_Cache_Map_Manager_T.h:
-          Added ACE_HAS_BROKEN_EXTENDED_TEMPLATES to complement the
-          Cache_Map_Manager class changes.
-
-        * ace/Cached_Connect_Strategy_T.cpp:
-          Changed dtor to take care of the
-          ACE_HAS_BROKEN_EXTENDED_TEMPLATES definition.
-
-        * ace/Cached_Connect_Strategy_T.h:
-          Removed CONNECTION_CACHE_ITERATOR typedef.
-
-        * ace/Caching_Strategies_T.{h,i,cpp}:
-          Changed template parameter list and removed dependency on the
-          CONTAINER. Removed clear_cache() method.
-
-        * ace/Caching_Utility_T.{h,i,cpp}:
-          Added default cleanup strategies to every kind of
-          caching_utiltity. ACE_Recyclable_Hanlder_Caching_Utility no
-          longer derives form ACE_Pair_Caching_Utility.
-
-        * ace/Cleanup_Strategies_T.{h,i,cpp}:
-          Changed ACE_Svc_Cleanup_Strategy to
-          ACE_Recyclable_Handler_Cleanup_Strategy.
-
-        * tests/Cache_Map_Manager_Test.cpp:
-        * tests/Map_Manager_Test.cpp:
-          Made changes to template instantiations.
-
-        * tests/Cached_Conn_Test.cpp:
-          Added out_of_sockets_handler() which will do the purging.
-          Added a check for ENOBUFS which arose on NT and ENOENT which
-          arose on Linux + Solaris. Defined
-          ACE_HAS_BROKEN_EXTENDED_TEMPLATES for GCC versions < GCC 2.8.
-
-Mon Jul 12 12:14:45 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-development-process.html: added this page, as
-          a start towards a less chaotic development process.
-
-Mon Jul 12 10:05:31 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/Event_Handler_T.i: Added ACE_TYPENAME on template-dependent types
-          in function signatures. Quiets HP-UX aC++.
-
-        * ace/Based_Pointer_Repository.h:
-        * ace/Based_Pointer_T.h: Added #include "ace/OS.h" to pick up def. of
-          ACE_Export when instantiating templates with AIX IBM C++.
-
-        * include/makeinclude/platform_hpux_aCC.GNU: Removed definition for
-          CPP_LOCATION - use aCC - cpp has too many problems, and a fix for
-          the pragma warnings was checked into TAO_IDL.
-
-Mon Jul 12 09:26:29 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * testsr/Makefile: don't build libDLL_Test.so if not building
-          shared libraries.  This simplifies the build on static-libs
-          only platforms, and can be used by run_tests.sh, below.
-          [Bug 62]
-
-        * tests/run_tests.sh: don't run DLL_Test if libDLL_Test.so
-          was not built.
-
-Mon Jul 12 07:48:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: updated guideline under CVS
-          section to match the other one about always testing
-          on egcs.
-
-Sun Jul 11 23:59:52 1999  nanbor  <nanbor@cs.wustl.edu>
-
-        * ACE version 4.6.44 released.
-
-Sat Jul 10 18:05:41 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/config-kcc-common.h: Added ACE_NEW_THROWS_EXCEPTIONS.
-          Thanks to David for pointing this out.
-
-Sat Jul 10 16:22:00 1999  Chris Gill  <cdgill@tango.cs.wustl.edu>
-
-        * ace/config-win32-common.h: wrapped ACE_HAS_TYPENAME_KEYWORD so it is
-          only set for MSVC++ 6.0 or higher.  This is to work around a compiler
-          bug in MSVC++ 5.0 when trying to compile certain forms with the
-          typename keyword in a template method argument list.
-
-Sat Jul 10 13:16:50 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Malloc: Changed the type of pointer used by ACE_Name_Node
-          from void * to char * so that we can integrate this cleanly with
-          ACE_Based_Pointer<>, which will fail if we use void since we
-          can't return from a "void" function!
-
-        * tests/Thread_Pool_Test.cpp (open): Fixed another somewhat bogus
-          warning from EGCS related to initialization of loop variables.
-
-        * tests/New_Fail_Test.cpp (main): Make sure to initialize pointers
-          so that EGCS doesn't complain.
-
-        * tests/MT_Reactor_Timer_Test.cpp (main): Fixed a signed/unsigned
-          mismatch.
-
-        * tests: Added appropriate header comments for all the *.h files.
-
-        * tests/Cache_Map_Manager_Test.cpp: Capitlized the hash_key
-          class to be Hash_Key, which is standard ACE programming style.
-
-        * ace/Service_Config.cpp: Added yet another set of
-          changes to open_i() so that the -d option is handled
-          appropriately.  Thanks to Jonathan Reis
-          <reis@minniemouse.cemax.com> for this fix.
-
-        * ace/SOCK_Acceptor.h: Clarified the parameters for
-          ACE_SOCK_Acceptor's constructor and open() methods.  Thanks to
-          Ron MacKenzie <ronm@SLAC.Stanford.EDU> for motivating this.
-
-Sat Jul 10 13:56:30 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/MT_Reactor_Timer_Test.cpp (main): Fixed signed/unsigned
-          comparison.
+Sat Jul 17 11:17:18 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+  
+	* tao/CDR_Stream.cpp
+	* tao/CDR_Stream.h : Integrated Carlos's memory leak fixes from the main branch. 
 
 Sat Jul 10 08:01:36 1999  David L. Levine  <levine@cs.wustl.edu>
 
@@ -2958,7 +1525,8 @@ Sun Jun 27 18:03:24 1999  Douglas C. Schmidt  <schmidt@danzon.cs.wustl.edu>
 
 Sun Jun 27 20:50:02 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        Added support for IBM's VisualAge C++ compiler.  
+        Added support for IBM's VisualAge C++ compiler.  Thanks to Rene
+        Matteau <matteau@ca.ibm.com> for contributing the following fixes:
 
         * ace: Added a new config-visualage.h file that automatically
           includes the proper configurations for IBM's VisualAge C++
@@ -3437,7 +2005,7 @@ Thu Jun 24 22:42:44 1999  David L. Levine  <levine@cs.wustl.edu>
           preprocessor usage so that it's not in the middle of the
           ACE_reintepret_cast.
 
-Thu Jun 24 22:18:52 1999  Doug Anderson  <dla@home.com>
+Thu Jun 24 22:18:52 1999  Doug Anderson  <doug@clark.net>
 
         * ace/CDR_Stream.*,ace/SOCK_Dgram_Mcast.cpp,ace/config-cray.h:
           updates for Cray UNICOS port.
@@ -6923,7 +5491,8 @@ Tue Apr 20 13:55:34 1999  Joe Hoffert <joeh@cs.wustl.edu>
 Tue Apr 20 13:30:51 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
         * ace/ace.icc: Added a configuration file for creating a shared
-          library with Visual Age C++.
+          library with Visual Age C++.  Thanks to Rene Matteau
+          <matteau@ca.ibm.com> for this.
 
 Mon Apr 19 23:50:25 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
@@ -9230,7 +7799,7 @@ Wed Mar 10 11:05:39 1999  David L. Levine  <levine@cs.wustl.edu>
           it was missing.
 
         * include/makeinclude/platform_osf1_4.0.GNU: disable msg 1136 with
-          cxx 6.1-029.  Thanks to Doug Anderson <dla@home.com> for
+          cxx 6.1-029.  Thanks to Doug Anderson <doug@clark.net> for
           reporting this.
 
 Wed Mar 10 10:57:16 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
@@ -11215,7 +9784,7 @@ Fri Jan 29 14:49:37 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
         * tests/Message_Queue_Test.cpp:
         * tests/SV_Shared_Memory_Test.cpp:
         * tests/run_tests.sh:
-          Thanks to Doug Anderson <dla@home.com> for this port of ACE to
+          Thanks to Doug Anderson <doug@clark.net> for this port of ACE to
           Cray machines.
 
 Fri Jan 29 13:51:40 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
diff --git a/Makefile b/Makefile
index 032581c5220..3ea949f3d19 100644
--- a/Makefile
+++ b/Makefile
@@ -94,12 +94,9 @@ CONTROLLED_FILES = \
         ChangeLog-93 \
         FAQ \
         Makefile \
-        Makefile.am \
-        NEWS \
         PROBLEM-REPORT-FORM \
         README \
         THANKS \
-        TODO \
         VERSION \
         WindozeCE \
         acconfig.h \
@@ -161,14 +158,14 @@ release: ACE-INSTALL
 	@$(GENERATE_MAN_PAGES)
 	@$(ACE_ROOT)/bin/make_release $(CHECK) -k ace -t $(REL) \
            -c "$(CONTROLLED_FILES)" -r "$(RELEASE_FILES)" \
-           -l "$(RELEASE_LIB_FILES)" -u
+           -l "$(RELEASE_LIB_FILES)"
 
 #### The following target is for use by the TAO Makefile.  It should not
 #### be called directly from the command line.  The releasetao target
 #### creates the combined ACE-TAO kit.
 releasetao:
 	@$(ACE_ROOT)/bin/make_release $(CHECK) -k ace+tao -t $(REL) \
-           -c "$(CONTROLLED_FILES)" -r "$(ALL_RELEASE_FILES)" -u
+           -c "$(CONTROLLED_FILES)" -r "$(ALL_RELEASE_FILES)"
 
 #### The releaseall target:
 ####   1) Creates the ACE kit.
diff --git a/Makefile.am b/Makefile.am
index e0064f7d67e..cf30310e5f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@
 
 ## The number in AUTOMAKE_OPTIONS is the minimum required version automake
 ## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4 #check-news
+AUTOMAKE_OPTIONS = 1.4 check-news
 
 bin_SCRIPTS = ace-config
 
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 7908c020206..00000000000
--- a/NEWS
+++ /dev/null
@@ -1,12 +0,0 @@
-Please see the release notes in the docs directory and the ChangeLog for
-information about what has changed between releases.
-
-If you have any problems with or questions about ACE, please send
-email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
-found in the file PROBLEM-REPORT-FORM.  To ensure that you see responses,
-please do one of the following:
-
-    1) Subscribe to the ace-users mail list, by sending email with
-       contents "subscribe ace-users" to majordomo@cs.wustl.edu.
-
-    2) Or, monitor the comp.soft-sys.ace newsgroup for responses.
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index 21752895278..ee5d2134a4f 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -25,7 +25,7 @@
 To: ace-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 4.6.46
+    ACE VERSION: 4.6.43
 
     HOST MACHINE and OPERATING SYSTEM:
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
diff --git a/STL/ACE_Changes b/STL/ACE_Changes
deleted file mode 100644
index 902fb94c94c..00000000000
--- a/STL/ACE_Changes
+++ /dev/null
@@ -1,53 +0,0 @@
-This version of STL was obtained from
-http://www.rahul.net/terris/.  This is a modified version of the
-implementation that comes with VC++4.0.  Please see readme2.stl for
-details. 
-
-The following modification have been made for compilation with VC++4.x
-
-________________________________________
-
-vector.h (line 85)
-________________________________________
-
-
-    /*
-     *  This is cause the VC++ compiler sucks
-     *  and does not recognize nested classes properly
-     *       
-     */
-#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM)
-    vector(size_type n, const T& value = T()) {
-	start = static_allocator.allocate(n);
-	uninitialized_fill_n(start, n, value);
-	finish = start + n;
-	end_of_storage = finish;
-    }
-#endif /* VC_PLUS_PLUS_NESTED_CLASS_PROBLEM */
-
-
-________________________________________
-
-bstring.h (line 1102)
-________________________________________
-
-
-    /* 
-     * This should be correctly scoped
-     *
-     * if (cap == ::reserve)
-     */
-
-    if (cap == std::reserve)
-    {
-       len = 0;
-       res = size;
-       ptr = new charT [res];
-    }
-    /* 
-     * This should be correctly scoped
-     *
-     *     else if ((cap == ::default_size) && (size != NPOS))
-     */
-
-    else if ((cap == std::default_size) && (size != NPOS))
diff --git a/STL/readme2.stl b/STL/readme2.stl
deleted file mode 100644
index 5132bc1189b..00000000000
--- a/STL/readme2.stl
+++ /dev/null
@@ -1,272 +0,0 @@
-STL2.ZIP
-
-Standard Template Library for Visual C++ 4.0 
-and Related Classes
-
-Revised 10/15/96 - Bug fixes and change to bit_vector.
-
-This version supports DLLs and threading.  You must use critical
-sections around code that uses the same container in different
-threads.  These features come at a price -- since memory
-usage is not optimal, this code may use more memory and
-may be slower.
-
-+ General strategy: Remove all statics except the
-  static allocator objects.  
-+ Vectors were not affected.
-+ Major changes made to tree.h
-+ Stability: Very stable.
-
-This code should be considered for experimental use only.  There
-are still statics lurking in some functions; these functions
-are not thread-safe.
-
--------------------------
-Fix for bit_vector
--------------------------
-This version also has a fix for bit_vector, which doesn't really
-work with VC++ 4.x.  Please include bvector.cpp in your
-project if you use bit_vector.  This fixes the linker errors
-that occur if you use bector.h in multiple .cpp files.
-
--------------------------
-Disclaimer
--------------------------
-Code is provided without warranty, liability, or technical support.
-
-STL.H and PTR.H are freely distributable and can be 
-modified in any way.
-
---------------------------------
-STRING.H does not compile.
---------------------------------
-
-"D. Pirzadeh" <ddp@crl.com> Explains how to fix:
-
-First, I got compile errors in "bstring.h"
-and changed it as follows to correct:
-        line 1104               "::reserve" -> "std::reserve"
-        line 1110               "::default_size" -> "std::default_size"
-
-Also, I got an INTERNAL COMPILER ERROR with Visual C++ v4.0 when I did the fol-
-lowing:
-        class xyz : public std::string { }
-
-I fixed it with:
-        typedef std::string XyzString;
-        class xyz : public XyzString { }
-
---------------------------------
-Changes made to STL distribution
---------------------------------
-
-These files were modified from the STL distribution shipped with 
-Microsoft Visual C++ 4.0.  The files here are a complete,
-working version of the STL.  These files have been tested with
-MFC applications.
-
-Changes were made to practically all header files.  Look for
-comments like:
-
-*Added by...
-*Changed by...
- 
-------------------
-Usage Instructions
-------------------
-
-Set the preprocessor variable NOMINMAX.
-
-As Microsoft recommends, the STL is compiled in the std namespace.
-
-When including these files, do **not** do this:
-
-	namespace std
-	{
-	  #include <vector.h>
-	}
-
-Instead, do this:
-
-	#include <vector.h>
-
-Recommended usage:
-
-	First, include:
-
-	#include <afxwin.h>
-	#include <afxext.h>
-	#include <afxtempl.h>
-
-	Then include the STL header files.
-
--------------------
-Support for CString
--------------------
-The stl.h file contains code written by me.  The file contains
-operators that will allow you to use CString objects with STL
-containers and functions.
-
-!!!! CString will not work with STL unless you include <stl.h> !!!!
-
--------------------------------------------
-Helper functions for pointers-in-containers
--------------------------------------------
-There is a file called stl.h which contains two functions:
-  SequenceDelete
-  MapDelete
-These functions send "delete" to all of the objects in a container.
-
-If you don't like this approach, you can use a supplied "pointer
-wrapper" class.
-
-There is a file called ptr.h which contains a class called Ptr 
-that can be used exactly like a pointer.  The object has a pointer 
-inside it that points to an object of any class.  When a Ptr object 
-is deleted, "delete" is sent to its underlying pointer.  Ptr can be 
-used with any STL container, as it has a copy constructor and 
-assignment operator, which transfers "ownership" of the pointer from 
-the source object to the destination object.  Ptr is from the book 
-Design Patterns by Gamma et al -- see the Proxy pattern.  
-
-The Ptr class makes memory leaks impossible, because it deletes
-objects automatically when the container is deleted, or when 
-functions like "delete" are used.
-
-Example:
-
-  This is a vector of CStrings:
-
-  std::vector< Ptr<CString> > StringVector;
-
-  StringVector.push_back( Ptr( new CString( "hello" ) ) );
-  StringVector.push_back( Ptr( new CString( "This is another string" ) ) );
-
-------------------------
-Common Problems with STL
-------------------------
-
-1) Compiler error: != is ambiguous
-
-   Solution: put the following line at the beginning of the method
-             that caused the error:
-
-   using namespace std;
-
-2) When using maps, the debugger crashes.
-
-   This is because symbols for maps (actually, for the "pair")
-   get truncated to 255 characters.  Solution:  Turn off the
-   variables window in the debugger.  Don't try to look at
-   a symbol that has been truncated.  This is not an STL-specific
-   bug --  It's a bug in the debugger.
-
-3) All sorts of compile errors in STL header files
-
-   Make sure the preprocessor variable NOMINMAX is defined
-
-
-4) Compiler errors about "operator < is not available", etc.
-   The class involved has global comparison operators.
-
-   Solution:
-   Write "routers" in the std namespace to the global namespace.
-   Example (see also stl.h - this is how CString is able
-   to work with STL):
-
-	namespace std
-	{
-		BOOL operator < ( const MyClass & rLhs,
-				  const AnotherClass & rRhs )
-		{
-		return ::operator < ( rLhs, rRhs );
-		}
-	}
-
-   See also 5.
-
-5) When you use find() or another algorithm, the compiler
-   complains that it cannot find the == or < operators.
-
-If your code compiles without any error messages, then disregard
-this section.  However, if you get errors like "cannot convert
-first argument from const class X" then read on. 
-
-I am assuming that your code is calling an STL algorithm like
-std::sort() or std::find().  If you're not, I can't help
-you.
-
-There is apparently a bug in the Microsoft compiler regarding
-namespaces.  Namespaces cannot locate global 
-functions that reside in the global namespace.  For example, 
-the binary == operator.
-
-Maybe this is a bug, maybe it isn't.  This is not clear
-to me.  However, I do know what works and have tried many other
-approaches that do not work.  If you have a better solution I
-would appreciate it if you could let me know about it. 
-
-So, if you declare your own class and want to use algorithms 
-like find() on an STL container, you have two choices:
-
-(1) Declare == as a member function.
-(2) Declare global operators == and !=.
-
-(1) simply works.  There will come a time, however, when (1)
-won't satisfy your needs.  If A == B, then B == A.  You can't
-do this using member functions if A and B are from different 
-classes.
-
-If you choose (2), you must add the != operator to the std
-namespace.  There are two ways to do this.  First, you can do
-this:
-   namespace std
-   { 
-     inline operator != ( const MyClass &rLhs, const MyClass &rRhs )
-     {
-       return ::operator != ( rLhs, rRhs );
-     }
-   }
-This "routes" != from the std namespace to the global namespace.
-
-Note that ( lhs != rhs ) can be derived from the == operator
-as !( lhs == rhs ).  There is a macro in STL.H, 
-STL_DECLARE_GLOBAL_NE, that does this derivation. 
-This derivation will not work when for whatever reason, !(lhs == rhs)
-is not the same as ( lhs != rhs ).
-
-The following example shows what you have to do for find().  Other
-algorithms require you to declare <, <=, and >= too.  See the
-macros STL_DECLARE_GLOBAL_GE, STL_DECLARE_GLOBAL_LT, and
-STL_GLOBAL_LE.  These macros derive new comparison operators
-from "operator <( const T&, const T& )".
-
-class MyClass
-{
-  public:
-  
-  int units;
-  CString description;
-};
-
-// We want to be able to test two MyClass objects against each other
-// in STL.  Need to create a global operator for this purpose.
-// Since we use find(), we need to declare not-equal too.
-bool operator == ( const MyClass &, const MyClass & );
-STL_DECLARE_GLOBAL_NE( MyClass, MyClass )
-
-// These operators test for a matching description.
-// We do A == B and B == A to be consistent.
-bool operator == ( const MyClass&, const CString & );
-bool operator == ( const CString&, const MyClass & );
-STL_DECLARE_GLOBAL_NE( MyClass, CString )
-STL_DECLARE_GLOBAL_NE( CString, MyClass )
-
-6. Errors when creating vectors that have vectors and deques
-   that have deques.
-
-   Solution:  Provide atruments to the constructor.
-
-    std::vector< std::vector<int> >
-      TwoDimensional( 0, std::vector<int>() );
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/Makefile b/TAO/Benchmark/Marshal_Test/Orbix/Makefile
index 240b57926a3..159d7beaa6b 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/Makefile
+++ b/TAO/Benchmark/Marshal_Test/Orbix/Makefile
@@ -24,11 +24,15 @@ MARSHAL_SERVER_OBJS = marshalS.o orbix_marshal_impl.o orbix_marshal_server.o ser
 endif
 BIN = client server
 
+BUILD = $(BIN)
+
 #CLIENT_LIBS	= -lITini -liiop -lorbix
 #SERVER_LIBS	= -lITini -liiop -lDSI -lorbix -lIRclt
 CLIENT_LIBS	= -liiop -lorbix
 SERVER_LIBS	= -liiop -lDSI -lorbix -lIRclt
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/Benchmark/Marshal_Test/TAO/Makefile b/TAO/Benchmark/Marshal_Test/TAO/Makefile
index 93dcaab7b66..8e512953752 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/Makefile
+++ b/TAO/Benchmark/Marshal_Test/TAO/Makefile
@@ -21,6 +21,10 @@ MARSHAL_SERVER_OBJS = marshalC.o marshalS.o tao_marshal_impl.o tao_marshal_serve
 
 BIN = client server
 
+BUILD = $(BIN)
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile b/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile
index 2b281d3daad..3b0bf024df4 100644
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile
+++ b/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile
@@ -21,6 +21,10 @@ MARSHAL_SERVER_OBJS = marshalC.o marshalS.o visi_marshal_impl.o visi_marshal_ser
 
 BIN = client server
 
+BUILD = $(BIN)
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/Benchmark/benchmark/Makefile b/TAO/Benchmark/benchmark/Makefile
index 38dc2215423..9f5327741bf 100644
--- a/TAO/Benchmark/benchmark/Makefile
+++ b/TAO/Benchmark/benchmark/Makefile
@@ -21,6 +21,9 @@ LSRC	= $(addsuffix .cpp,$(FILES))
 
 LDLIBS = -lACE
 LIBS = -lACE
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+BUILD	= $(VSHLIB) $(VLIB)
 
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 3eae4350df5..fe6af269eb9 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,2113 +1,461 @@
-Mon Jul 26 12:37:20 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+Mon Jul 26 13:18:57 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tao/Reply_Dispatcher.cpp:
+	  Optimized reply dispatching, there is no need to create a new
+	  CORBA_Environment (which is an expensive operation) when there
+	  is a TSS environment object available.
+
+	* performance-tests/Latency/Makefile:
+	* performance-tests/Latency/ami-latency-client.cpp:
+	* performance-tests/Latency/ami-throughput-client.cpp:
+	* performance-tests/Latency/client-st-muxed.conf:
+	* performance-tests/Latency/client.cpp:
+	* performance-tests/Latency/st-client.cpp:
+	* performance-tests/Latency/test.idl:
+	* performance-tests/Latency/test_i.cpp:
+	* performance-tests/Latency/test_i.h:
+	  To measure round-trip latencies in two-way asynchronous requests 
+	  we simply send the time-stamp as an argument for the request,
+	  which is returned and used in the ReplyHandler to measure the
+	  delay.
+
+Wed Jul 21 21:08:57 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* examples/Makefile:
+	* examples/AMI/Makefile:
+	* examples/AMI/FL_Callback/Makefile:
+	* examples/AMI/FL_Callback/README:
+	* examples/AMI/FL_Callback/test.idl:
+	* examples/AMI/FL_Callback/Peer_i.cpp:
+	* examples/AMI/FL_Callback/Peer_i.h:
+	* examples/AMI/FL_Callback/Peer_i.i:
+	* examples/AMI/FL_Callback/Progress_i.cpp:
+	* examples/AMI/FL_Callback/Progress_i.h:
+	* examples/AMI/FL_Callback/Progress_i.i:
+	* examples/AMI/FL_Callback/peer.conf:
+	* examples/AMI/FL_Callback/peer.cpp:
+	* examples/AMI/FL_Callback/progress.cpp:
+	* examples/AMI/FL_Callback/svc.conf:
+	  New demo for asynchronous messaging, it uses a simple GUI to
+	  display the progress in the clients as requests and replys are
+	  sent asynchronously.
+
+	* TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp:
+	  The _nil() methods where not generated properly.
+
+	* TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp:
+	  The "smart stubs" where not working for void functions without
+	  out or inout arguments, thanks to Michael for helping me out
+	  with this fix.
+
+Wed Jul 21 12:26:21 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	* performance-test/Latency/Makefile
+	* performance-test/Latency/README
+	* performance-test/Latency/client-st-exclusive.conf
+	* performance-test/Latency/client-st-muxed.conf
+	* performance-test/Latency/client.cpp
+	* performance-test/Latency/server.conf
+	* performance-test/Latency/server.cpp
+	* performance-test/Latency/st-client.cpp : Test suite for AMI.
+  
+	* performance-test/Latency/ami-throughput-client.cpp : Added this test.
+
+Sun Jul 18 20:33:55 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+  
+	* performance-test/Latency/client.exclusive.conf : Removed this
+	  file. I have conf files for st and mt case separately now. 
+  
+	* performance-test/Latency/Makefile : Added the st-client test and
+	  AMI test.  To compile AMI  make AMI=1. But you cannot use the
+	  testC.cpp generated by TAO IDL. You should use
+	  test-handC.cpp. You should just copy this file onto testC.cpp.  
+  	
+	* performance-test/Latency/ami-latency-client.cpp : AMI test. 
+  
+	* performance-test/Latency/st-client.cpp : Single threaded SMI
+	  test. 
+  
+	* performance-test/Latency/client-st-exclusive.conf : SMI
+	  test. Wait on Reactor.
+  
+	* performance-test/Latency/client-mt-exclusive.conf : SMI wait on
+	  leader follower.
+  
+	* tao/Invocation.cpp
+	* tao/Pluggable.cpp
+	* tao/Pluggable.h
+	* tao/Transport_Mux_Strategy.cpp
+	* tao/Transport_Mux_Strategy.h
+	  
+    	  Removed the unnessary accessors for the reply_received
+	  flag. Added comments about addressing the problem of "idling the
+	  Transport after an asynchronous reply is received over an
+	  exclusive connection.
+	  	
+Sat Jul 17 10:53:49 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+  
+	* tao/GIOP.h
+	* tao/Object_Adapter.cpp
+	* tao/Object_Adapter.h
+	* tao/Object_Adapter.i
+	* tao/Reply_Dispatcher.cpp
+	* tao/Stub.cpp : Merged the changes Carlos and Irfan did in the
+	  main brach fixing the memory leaks and optimizing a few locks
+	  here and there. 
+  
+	* performance-tests/Latency/Makefile
+	* performance-tests/Latency/client.cpp
+	* performance-tests/Latency/test.idl
+	* performance-tests/Latency/test_i.cpp
+	* performance-tests/Latency/test_i.h
+	* performance-tests/Latency/client.exclusive.conf
+	* performance-tests/Latency/ami-latency-client.cpp
+	* performance-tests/Latency/client-st-muxed.conf : Latency test is
+	  in place now. This should do for Throughput meaurement also.  
+
+Fri Jul 16 12:20:50 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	* tests/AMI/client.cpp: Cosmetic changes. 
+	* tao/Reply_Dispatcher.cpp: Removed the unneccessary ACE_DEBUG's.  
+
+	* tests/AMI/README
+	* tests/AMI/client.conf
+	* tests/AMI/client.cpp
+	* tests/AMI/client.muxed.conf
+	* tests/AMI/run_test.pl
+	* tests/AMI/server.cpp
+	* tests/AMI/simple-client.cpp
+	* tests/AMI/test-handC.cpp
+	* tests/AMI/test.idl
+	* tests/AMI/test_i.cpp
+	* tests/AMI/test_i.h : Latest and the greates AMI test. Got it to
+	  work with MT as well as ST configuration. MUXED as well as
+	  EXCLUSIVE configuation. 
+  	  run_test.pl is not set up yet. 
+          There are some minor fixes needed for the TAO IDL compiler to
+	  generate correct AMI code. Right now, once the TAO IDL compiler
+	  generates the files, rewrite testC.cpp by test-handC.cpp which
+	  has the hand crafted correct code for AMI.
+
+Thu Jul 15 20:48:48 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+  
+	* tao/Client_Strategy_Factory.cpp
+	* tao/Client_Strategy_Factory.h
+	* tao/ORB_Core.cpp
+	* tao/Pluggable.cpp
+	* tao/Reply_Dispatcher.cpp
+	* tao/Reply_Dispatcher.h
+	* tao/Transport_Mux_Strategy.cpp
+	* tao/Transport_Mux_Strategy.h
+	* tao/Wait_Strategy.cpp
+	* tao/default_client.cpp
+	* tao/default_client.h : Changes are in for the Muxed Leader
+	  Follower implementation.   
+  
+Tue Jul 13 23:32:05 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+  
+	* tests/NestedUpcall/Simple/simple-client.cpp
+	* tests/MT_Client/simple-client.conf
+	* tests/MT_Client/client_muxed.conf : Added these files.
+  
+	* tests/NestedUpcall/Simple/client.cpp
+	* tests/NestedUpcall/Simple/server.cpp : cosmetic changes. 
+  
+	* tao/ORB_Core.cpp
+	* tao/Reply_Dispatcher.cpp
+	* tao/Reply_Dispatcher.h
+	* tao/Wait_Strategy.cpp : Integrated Carlos's changes to the
+	  leader follower model done in the main branch.
+
+Tue Jul 13 16:15:43 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	* tao/Wait_Strategy.cpp:  Added debug statements. 
+	* tao/GIOP.cpp : Modifications to the dump message routine.   
+  
+	* tao/IIOP_Connect.cpp
+	* tao/IIOP_Connect.h
+	* tao/ORB_Core.cpp
+	* tao/ORB_Core.h
+	* tao/Pluggable.cpp
+	* tao/Pluggable.h
+	* tao/Reply_Dispatcher.cpp
+	* tao/Reply_Dispatcher.h
+	* tao/UIOP_Connect.cpp
+	* tao/UIOP_Connect.h
+	* tao/Wait_Strategy.cpp
+	* tao/Wait_Strategy.h 
+  	  Changes for the Muxed Leader Follower Wait Strategy. This is
+	  leader follower will be created when MT connection handler and
+	  MUXED transport is selected.
+
+Mon Jul 12 22:55:55 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	* tao/GIOP.cpp
+	* tao/GIOP.h
+	* tao/IIOP_Connect.cpp
+	* tao/IIOP_Connect.h
+	* tao/UIOP_Connect.cpp
+	* tao/UIOP_Connect.h  
+  	  Successfully finished implementing the Muxed Transport
+	  implementation, but still single threaded. The cool thing is
+	  that the NestedUpcall also works on the Muxed Transport
+	  case. Needed to make some changes on the Server Connection
+	  Handler also, so that it resets the message state before making
+	  the upcall. We steal the CDR from there on the stack. 
+  
+Sun Jul 11 14:45:31 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+  
+	* tao/Wait_Strategy.cpp
+	* tao/Wait_Strategy.h
+	* tao/default_client.cpp
+	  Moved the Leader Follower implementation to Exclusive Leader
+	  Follower class, leaving way for implementing the new Muxed
+	  Leader Follower implementation.  		
+
+	* tao/Invocation.cpp
+	* tao/Invocation.h
+	* tao/Pluggable.cpp
+	* tao/Pluggable.h
+	* tao/Reply_Dispatcher.cpp
+	* tao/Reply_Dispatcher.h
+	* tao/Wait_Strategy.cpp
+	* tao/Wait_Strategy.h
+	  Terminating reactor event loop based on the reply_received flag
+	  in the reply dispatcher. Reference to this
+	  <reply_dispatcher::reply_received_> is passed to the wait
+	  strategy from the Invocation class. 
+  
+Sat Jul 10 16:50:23 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	* tao/Invocation.h:
+  	* tao/Invocation.cpp:  Added distructors for the Synchronous
+	  Invocations classes.   
+
+Sat Jul  10 15:30:00 1999  Michael Kircher  <mk1@cs.wustl.edu>
+
+	* TAO_IDL/be/be_visitor_operation/ami_handler_thru_poa_collocated_ch.cpp
+	* TAO_IDL/be_include/be_visitor_operation/ami_handler_thru_poa_collocated_ch.h:
+	  Added these files to generate AMI Reply Handler code.
+
+	* TAO_IDL/be/be_decl.cpp * TAO_IDL/be/be_helper.cpp * TAO_IDL/be/be_interface.cpp 
+	* TAO_IDL/be/be_interface_fwd.cpp 
+	* TAO_IDL/be/be_predefined_type.cpp 
+	* TAO_IDL/be/be_sequence.cpp
+	* TAO_IDL/be/be_structure.cpp * TAO_IDL/be/be_type.cpp 
+	* TAO_IDL/be/be_union.cpp 
+	* TAO_IDL/be/be_union_branch.cpp 
+	* TAO_IDL/be/be_valuetype.cpp
+	* TAO_IDL/be/be_valuetype_fwd.cpp
+	* TAO_IDL/be/be_visitor_factory.cpp
+	* TAO_IDL/be/be_visitor_interface.cpp
+	* TAO_IDL/be/be_visitor_operation.cpp
+	* TAO_IDL/be/be_visitor_rettype.cpp
+	* TAO_IDL/be/be_visitor_scope.cpp
+	* TAO_IDL/be/be_visitor_argument/argument.cpp
+	* TAO_IDL/be/be_visitor_array/array_ch.cpp
+	* TAO_IDL/be/be_visitor_array/array_ci.cpp
+	* TAO_IDL/be/be_visitor_array/array_cs.cpp
+	* TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
+	* TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp
+	* TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
+	* TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+	* TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
+	* TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_cs.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
+	* TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
+	* TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+	* TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp
+	* TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
+	* TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
+	* TAO_IDL/be/be_visitor_interface/interface.cpp
+	* TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+	* TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+	* TAO_IDL/be/be_visitor_interface/interface_ih.cpp
+	* TAO_IDL/be/be_visitor_interface/interface_is.cpp
+	* TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+	* TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+	* TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
+	* TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
+	* TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+	* TAO_IDL/be/be_visitor_interface/tie_si.cpp
+	* TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/argument.cpp
+	* TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
+	* TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/operation_is.cpp
+	* TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+	* TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
+	* TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
+	* TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp
+	* TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp
+	* TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp
+	* TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp
+	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
+	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
+	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp
+	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp
+	* TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+	* TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
+	* TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+	* TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+	* TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp
+	* TAO_IDL/be/be_visitor_union/union_ch.cpp
+	* TAO_IDL/be/be_visitor_union/union_ci.cpp
+	* TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
+	* TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp
+	* TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
+	* TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
+	* TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
+	* TAO_IDL/be/be_visitor_valuetype/field_cdr_ci.cpp
+	* TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+	* TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+	* TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+	* TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+	* TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
+	* TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+	* TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+	* TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+	* TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ch.cpp
+	* TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ci.cpp
+	* TAO_IDL/be_include/be_codegen.h
+	* TAO_IDL/be_include/be_decl.h
+	* TAO_IDL/be_include/be_helper.h
+	* TAO_IDL/be_include/be_interface.h
+	* TAO_IDL/be_include/be_visitor_interface.h
+	* TAO_IDL/be_include/be_visitor_operation.h:
+	  Edited all the files to generate AMI Handler code, I also 
+	  changed "fullname ()" methods to "full_name ()" to 
+	  be more consistent. The code generation for AMI
+	  Handlers uses a strategy on the be_interface node.
+	  This strategy hides all the differences betwenn
+	  the name generations.
+
+	* tao/PollableC.cpp:
+	  Fixed the the usage of env instead of ACE_TRY_ENV.
 
-        * TAO version 0.4.3 released.
-
-Mon Jul 26 12:25:55 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-	* docs/Options.html:
-
-	  Added comments explaining that -ORBEndpoint is a server side
-	  option and -ORBPreconnect is a client side option.  Also
-	  clarified use of -ORBInitRef and -ORBDefaultInitRef with UIOP
-	  IORs.
-
-Mon Jul 26 10:42:26 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-	* orbsvcs/examples/CosEC/Factory: Added a README file.
-	  Thanks to Pradeep Gore for contributing this.
-
-Fri Jul 23 17:54:45 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-	* tao/Acceptor_Impl.cpp (TAO_Accept_Strategy): Added a new accept
-	  strategy that purges old connections when it runs out of
-	  descriptors.
-
-	* tao/IIOP_Acceptor.cpp (open):
-	* tao/UIOP_Acceptor.cpp (open):
-
-	  Changed the acceptors to use the new accept strategy.
-
-	* tests/Connection_Purging/Connection_Purging.cpp:
-
-	  - Added handle gobbling to this test in order to reduce the
-	    number of iterations required to make purging happen.
-
-	  - Added the ability to go back and reinvoke on old servers.
-	    This will check whether the purging did the right thing.
-
-Fri Jul 23 17:23:07 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* tao/Transport_Mux_Strategy.cpp:
-	  Fixed return value when the request id does not match. This is
-	  not always an error, for example if an old reply for a timedout
-	  request arrives while we are waiting for another requests.
-
-Fri Jul 23 16:50:04 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-	* tao/ORB.cpp (_get_collocated_servant): Further simplify the
-	  collocation seach method by pushing the collocation strategy
-	  check into _find_collocated_servant.
-
-	  (_find_collocated_servant): Make sure that we only search the
-	  ORB for the collocation when the strategies used by the ORB
-	  allows us to do it.
-
-Fri Jul 23 15:03:01 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* tao/ORB.h:
-	* tao/ORB.i:
-	* tao/ORB.cpp:
-	* tao/ORB_Core.h:
-	* tao/ORB_Core.i:
-	* tao/ORB_Core.cpp:
-	  Fixed shutdown problems when there is a client thread still
-	  running. This fixed the problems with the Faults, Timeout,
-	  EC_Throughput and EC_Custom_Marshal tests.
-
-Fri Jul 23 14:53:40 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-	* performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp:
-	  Changed the ior output file flag to -f.
-
-Fri Jul 23 12:17:04 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-	* performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf: We
-	  can't use TSS resource in this test because it shuts down the
-	  wrong reactor.
-
-Fri Jul 23 13:23:04 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* tao/PolicyC.cpp:
-	  Fixed problem in unchecked_narrow(), it was creating remote
-	  policy stubs all the time. Thanks to David for pointing this
-	  out.
-
-Fri Jul 23 12:01:34 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-	* TAO/tests/IDL_Test/namespace_check.cpp:
-	   New file that includes files generated from reopened_modules.idl
-	   if ACE_HAS_USING_KEYWORD is defined. Reopened
-	   modules are mapped to reopened namespaces, and platforms
-	   without namespaces cannot handle this, even with the
-	   TAO_NAMESPACE macro. If this is the case, the file
-	   namespace_check.cpp will be empty after preprocessing.
-
-	* TAO/tests/IDL_Test/Makefile:
-	* TAO/tests/IDL_Test/README:
-	   Changed to reflect the above addition.
-
-	* TAO/tests/IDL_Test/reopened_modules.idl:
-	* TAO/tests/IDL_Test/interface.idl:
-	* TAO/tests/IDL_Test/sequence.idl
-	   New examples added.
-
-	* TAO_IDL/util/utl_scope.cpp:
-	   Further tweaking of the lookup_by_name() method,
-	   in response to a bug report. Thanks to
-	   Ruud Diterwich<R.M.L.Diterwich@marin.nl>
-	   for sending in the example.
-
-	* TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp:
-	   Added code generation for an explicit temporary in
-	   CDR extraction operator of multi-dimensional array
-	   where base type is a typedef, rather than just
-	   putting a constructor on the rhs of the >> operator
-	   in the FOR loop. SunOS/egcs complained about
-	   lvalue/rvalue stuff.
-
-	* TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
-	* TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp:
-	* TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
-	   Added #if !defined guards around CDR operator
-	   declarations and definitions if the sequence is
-	   anonymous. A struct or a union could contain an
-	   anonymous sequence of the same type more than once,
-	   and the body of the CDR operators would also appear
-	   more than once in generated code, leading to C++
-	   compile errors. Thanks to Roger Egbers <regbers@isrglobal.com>
-	   for sending in the example.
-
-Fri Jul 23 11:37:49 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/IOR_Multicast.cpp (handle_input): Use get_host_addr()
-	  rather than get_host_name() to avoid failures where DHCP can't
- 	  resolve the remote host name.  Thanks to Andrew G. Harvey
- 	  <agh@cisco.com> for reporting this.
-
-Fri Jul 23 08:53:52 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-	* TAO_IDL/be/be_type.cpp (nested_type_name): There was an error in
-	  the computation of the string length that we use to do string
-	  comparison. This error resulted due to a copy/paste which was
-	  causing errors in generated code. This bug report was passed to
-	  me by Jeff Parsons. Thanks to Alex Hornby <alex@anvil.co.uk> for
-	  submitting the bug report.
-
-Fri Jul 23 02:13:44 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-	* tao/ORB_Core.cpp (init): Generate a warning message if we see
-	  '-ORBCollocation YES'.  We still accept this option but it
-	  implies using global collocation table.  Thanks to Irfan for
-	  suggesting this.
-
-Fri Jul 23 02:02:21 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-	* tao/ORB.cpp (_get_collocated_servant): The origianl
-	  implementation was somewhat broken in that it check the
-	  collocation strategy of the client ORB to determine whether an
-	  object is collocated or not.  However, the server ORB's
-	  collocation strategy should be the one that determine whether an
-	  object be considered collocated or not.  The revised
-	  implementation now check with the the client ORB first if the
-	  client ORB allows collocation.  If yes, regardless of the
-	  collocation table strategy, we check to see if the object
-	  resides in the same ORB or not.  If not, we then check the
-	  global collocation table which only contains information of ORBs
-	  that use global collocation table strategy.
-
-	  (key_to_object): This method should also respect the ORB's
-	  collocation strategy so we can generate the right stubs from POA
-	  if collocation optimization is turned off.
-
-Thu Jul 22 21:13:25 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-	* tao/Object.cpp (_non_existent): This function can also enjoy the
-	  benefit of collocated object.
-
-Thu Jul 22 15:05:21 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* tao/Invocation.cpp:
-	  Fixed timeout computation it was off by a factor of 10 (thanks
-	  to the OMG 1/10 of a microsecond units!)
-
-	* tao/Wait_Strategy.cpp:
-	  Improved loop conditions to cope with reactors that return 0
-	  even when there is no timeout. Thanks to Irfan for pointing this
-	  out.
-
-	* orbsvcs/tests/Event/lib/Makefile:
-	* orbsvcs/tests/Event/lib/Consumer.h:
-	* orbsvcs/tests/Event/lib/Consumer.cpp:
-	* orbsvcs/tests/Event/lib/Driver.h:
-	* orbsvcs/tests/Event/lib/Driver.i:
-	* orbsvcs/tests/Event/lib/Driver.cpp:
-	* orbsvcs/tests/Event/lib/Supplier.h:
-	* orbsvcs/tests/Event/lib/Supplier.cpp:
-	* orbsvcs/tests/Event/Basic/Reconnect.h:
-	* orbsvcs/tests/Event/Basic/Reconnect.cpp:
-	* orbsvcs/tests/Event/Performance/Makefile:
-	* orbsvcs/tests/Event/Performance/Connect.h:
-	* orbsvcs/tests/Event/Performance/Connect.cpp:
-	  Changed to use the ACE_Throughput_Stats class, this is more
-	  portable and works on platforms without 64-bit support, thanks
-	  to David Levine for pointing this out.
-
-Thu Jul 22 14:10:47 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/benchmark/client.cpp:
-          removed ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-          explicit instantiation because it's in tao/IIOP_Connector.cpp.
-          removed ACE_Task<ACE_SYNCH> explicit instantiation because
-          it's in ace/Service_Types.cpp.  With these deletions,
-          client builds successfully on Green Hills/VxWorks.  Thanks
-          to Denis Ouellet <douellet@gel.ulaval.ca> for reporting this.
-
-Thu Jul 22 14:03:26 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Pluggable/server.cpp (main): removed
-          ACE_NOTREACHED wrapper from final return 0 statement,
-          and removed the return 0 in the main try block.  This
-          avoids a warning from Green Hills that the main ()
-          could return without a value.  Not any more.
-
-Thu Jul 22 11:06:44 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
-          (visit_interface):  I should use obj.in() to pass the object
-          into _uncheck_narrow().  Thanks to David and Carlos for pointing
-          this out.
-
-Thu Jul 22 07:21:03 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/GIOP_Server_Request.cpp: added #include of tao/ORB.h,
-          so compilation will succeed with TAO_HAS_MINIMUM_CORBA.
-          Thanks to Erik Johannes <ejohannes@oresis.com> for reporting
-          this.
-
-Thu Jul 22 07:12:07 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/PolicyC.cpp (_unchecked_narrow): added ACE_TRY_ENV
-          argument declaration, because it's used with
-          TAO_HAS_LOCALITY_CONSTRAINT_POLICIES.  Added
-          ACE_UNUSED_ARG (ACE_TRY_ENV) without those policies.
-          Thanks to Erik Johannes <ejohannes@oresis.com> for reporting
-          that compilation failed with TAO_HAS_LOCALITY_CONSTRAINT_POLICIES.
-
-Thu Jul 22 02:14:24 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Connection_Purging: This program tests automatic purging
-          in TAO.
-
-        * tests/POA/Destruction/Destruction.dsp (BuildCmds):
-        * tests/POA/Deactivation/Deactivation.dsp (BuildCmds):
-
-          Added C.h to list of IDL compiler output files.
-
-        * tao/default_resource.cpp (TAO_Default_Resource_Factory):
-          Initialized <connection_caching_type_> and <purge_percentage_>.
-
-        * tests/POA/Deactivation/Deactivation.cpp (main): Made sure to
-          destroy the Root POA to avoid memory leaks.
-
-        * tao/ORB_Core.cpp (init): Checking for environment variable
-          TAO_ORB_DEBUG should happen before checking the ORBDebugLevel
-          command line option.
-
-Wed Jul 21 23:38:28 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
-          (visit_interface): The generated _this method was producing
-          collocated object references even when the collocation
-          optimization in servant orb was disabled.  It should return
-          regular (remote) stubs in this case.  Thanks to Irfan for
-          pointing this out.
-
-Wed Jul 21 03:20:16 1999 Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * Connection Caching Feature
-          --------------------------
-
-          Motivation:
-
-          In TAO, open connections are stored in a connection cache and
-          reused for the subsequent requests between the same client and
-          server.  This is done to avoid the cost of establishing new
-          connections. Every connection needs a OS handle which has to
-          obtained from the OS. The OS can allot only a fixed number of
-          handles to a process.  This can become a issue in case of
-          clients and servers with multiple handles open who may not be
-          allowed to establish a new connection as the process has run out
-          of handles.
-
-          Aim:
-
-          Clients and servers should be able to to continue making new
-          connections by tearing down "old" connections.
-
-          Solution: Auto-purging
-
-          The connections are stored in a cache. When ever the connect
-          call fails due to the process running out of handles,
-          auto-purging will kick in and some "old" connections will be
-          removed from the connection cache.  The decision about which
-          connections are "old" is made by the caching strategies. The
-          percentage of existing connections to be purged is controlled by
-          a purge percent.
-
-          ACE classes: Caching_Utility, Cleanup_Stratgies, and
-          Caching_Strategies have been used.  Simple examples are
-          available in $ACE_ROOT/tests/Cached_Accept_Conn_Test.cpp and
-          $ACE_ROOT/tests/Cached_Conn_Test.cpp.
-
-          Note that the users can also purge handles used by the ORB
-          explicitly through TAO_Connector_Registry::purge_connections().
-          This can enable them to open new handles for their application.
-
-          Todo: Implement purging for new handles created by the Acceptor.
-          This will increase the scalability.
-
-          Usage: Through options to the Resource_Factory :-
-
-          -ORBConnectionCachingStrategy <lru/lfu/fifo/null>
-          -ORBPurgePercent <percentage>
-
-          Now for the changes made:
-
-        * tao/Connector_Registry.{h,cpp}:
-          Added a purge_connections () method which purges entries from
-          the connection cache of the different connectors registered with
-          the registry.
-
-        * tao/IIOP_Connector.{h,cpp}:
-        * tao/UIOP_Connector.{h,cpp}:
-          Changed Cached_Connect_Strategy to Cached_Connect_Strategy_Ex as
-          the connection strategy.  It contains the caching strategy which
-          decides the entries to remove on demand. A
-          Hash_Cache_Map_Manager is used to store connections and appends
-          each entry with special attributes used for purging
-          purposes.
-
-        * tao/orbconf.h:
-          Added:
-          TAO_CONNECTION_CACHING_STRATEGY (default) is LRU
-          TAO_PURGE_PERCENT (default) is 20%
-
-        * tao/Resource_Factory.{h,cpp}:
-          Added hooks for connection_caching_strategy_type and
-          purge_percent. Also an enum is added which is used for deciding
-          the different caching strategies.
-
-        * tao/default_resource.{h,cpp}:
-          Input from the user is parsed and the caching_stratgey_type and
-          purge_percent is decided.
-
-          Thanks to Irfan from the DOC group for being a great help and
-          guiding me on this project.
-
-Wed Jul 21 16:59:07 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_decl.cpp:
-          Added initialization of be_decl::has_constructor_ in the constructor.
-          Must have neglected to check this file in with my original fix,
-          and it broke IDL_Cubit. Thanks to David Levine for reporting the
-          error so I could catch my oversight.
-
-Wed Jul 21 16:06:38 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-          Modified _var and _forany copy constructor, deep copy assignment
-          operator, [] const operator, and .in() method code
-          generation to work with arrays of 3 or more dimensions.
-
-        * TAO/tests/IDL_Test/array.idl:
-        * TAO/tests/IDL_Test/typedef.idl:
-          Uncommented examples with 3-dimensional arrays.
-
-Wed Jul 21 12:31:09 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/Repository.cpp:
-          Added template instantiation for SunCC 5.0, the template is
-          already instantiated in libTAO.so, but the compiler is broken
-          and doesn't seem to find it.
-
-Wed Jul 21 12:05:15 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_visitor_union_branch.h:
-        * TAO_IDL/be/be_visitor_union_branch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-          Added gen_default_label_value() to be_visitor_union_branch.* and
-          added a call to this instead of gen_label_value() in code
-          generation of mutator method for a union branch if it is an
-          explicit default case. This particular bit of default case
-          functionality had not yet been implemented.
-
-Wed Jul 21 10:46:50 1999  Pradeep Gore  <pradeep@danzon.cs.wustl.edu>
-
-        * orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp:
-        * orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp:
-        * orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp:
-        * examples/Event_Comm/Notifier_Handler.cpp:
-        * examples/Event_Comm/Consumer_Handler.cpp:
-          fixed Green Hills compiler warnings for return values from methods.
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-          fixed Green Hills compiler warnings for return values from methods.
-          modified the <create> method to pass the POAManager to the
-          <create_POA> method.This fixes the problem of the factory not
-          working properly. Thanks to Alex Hornby <alex@anvil.co.uk> for
-          reporting this.
-
-Wed Jul 21 08:55:12 1999  Steve Huston  <shuston@riverace.com>
-
-        * TAO_IDL/driver/drv_preproc.cpp: For IBM C++ 3.6, add -qflag=w:w
-          to preprocessor options to quiet invalid #pragma info messages.
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
-          (TAO_RSE_Dependency_Visitor ctor): Removed extraneous type scoping
-          from arg list to compile on HP-UX aC++. Thanks to Brian Wallis for
-          this fix.
-
-Wed Jul 21 05:04:57 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/ORB.cpp (shutdown): Instead of wapup_all_thread, we need to
-          use end_reactor_event_loop () to notify the reactor it has been
-          deactivated.  This will ensure all ORB threads stop handling
-          events immediately.
-
-Wed Jul 21 02:36:51 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/Naming_Service/Naming_Service.dsp:
-        * orbsvcs/Naming_Service/Makefile: Changed the executable name
-          back to Naming_Service.
-
-        * examples/Callback_Quoter/run_test.pl:
-        * examples/Quoter/run_test.pl:
-        * orbsvcs/Naming_Service/Makefile:
-        * orbsvcs/tests/AVStreams/benchmark/run_test.pl:
-        * orbsvcs/tests/CosEC_Multiple/run_test.pl:
-        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
-        * orbsvcs/tests/EC_Multiple/run_test.pl:
-        * orbsvcs/tests/EC_Throughput/run_test.pl:
-        * orbsvcs/tests/Event_Latency/run_test.pl:
-        * orbsvcs/tests/Property/run_test.pl:
-        * orbsvcs/tests/Simple_Naming/run_test.pl: Changed the name of
-          Naming Service program from Naming_Server back to
-          Naming_Service.
-
-Tue Jul 20 22:37:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer.h:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Driver.h:
-        * orbsvcs/tests/EC_Throughput/ECT_Driver.i:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier.h:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-          Use the ACE_Throughput_Stats class to keep track of latency and
-          throughput.  This should eliminate the problems with VxWorks
-          which does not support 64-bit longs.
-
-        * tao/ObjectIDList.h:
-        * tao/ObjectIDList.i:
-        * tao/ObjectIDList.cpp:
-          Moved CDR operators to the .cpp file, they are not
-          time-critical, all CDR operators for sequences are defined in
-          the .cpp file and they were generating duplicate symbols.
-
-        * tests/InterOp-Naming/Makefile:
-          Updated dependencies and fixed SRC list
-
-        * tests/Param_Test/run_test.pl:
-          Increate the startup time for the server, it was timing out on
-          loaded systems
-
-Tue Jul 20 20:51:46 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp:
-          Added default case to switch statements generating cases for
-          CDR operators. If discriminant is an enum, some compilers
-          complain if all the enum values are not used and there
-          is not a default case in the switch, which is the case
-          when we have an implicit default case.
-
-Tue Jul 20 19:32:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp:
-          Fixed memory leaks in output_cdr_dblock_allocator method.
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf:
-          Fixed configuration for IDL cubit, we must use locks in the POA
-          to avoid dead-locks on shutdown.  Added a new file with the old
-          configuration so experiments can still be executed using a well
-          known configuration.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp:
-          The low priority thread was trying to use priorities in the RT
-          class, event though we were not allowed to do that.
-
-Tue Jul 20 19:16:00 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/ObjectIDList.{h,i}:
-
-          Added missing TAO_Export macros in class declarations and global
-          function definitions.
-
-Tue Jul 20 19:05:06 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_array.cpp:
-          Reverted addition of has_constructor() call - arrays
-          are always included in unions as pointers to the slice
-          anyway.
-
-        * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp:
-          Changed reference to be_type::SIZE_TYPE to
-          be_decl::SIZE_TYPE (where it actually resides).
-
-        * TAO_IDL/be/be_field.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-          Added calls to has_constructor() in comput_size_type().
-          They don't seem to be needed on NT, but Solaris egcs
-          seems to need them.
-
-Tue Jul 20 19:03:46 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/IIOP_Connector.cpp:
-        * tao/UIOP_Connector.cpp:
-        * tao/ORB.cpp:
-        * tao/Resource_Factory.cpp:
-
-          Moved template instantiations for TAO_Cached_Connector_Lock to
-          Resource_Factory.cpp since that file is a more appropriate
-          location to put them.
-
-Tue Jul 20 15:12:37 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_sunsoft.cpp:
-          Changed format of double literal output to use scientific notation
-          if necesssary. Thanks to Dwayne Burns <dburns@isrglobal.com> for
-          sending in the IDL file that called for this.
-
-        * TAO/tests/IDL_Test/constants.idl:
-          Added Dwayne's constants to the test file.
-
-Tue Jul 20 14:08:57 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Pluggable/PP_Test_Client.cpp:
-          Removed some ACE_NOTREACHED macros and helped out a bamboozled
-          vxworks compiler.
-
-Tue Jul 20 13:30:41 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp: Removed some
-          unnecessary ACE_CHECKs in the list method.
-
-Tue Jul 20 10:41:23 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/Event_Service/Makefile: for LynxOS/PPC only,
-          use -O instead of -O2 to avoid this compilation failure:
-
-          g++: Internal compiler error: program cc1plus got fatal signal 11
-
-Tue Jul 20 10:32:34 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Multiple/Makefile: for LynxOS/PPC only,
-          use -O instead of -O2 to avoid this compilation failure:
-
-          {standard input}: Assembler messages:
-          {standard input}:28076: Warning: end of file not at end of a line;
-            newline inserted
-          {standard input}:29949: Error: Unknown pseudo-op:  `.balig'
-          g++: Internal compiler error: program cc1plus got fatal signal 11
-
-Tue Jul 20 07:34:11 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
-          (universal_time): inserted missing 0x in front of
-          the magic constant on platforms that lack 64-bit ints.
-          Also, changed name of MAGIC_OFFSET to TAO_Time_Base_Offset,
-          to avoid potential namespace collisions.
-
-Tue Jul 20 07:06:28 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile:
-          on Digital Unix, use IDL_Cubit's cxx_repository instead
-          of ptrepository.
-
-Tue Jul 20 07:25:21 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Makefile: fixed POA.cpp build override on LynxOS/PPC,
-          it had gotten munged when updating dependencies.  Expanded
-          out VDIR so that shouldn't happen again.
-
-Mon Jul 19 22:46:54 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/IIOP_Connector.cpp
-        * tao/UIOP_Connector.cpp
-
-          Added reverse lock template instantiations.
-
-Mon Jul 19 21:49:32 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp:
-          Fixed several bugs in the manipulation of the bit set and the
-          creation of the event. Thanks to Paul Calabrese
-          <calabrese_p@ociweb.com> for reporting these problems and
-          providing fixes.
-
-Mon Jul 19 21:39:06 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
-
-          For operation names that are C++ reserved words, the mapping
-          has a _cxx_ prepended to the name. However, the skeleton's lookup
-          strategy still expects the original name. This implies that the
-          stub send the original name in the request. We were doing this
-          correctly for the compiled stubs. However, for the interpreted
-          stubs, we were sending the _cxx_<name> in the request. This is
-          now fixed.
-
-Mon Jul 19 20:00:40 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union/Union_cs.cpp:
-          Some changes to avert egcs warnings when there is an implicit
-          default case and an enum discriminator.
-
-Mon Jul 19 19:42:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/corbafwd.h,Exception.cpp: added minor code support for
-          EINVAL errno. [Bug 74]
-
-Mon Jul 19 17:44:36 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/POA/TIE/Makefile: don't try to build with
-          Green Hills for either VxWorks or Solaris.  It fails
-          to link due to template instantiation problems.  Thanks
-          to Irfan for reporting this.
-
-Mon Jul 19 16:17:11 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/IDL_Test/union.idl:
-          Added another test example to the file. Thanks to
-          Roger Egbers <regbers@isrglobal.com> for sending in
-          the example that the addition was adapted from.
-
-Mon Jul 19 15:59:45 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_decl.h:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-          Reverted previous change to be_union.cpp, and added member
-          and get/set methods 'has_constructor' to the base class be_decl.
-          Used in conjunction with compute_size_type(), this addition
-          should determine whether a union case should be included by
-          value or by reference without changing the signature of
-          generated operations, as the previous change did.
-
-tMon Jul 19 15:10:01 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/UIOP_Acceptor.cpp (~TAO_UIOP_Acceptor):
-
-          Removed call to close() in the destructor since it was causing a
-          segmentation fault.  It isn't needed since close() gets called
-          even when the Acceptor_Registry is destroyed, and when the ORB
-          shuts down.  Thanks to Kirthika for pointing out the problem and
-          providing a fix.
-
-        * tao/IOR_LookupTable.cpp:
-
-          Fixed missing "tao/" from #include of ObjectIDList.h.
-
-        * Makefile:
-
-          Updated dependencies.
-
-Mon Jul 19 15:08:57 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/CosEvent_Service/CosEvent_Service.h:
-        * orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
-          Fixed command-line argument parsing, thanks to Knut-Havard
-          Aksnes <knut@orion.no> for reporting this problem.
-
-Mon Jul 19 14:55:42 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/corba.h:
-        * tao/corbafwd.h: Added an ifdef around the #includes and the
-          declarations connected to the Interface Repository.
-
-Mon Jul 19 12:26:20 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp
-          (visit_interface),
-          TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
-          (visit_interface),
-          TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
-          (visit_valuetype):
-          replaced this generated code:
-
-            #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-
-          with:
-
-            #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-
-          so that it's easier to support Tornado II.  Thanks to
-          Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov> for
-          reporting this. [Bug 80]
-
-Mon Jul 19 11:26:33 1999  Pradeep Gore  <pradeep@danzon.cs.wustl.edu>
-
-        HP/UX compile warning fixes -
-
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-          modified the <create> method to throw the BindFailed exception.
-
-        * examples/Event_Comm/Event_Comm.idl:
-        * examples/Event_Comm/Event_Comm_i.h:
-        * examples/Event_Comm/Event_Comm_i.cpp:
-          modified the <subscribe> method to throw CannotSubscribe
-          exception.
-          modified the <unsubscribe> method to throw CannotUnsubscribe
-          exception.
-
-Mon Jul 19 11:05:23 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        Added a #ifdef to check if the platform supports 64bit long
-        long. If not, used the ACE_U_LongLong class intead.
-
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp.
-
-Mon Jul 19 10:48:21 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Interface.pidl:
-        * tao/InterfaceC.h:
-        * tao/InterfaceC.i:
-        * tao/Interface.cpp:
-        * tao/corba.h:
-        * tao/corbafwd.h: Added preliminary stuff for Interface
-          Repository. These files were added at the request of Phillippe
-          <Philippe.Merle@lifl.fr> who wanted to use TAO with
-          CorbaScript. These files will not get compiled till we release
-          TAO 1.0.
-
-Sun Jul 18 20:36:27 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/IIOP_Connector.cpp (check_prefix):
-
-          Removed "iioploc" from check.  We only care about the first four
-          characters at this point, so "iiop" will suffice.
-
-        * tao/ORB.cpp (url_ior_string_to_object):
-
-          Minor change.  Moved declaration of returned Object_ptr to just
-          before it gets assigned.
-
-Sun Jul 18 19:41:30 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tests/InterOp-Naming/INS_test_client.cpp (main):
-
-          Added a command line option "-l" that tests and demonstrates
-          usage of the CORBA::ORB::list_initial_services() method.
-
-        * tests/InterOp-Naming/run_tests.pl:
-
-          Added a test that exercises the newly added "-l" option.
-
-        * tao/DynAny_i.cpp (get_any):
-
-          Fixed problem where CORBA_Any_var::out() was being passed to an
-          ACE_NEW_THROW_EX macro, which is a problem since
-          CORBA_Any_var::out() gets called twice, which in turn causes the
-          underlying pointer to be set to zero.  Thanks to Carlos for
-          explaining the problem.
-
-        * tao/IOR_LookupTable.{h,cpp}:
-        * tao/ORB.{h,cpp}:
-
-          Implemented the CORBA::ORB::list_initial_services() method.
-
-        * tao/orbconf.h:
-
-          Added a macro that defines a comma separated list of initial
-          references/ObjectIDs that TAO currently supports.
-
-Sun Jul 18 14:21:52 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/compiler.html: Updated the new options described below.
-
-        * TAO_IDL/be/be_args.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be/be_valuetype_fwd.cpp:
-        * TAO_IDL/be/be_visitor_array/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
-        * TAO_IDL/be/be_visitor_module/module_ch.cpp:
-        * TAO_IDL/be/be_visitor_module/module_sh.cpp:
-        * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp:
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_structure/structure_ch.cpp:
-        * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp:
-        * TAO_IDL/be/be_visitor_union/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_union/union_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/obv_module.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/util/utl_global.cpp: Separated the client and server
-          export macros and export include files to allow building
-          separate server and client DLLs.  4 new idl backend options are
-          added, -Wb,skel_export_macro=xxx, -Wb,stub_export_macro=xxx,
-          -Wb,skel_export_include=xxx.h, and
-          -Wb,stub_export_include=xxx.h.  The original
-          -Wb,export_macro=xxx and -Wb,export_include=xxx.h are still
-          available and using the old option will be translated to the new
-          options internally.  Thanks to Francois Bernier
-          <fbernier@gel.ulaval.ca> for inspiring the change.
-
-Sat Jul 17 17:29:58 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_union.cpp:
-          Changed compute_size_type() for unions to always return VARIABLE.
-          This fixes a bug found when a union contains a struct which
-          contains a different union composed of simple types. The inside
-          union's size type comes back as FIXED, so it (rather than a
-          pointer to it) becomes a struct member. Then the struct's size
-          type also comes back as FIXED, so the outside union makes the
-          struct (rather than a pointer to the struct) a member. Then
-          the C++ compiler bails because the outside union contains
-          a member with a copy constructor (the inside union). The previous
-          version of the compute_size_type() function returns FIXED when
-          the union contains, say, a short and a long, so it is actually,
-          as far as marshaling is concerned, variable. This way, the function
-          returns VARIABLE always, and incurs extra indirection only when
-          the union contains, say, a long and an unsigned long. Nothing
-          seems to get broken by this fix, and if that remains true over
-          time, some of the union's _var and _out code generation sections
-          can be trimmed.
-
-Sat Jul 17 15:00:04 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/ORB.cpp (resolve_initial_references):
-
-          Changed a return value from zero to CORBA::Object::_nil () since
-          the return type is CORBA::Object_ptr.
-
-Sat Jul 17 14:27:57 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/IIOP_Profile.h:
-
-          Added some missing default CORBA_Envirnoment values (i.e.,
-          TAO_default_enviroment ()).
-
-Sat Jul 17 12:38:08 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * utils/Makefile: Added nslist to the DIRS built "out-of-the-box".
-          Thanks to Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov> for
-          reporting this.
-
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp (unmask_type): Changed
-          the exception from AlreadyMasked to NotMasked since (1) this is
-          what's in the throw spec and (2) this appears to be the right
-          exception.
-
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp (validate_supertypes):
-          Changed the throw spec from CosTrading::DuplicatePropertyName to
-          CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName
-          because that's the type of exception that's thrown in the body
-          of this method.
-
-Sat Jul 17 12:48:35 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/orbconf.h:
-        * tao/IIOP_Acceptor.cpp:
-        * tao/IIOP_Connect.h:
-        * tao/IIOP_Connector.cpp:
-        * tao/IIOP_Connector.h:
-        * tao/UIOP_Acceptor.cpp:
-        * tao/UIOP_Connector.cpp:
-          Removed the bogus TAO_SOCK_* and TAO_LSOCK_* macros, the
-          pluggable protocols framework provides the right solution for
-          that problem.
-
-Fri Jul 16 22:39:15 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Acceptor_Impl: This file contained a class that inherited
-          from Acceptor and overwrote some of the functions (such as
-          make_svc_handler() and activate_svc_handler()).  Changed this to
-          use the Strategy_Acceptor and implemented the appropriate
-          strategies needed for TAO.
-
-        * tao/IIOP_Acceptor.h (TAO_IIOP_Acceptor):
-        * tao/UIOP_Acceptor.h (TAO_UIOP_Acceptor):
-
-          Changed these classes to use the new Strategy Acceptor.
-
-Fri Jul 16 19:57:25 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * examples/Callback_Quoter/run_test.pl:
-        * examples/Quoter/run_test.pl:
-        * orbsvcs/tests/AVStreams/benchmark/run_test.pl:
-        * orbsvcs/tests/CosEC_Multiple/run_test.pl:
-        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
-        * orbsvcs/tests/EC_Multiple/run_test.pl:
-        * orbsvcs/tests/EC_Throughput/run_test.pl:
-        * orbsvcs/tests/Event_Latency/run_test.pl:
-        * orbsvcs/tests/Property/run_test.pl: Fixed the use of
-          "Naming_Server".  Thanks to Irfan for reminding this.
-
-        * orbsvcs/Naming_Service/Makefile: Updated makefile to use
-          multiple source files and generate Naming_Server.
-
-Fri Jul 16 16:31:50 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h:
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-          Fixed typos in comment and ACE_ERROR message.
-
-        * TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h:
-        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
-          New files needed for the fix described below.
-
-        * TAO_IDL/be_include/be_visitor_array.h:
-        * TAO_IDL/be/be_visitor_array.cpp:
-        * TAO_IDL/be/be_visitor_factory.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp:
-          Extended the fix made previously for arrays containing
-          anonymous sequences to work for sequences of
-          recursive types.
-
-Fri Jul 16 15:51:38 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/IIOP_Profile.cpp:
-          Fixed warning under egcs-2.95
-
-        * examples/Simple/echo/run_test.pl:
-          Added $EXEPREFIX thanks to Russell L. Carter
-          <rcarter@consys.com> for pointing this out
-
-Fri Jul 16 15:16:14 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * */Makefile:
-          Remved the definitions for VLDLIBS and VBIN, these macros are
-          defined in wrapper_macros.GNU and depend on the platform. Thanks
-          to Steve Huston for pointing this out.
-          Also removed the definitions for the BUILD macro for similar
-          reasons.
-
-        * orbsvcs/orbsvcs/Makefile:
-          Do not compile the AV/Streaming service on AIX until we figure
-          out what the problem is
-
-        * docs/releasenotes/TODO.html:
-          Several tasks have been completed or moved to the BTS
-
-Fri Jul 16 14:22:01 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/run_test.pl: Fixed the location of
-          Naming_Server.
-
-        * orbsvcs/Naming_Service/Naming_Service.dsp: Added
-          Naming_Server.cpp and renamed the executables to
-          Naming_Server.exe.
-
-Fri Jul 16 14:05:33 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * docs/configurations.html:
-
-          Updated the run-time options section with information about how
-          UIOP will provide considerably better performance over IIOP and
-          IIOP with GIOPlite for ORB's running on the same host.
-
-          Additional minor updates to capitalization in "-ORB" options
-          described in the document.
-
-Fri Jul 16 13:59:10 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/{Makefile.bor,tao.rc},
-          orbsvcs/orbsvcs/{Makefile.bor,orbsvcs.rc}:
-          Updated these files to add version information to the DLLs so
-          when you right click them in windows explorer you can see what
-          version the file is (e.g., "4.6.45").  Thanks to Christopher
-          Kohlhoff <chris@kohlhoff.com> for contributing this.
-
-        * examples/Borland: Updated the examples to contain several minor
-          fixes for Borland C++ Builder.  Thanks to Christopher Kohlhoff
-          <chris@kohlhoff.com> for reporting this.
-
-Fri Jul 16 12:21:58 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * orbsvcs/Time_Service/Server_i.cpp.
-
-          Added a parameter to fine tune the clerk's synchronization
-          period in microseconds.
-
-        * orbsvcs/Time_Service/Clerk_i.cpp.
-        * orbsvcs/Time_Service/Clerk_i.h.
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp.
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h.
-
-          Added the MAGIC OFFSET to make the base time as 15th October
-          1582 instead of 1st Jan 1970. Thanks to Carsten Zerbst
-          <zerbst@tu-harburg.de> for pointing this out and Mark
-          Laffoon<mark.laffoon@centraxcorp.com> for contributing the magic
-          offset.
-
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp.
-
-          Fixed a CORBA::TRANSIENT exception thrown by an _narrow () by
-          adding activate_poa_manager () in init () of the following:
-
-Fri Jul 16 10:08:22 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be_visitor_union/union_cs.cpp:
-        * TAO_IDL/be_visitor_union_branch/public_access_cs.cpp:
-          The 'alloc_flag' argument to the _access() method is
-          sometimes used and sometimes not. To avoid unused arg
-          warnings AND 'undefined' compile errors, had to add
-          ACE_UNUSED_ARG (alloc_flag) on a case-by-case basis.
-
-Fri Jul 16 07:13:08 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp (visit):
-          replaced use of implicit conversion from 64-bit int
-          to pointer with use of ACE_LONGLONG_TO_PTR macro.
-
-Thu Jul 15 23:16:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf:
-          Alternative configurations that do not exploit any specific
-          knowledge about the application, only that if the client or
-          server are single threaded.
-
-Thu Jul 15 22:14:18 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * TAO/tao/IIOP_Connector.cpp
-        * TAO/tao/UIOP_Connector.cpp
-
-          Added template instantiations.
-
-Thu Jul 15 21:53:18 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp:
-          Added check and CORBA_Any::from_* construction for generation of
-          CDR insertion operators similarly to the change made for the
-          generated extraction operators listed in a recent commit.
-          MSVC didn't mind, but SunOS/egcs complained.
-
-Thu Jul 15 21:03:31 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.{h,cpp}:
-          Changed TAO_Persistent_Context_Index to store/return reference
-          to the root Naming Context, rather than its stringified ior.
-          This saves <object_to_string> conversion, and a <narrow> call
-          later on.
-
-Thu Jul 15 21:01:28 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_helper.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-          Made some print format symbols agree with their
-          arguments, warnings from the new egcs.
-
-        * TAO_IDL/be/be_sunsoft.cpp:
-          Changed added 'u' and 'f' suffixes to integer and
-          float literals to upper case for readability.
-
-Thu Jul 15 20:50:01 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Makefile:
-          Removed IDL_Test from the build until I fix some of these errors.
-
-Thu Jul 15 20:29:51 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/IDL_Test/main.cpp:
-          removed 'argc' and 'argv' from main, they're unused.
-
-        * TAO/tests/IDL_Test/Makefile:
-          Fixed some typos.
-
-Thu Jul 15 20:26:00 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union/union_cs.cpp:
-          Uncommented an arg in generated code that was actually
-          used by the generated function.
-
-        * TAO_IDL/be/be_sunsoft.cpp:
-          Added 'u' to the end of integer literals, if they
-          are unsigned.
-
-Thu Jul 15 19:40:46 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/DynAny_Test/da_test.idl:
-        * TAO/tests/DynAny_Test/data.h:
-        * TAO/tests/DynAny_Test/data.cpp:
-        * TAO/tests/DynAny_Test/test_dynstruct.cpp:
-          VxWorks caught me trying to use CORBA::LongLong.
-
-Thu Jul 15 19:09:19 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Param_Test/param_test_i.h:
-        * TAO/tests/Param_Test/param_test_i.cpp:
-        * TAO/tests/Param_Test/client.cpp:
-        * TAO_IDL/be/be_array.cpp:
-          Fixed various warnings from the new version of egcs.
-
-Thu Jul 15 17:35:07 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/ORB_Core.*:
-
-          Changed TAO_ORB_Parameters pointer member to a non-pointer
-          member.  The main reason why it was made a pointer member was to
-          reduce compile-time dependencies.  However, params.h is already
-          included, so we gain nothing by keeping it a pointer.  It's
-          safer this way, anyway.
-
-Thu Jul 15 18:19:42 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Makefile:
-          Added IDL_Test directory to Makefile.
-
-Thu Jul 15 17:52:26 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/IDL_Test/anonymous.idl:
-        * TAO/tests/IDL_Test/array.idl:
-        * TAO/tests/IDL_Test/constants.idl:
-        * TAO/tests/IDL_Test/enum_in_struct.idl:
-        * TAO/tests/IDL_Test/generic_object.idl:
-        * TAO/tests/IDL_Test/included.idl:
-        * TAO/tests/IDL_Test/including.idl:
-        * TAO/tests/IDL_Test/interface.idl:
-        * TAO/tests/IDL_Test/keywords.idl:
-        * TAO/tests/IDL_Test/reopened_modules.idl:
-        * TAO/tests/IDL_Test/sequence.idl:
-        * TAO/tests/IDL_Test/typedef.idl:
-        * TAO/tests/IDL_Test/union.idl:
-        * TAO/tests/IDL_Test/main.cpp:
-        * TAO/tests/IDL_Test/IDL_Test.dsw:
-        * TAO/tests/IDL_Test/idl_test.dsp:
-        * TAO/tests/IDL_Test/Makefile:
-        * TAO/tests/IDL_Test/README:
-          New files and directory. A new test which is
-          a collection of many IDL examples that have
-          uncovered bugs in the past. The idea is to
-          make sure these bugs never recur. Some of the
-          examples are adapted from IDL code sent in
-          by ACE and TAO users - many thanks to all those
-          who helped dig out the bugs!
-
-          It is hoped that there will be regular additions
-          to these examples, making the tests more rigorous
-          and comprehensive.
-
-Thu Jul 15 17:44:46 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/GIOP.h:
-        * tao/GIOP.i:
-        * tao/Transport_Mux_Strategy.cpp:
-          Optimized TSS buffer managment: the input CDR was reset twice
-          during the upcall.
-
-Thu Jul 15 17:25:29 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union/union_cs.cpp (visit_union): Made a
-          change to the signatures of the generated methods _access and
-          _reset. These two methods were taking in a Boolean with a
-          variable name. These variable names were not used. This was
-          generating warnings on Linux_EGCS. So the variable name was
-          commented out. Thanks to Mike Moran (mm4@cs.wustl.edu) for
-          reporting this.
-
-Thu Jul 15 16:51:36 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp
-        * orbsvcs/tests/Simple_Naming/client.cpp:
-          Removed/protected debugging messages.
-
-Thu Jul 15 16:11:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/DynSched.cpp (relate_task_entries_recurse),
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp (set):
-          replaced use of implicit conversion from 64-bit int
-          to pointer with use of ACE_LONGLONG_TO_PTR macro.
-
-Thu Jul 15 14:32:54 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server,cpp,
-          client.cpp,server.cpp,run_tests.pl,README:
-
-          1) Changed -o option to -f, to be consistent with MT_Cubit.
-
-          2) On VxWorks, changed main entry points to be client
-             and server, instead of main or ace_main.
-
-          [Bug 42]
-
-        * performance-tests/Cubit/TAO/MT_Cubit/{client,server}.cpp:
-          on VxWorks, redefine ACE_MAIN to change the entry point name.
-
-Thu Jul 15 14:03:46 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/params.h:
-
-          Removed unused members.  [Bug 55]
-
-        * tao/DynUnion_i.cpp (set_as_default):
-        * tao/Object.cpp (_is_a, operator<<):
-        * tao/IORManipulation.cpp (merge_iors):
-        * tao/UIOP_Profile.cpp (to_string):
-
-          Fixed warnings generated by gcc 2.95; mostly due to format
-          specifier mismatches and inefficient conversion operator usage.
-
-Thu Jul 15 14:01:25 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/ast/AST_Union.cpp:
-        * TAO_IDL/be_include/be_union.h:
-        * TAO_IDL/be/be_union.cpp:
-          Added some switch cases and a union member to allow wchar as
-          a discriminator type.
-
-Thu Jul 15 13:11:02 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Object_Adapter.cpp (find_transient_poa): Changed use of
-          ORB_Core::root_poa() such that an environment variable was
-          passed to the function instead of it using the default
-          environment.  Thanks to Carlos for pointing this out.
-
-          Also, since setup() and teardown() are done in the same thread
-          of control, we can optimize away a call to
-          TAO_TSS_RESOURCES::instance() by caching a pointer to tss
-          resources. Thanks again to Carlos for pointing this out.
-
-Thu Jul 15 13:00:09 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp:
-          Added a check for discriminator types of char, wchar and boolean
-          in the CDR operator code generation, so that the
-          appropriate CORBA_Any::to_* struct can be used. Thanks to
-          Roger Egbers <regbers@isrglobal.com> for reporting this
-          bug and sending in an example IDL file.
-
-Thu Jul 15 12:19:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * Makefile: added -u to make_release invocation.
-
-Thu Jul 15 11:47:08 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO version 0.4.2 released.
-
-Wed Jul 14 12:34:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Callback_Quoter/Makefile: reverted
-          change that disabled on LynxOS.  It seems to build
-          fine, with inlining and debug enabled.  See
-          Wed Jul 14 12:34:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-Thu Jul 15 11:02:57 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Callback_Quoter/Notifier_i.cpp: removed
-          ACE_Hash<ACE_CString> and ACE_Equal_To<ACE_CString>
-          explicit instantiations, because they're in tao/POA.cpp.
-          Thanks to Denis Ouellet <douellet@gel.ulaval.ca> for
-          reporting this.
-
-Thu Jul 15 02:29:33 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/POA.cpp (create_reference_with_id_i): Reverted back to use
-          find_system_id_using_user_id () from
-          find_servant_and_system_id_using_user_id ().  It has different
-          semantics to what we expected.  We need something that can find
-          the system id using appropriate strategy, at the same time,
-          return the servant if one is available.  Before we have that
-          function, <create_reference_with_id_i> basically generates
-          broken collocated object when DIRECT collocation strategy is
-          used.
-
-Wed Jul 14 21:49:52 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h:
-          added #define _MATH_H_WRAPPER with exceptions and g++.
-          We #define exception when #including math.h, and so
-          does egcs.  The _MATH_H_WRAPPER #define disables egcs'.
-
-Wed Jul 14 21:44:57 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Object.cpp (_is_a): Should return 0 instead of
-          CORBA::Object::_nil when prepare_for_upcall failed.  Thanks to
-          Carlos for pointing this out.
-
-Wed Jul 14 21:35:12 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp (invoke): This function
-          also uses ORB::key_to_object.  Thanks to EGCS for pointing this
-          out.
-
-Wed Jul 14 21:21:35 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/README:
-
-          Updated with descriptions of options that support the newly
-          added enable/disable test feature.
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.{h,cpp}:
-
-          Added ability to specify which tests should be run and which
-          ones shouldn't be run.  This modification helps with isolating
-          certain test timeprobes.
-
-Wed Jul 14 21:18:23 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_array/array_cs.cpp:
-          In code generation for the foo_copy() method, modified code to
-          check for more than one level of typedef when determining if
-          the element type is a typedef of another array type.
-
-Wed Jul 14 18:07:00 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/POA.cpp (create_reference_i,create_reference_with_id_i):
-          (servant_to_reference,id_to_reference_i): All these methods
-          should generate collocated object reference.  Thanks to Francois
-          Bernier <fbernier@gel.ulaval.ca> for reporting the bug.
-
-        * tao/ORB.{h,cpp} (key_to_object): The function now takes two
-          extra arguments <servant> and <collocated> to create collocated
-          object reference.  Actually, this seems to be the only use case
-          for key_to_object.
-
-        * tao/Object.cpp (_is_a): Fixed the collocation resolving scheme
-          so that thru_poa collocated calls don't go remote and collocated
-          _is_a calls obey the collocated strategy use by the servants.
-
-          Thanks to Irfan for helping this change.
-
-Wed Jul 14 17:23:23 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_sunsoft.cpp:
-          Added a 'f' at the end of a printed floating point literal, to
-          avoid the MSVC warning, since it reads decimal constants as
-          doubles.
-
-Wed Jul 14 17:03:16 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_scope.cpp:
-          Cosmetic changes.
-
-        * TAO_IDL/be/be_visitor_structure/cdr_op_ci.cpp:
-          Fixed be_visitor_structure_cdr_op_ci::post_process() to skip the
-          generation of "&&\n" if the node argument is an enum value,
-          since the just-completed visit to that node generated no code.
-
-Wed Jul 14 16:23:56 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Reply_Dispatcher.cpp:
-          Use new CDR_Stream methods to efficiently steal the contents
-          from one CDR stream into another (without any extra memory
-          allocations).
-
-        * tao/Stub.cpp:
-          Removed unnecesary lock, updated comments in
-          relative_rountrip_timeout() with respect to locking because it
-          is a bit suttle.
-
-Wed Jul 14 15:35:51 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/ORB.cpp: set_unexpected() is declared in unexpect.h on MVS.
-          Thanks to Jim Rogers <jrogers@viasoft.com> for sending the
-          patches for this.
-
-Wed Jul 14 13:19:36 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Client_Strategy_Factory.cpp:
-        * tao/Client_Strategy_Factory.h:
-        * tao/Resource_Factory.cpp:
-        * tao/Server_Strategy_Factory.cpp:
-        * tao/Server_Strategy_Factory.h:
-        * tao/default_client.cpp:
-        * tao/default_client.h:
-        * tao/default_server.cpp:
-        * tao/default_server.h:
-          Moved the connector_lock() creation from the server strategy
-          factory to the client strategy factory. Thanks to Phil Mesnier
-          <mesnier_p@ociweb.com> for reporting this problem. This fixes
-          [BUGID:17]
-
-        * docs/Options.html:
-        * docs/configurations.html:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic:
-        * performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf:
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf:
-        * tests/Collocation/svc.conf:
-          Updated the documentation and the svc.conf files that were using
-          that option.
-
-Wed Jul 14 12:43:51 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/TAO.cpp (init): replaced "RootPOA" with TAO_OBJID_ROOTPOA.
-
-Wed Jul 14 12:34:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Callback_Quoter/Makefile: don't build on/for
-          LynxOS, because of ugly template instantiation problem
-          with its old g++:
-            POA.cpp: multiple definition of
-              `ACE_Hash<ACE_CString>::operator()(ACE_CString const &) const'
-           .obj/Notifier_i.o:$(ACE_ROOT)/ace/Functor_T.i:38: first defined here
-
-Wed Jul 14 11:44:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * rules.tao.GNU: on WIN32 hosts, attempt to set the
-          CPP_LOCATION environment variable if it had not been
-          set.  Requires Bourne shell and sed.  If those requirements
-          aren't met, at least the user might find out sooner rather
-          than later that CPP_LOCATION must be set on WIN32.
-
-Wed Jul 14 09:44:39 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Param_Test/param_test/idl:
-        * TAO/tests/Param_Test/var_struct.cpp:
-          Added some members to the struct - types smaller than 4 bytes
-          between the dynamic types and a double at the beginning. Also
-          added the checks in test_validity(). This will test more
-          thoroughly for a recurrence of the alignment problems that
-          were recently fixed.
-
-Wed Jul 14 02:27:44 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/Collocation/Coll_Tester.cpp:
-        * tests/Collocation/Coll_Tester.h:
-        * tests/Collocation/Collocation.dsp:
-        * tests/Collocation/Collocation.dsw:
-        * tests/Collocation/Diamond.idl:
-        * tests/Collocation/Diamond_i.cpp:
-        * tests/Collocation/Diamond_i.h:
-        * tests/Collocation/README:
-        * tests/Collocation/main.cpp:
-        * tests/Collocation/svc.conf: New collocation support sanity check.
-
-Tue Jul 13 22:09:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service: removed ACE_Equal_To<ACE_CString>
-          explicit instantiation, because it's in tao/POA.cpp.
-          Thanks to Denis Ouellet <douellet@gel.ulaval.ca> for
-          reporting this.
-
-Tue Jul 13 21:51:45 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * utils/Makefile (DIRS):
-
-          Removed `nslist' from the list of directories since there is no
-          such directory.
-
-Tue Jul 13 21:43:30 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp:
-        * tao/Wait_Strategy.cpp:
-          The follower must be removed immediately after it is
-          signalled. Otherwise it may be signalled twice, once because it
-          received its reply and another time to become the leader; in
-          that case the second signal is lost and nobody becomes the
-          leader. Thanks to Marina for helping debug and test this
-          problem.
-
-        * orbsvcs/tests/Simple_Naming/client.cpp:
-          Work around IRIX/MIPSPro bug.
-
-Tue Jul 13 20:57:20 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/include/ast-decl.h:
-        * TAO_IDL/include/utl_scope.h:
-          Added forward declarations of class Identifier to
-          hopefully help out AIX w/IBM C++.
-
-Tue Jul 13 18:41:05 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp:
-          Modified CDR extraction operator to handle the rather unique
-          case where a union member is a sequence typedef included from
-          another file. The union's extraction operator creates a
-          temporary, which means the visitor needs type info from the
-          sequence node, which it now gets from the alias node in its
-          context, if necessary. Thanks to
-          Dwayne Burns <dburns@isrglobal.com> for sending in the
-          example.
-
-Tue Jul 13 17:38:20 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp: replaced new
-          operators with ACE_NEW_THROW_EX macros.
-
-Tue Jul 13 16:05:44 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Acceptor_Registry.cpp:
-        * tao/Protocol_Factory.h:
-        * tao/IIOP_Factory.cpp:
-        * tao/IIOP_Factory.h:
-        * tao/UIOP_Factory.cpp:
-        * tao/UIOP_Factory.h:
-          Some protocols (like UIOP) should not create endpoints unless
-          the user requires one; the problem is that they tend to leave
-          garbage on the filesystem (in the future we may have the same
-          problem with shared memory segments or semaphores) if the server
-          crashes.
-          The current behavior is to automatically create an IIOP endpoint
-          if the user does not specify any -ORBendpoint options, yet the
-          UIOP protocol is loaded by default and uiop endpoints (including
-          uiop://) can be specified in the command line.
-          This fixes [BUGID:22]
-
-Tue Jul 13 14:57:38 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
-
-          Increased client and server timeout values for the UIOP run.
-          Heavily loaded machines may need more time.
-
-Tue Jul 13 12:39:54 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/UIOP_Transport.cpp (send_request):
-
-          Updated to match IIOP's send_request() method.
-
-Tue Jul 13 12:22:11 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Sequence_T.h:
-        * TAO_IDL/be_include/be_argument.h:
-        * TAO_IDL/be_include/be_array.h:
-        * TAO_IDL/be_include/be_attribute.h:
-        * TAO_IDL/be_include/be_constant.h:
-        * TAO_IDL/be_include/be_decl.h:
-        * TAO_IDL/be_include/be_enum.h:
-        * TAO_IDL/be_include/be_enum_val.h:
-        * TAO_IDL/be_include/be_exception.h:
-        * TAO_IDL/be_include/be_expression.h:
-        * TAO_IDL/be_include/be_field.h:
-        * TAO_IDL/be_include/be_interface.h:
-        * TAO_IDL/be_include/be_interface_fwd.h:
-        * TAO_IDL/be_include/be_module.h:
-        * TAO_IDL/be_include/be_native.h:
-        * TAO_IDL/be_include/be_operation.h:
-        * TAO_IDL/be_include/be_predefined_type.h:
-        * TAO_IDL/be_include/be_root.h:
-        * TAO_IDL/be_include/be_scope.h:
-        * TAO_IDL/be_include/be_sequence.h:
-        * TAO_IDL/be_include/be_state.h:
-        * TAO_IDL/be_include/be_stream_factory.h:
-        * TAO_IDL/be_include/be_string.h:
-        * TAO_IDL/be_include/be_structure.h:
-        * TAO_IDL/be_include/be_sunsoft.h:
-        * TAO_IDL/be_include/be_type.h:
-        * TAO_IDL/be_include/be_typedef.h:
-        * TAO_IDL/be_include/be_union.h:
-        * TAO_IDL/be_include/be_union_branch.h:
-        * TAO_IDL/be_include/be_union_label.h:
-        * TAO_IDL/be_include/be_valuetype.h:
-        * TAO_IDL/be_include/be_valuetype_fwd.h:
-        * TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h:
-          Added #includes required by AIX template instantiation
-          mechanisms.
-
-Tue Jul 13 11:03:38 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/OctetSeq/run_test.pl:
-        * examples/POA/On_Demand_Activation/run_test.pl:
-        * examples/POA/On_Demand_Loading/run_test.pl:
-        * examples/POA/Reference_Counted_Servant/run_test.pl:
-          Fine tune the timeouts for slower (or loaded systems)
-
-1999-07-13  Yamuna Krishnamurthy  <krishnam@ss135.rsch.comm.mot.com>
-
-        * TAO_IDL/be/be_visitor_operation/operation_is.cpp (visit_operation):
-        * TAO_IDL/be/be_visitor_operation/operation_ih.cpp (visit_operation):
-        Fixed the duplicate generation of the ACE_THROW_SPEC macro
-        Thanks to Rick H. Wesson <wessorh@ar.com> for informing the bug
-
-        * TAO_IDL/be/be_visitor_interface/interface_is.cpp (visit_interface):
-        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp (be_visitor_interface_ih):
-        Modified the code generated to avoid dominance problem with
-        multiple inheritance
-
-Tue Jul 13 09:53:57 1999  Fred Kuhns  <fredk@cs.wustl.edu>
-
-        * Moved the implementation of TAO_Stub::add_forward_profiles
-          outside of the TAO_HAS_CORBA_MESSAGING ifdef's.  Thanks to
-          Stefan <SUllrich@Heimannsystems.com> for identifying this bug.
-
-Tue Jul 13 08:15:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.{cpp, h}: Added accessors
-          for maps and trees, various counts.  These are needed so the reconfig
-          scheduler can be extended by delegation (via a wrapper) as well as
-          by inheritance.  This is needed to avoid a multiple inheritance
-          "diamond of death[TM]" if it is being extended by a servant for
-          and interface that inherits from RtecScheduler::Scheduler.
-
-Tue Jul 13 07:47:12 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/ORB.cpp (_tao_add_to_IOR_table): made the 0 string
-          index unsigned, to avoid ambiguous operator [] overload
-          resolution with VC++ 6.0 and Green Hills.  Thanks to
-          Andy for reporting the problem on VC++ 6.0.
-
-Mon Jul 12 23:06:28 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_interface.h:
-        * TAO_IDL/be_include/be_interface.cpp (compute_coll_name): Fixed
-          the misgenerating collocation class names problem when compile
-          multiple-inherited interfaces.  Thanks to Francois Bernier
-          <fbernier@gel.ulaval.ca> for reporting the bug.
-
-Mon Jul 12 21:42:27 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/GIOP.cpp (process_server_request):
-        * tao/IOR_LookupTable.cpp (find_ior):
-        * tao/ORB.cpp (_tao_find_in_IOR_table):
-
-          Debugging output was attempting to print the name of the object
-          found in the object key, which isn't null terminated.  However,
-          due to performance considerations, that string is not copied.
-          Only pointer to the object_key is used during the IOR lookup.
-          Hence, the string *cannot* be null terminated since doing so
-          would modify the contents of the object key.  For the moment,
-          the only solution is to remove the debugging output
-          entirely. [Bug 56]
-
-        * tao/POA.cpp (encode_sequence_to_string):
-
-          CORBA::string_alloc() is being used to allocate space for a
-          string so there is no need to explicitly allocate space for a
-          null terminator since CORBA::string_alloc() already does it.
-
-Mon Jul 12 21:44:24 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/deep_free.cpp:
-          Added code in TAO_Marshal_Struct::deep_free() to keep the
-          pointer aligned as it frees each member. Thanks to
-          David Brock <dbrock@mail.arc.nasa.gov> and to
-          John Morey <jmorey@tbi.com> for sending in examples
-          that pointed out the need for this.
-
-Mon Jul 12 20:40:38 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB.cpp:
-          The ORB returned from CORBA::ORB_init() should be duplicated
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h:
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
-          Use an ORB-per-thread to minimize contention and simplify memory
-          managment of per-ORB-per-thread resources.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf:
-          Fixed the InputCDRAllocator argument
-
-Mon Jul 12 19:23:47 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp:
-          Modified a lex rule to accept the output of the new
-          preprocessor used by the HP/UX folks.
-
-Mon Jul 12 16:59:23 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/try_macros.h: Updated comments regarding how to re-enable
-          the deprecated TAO try macros and moved the comments to make
-          them more obvious.  Thanks to Carlos and Phil Y. Wang
-          <yhwang@cs.columbia.edu> for reporting this.
-
-        * tao/Exceptions.h: Moved the macro definition of TAO_RAISE from
-          <try_macros.h> to here.  It's really an TAO-specific macros.
-
-Mon Jul 12 16:10:20 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/orbconf.h: only use TAO_USE_SEQUENCE_TEMPLATES on _UNICOS.
-          This solves the template instantiation problem on ghs/Solaris.
-          Thanks to Carlos for diagnosing the problem.  Ref:
-          Thu Jun 24 22:18:52 1999  Doug Anderson  <doug@clark.net>.
-
-Mon Jul 12 15:49:33 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/RootPOA/RootPOA.cpp (main): Added environment
-          variable to resolve_initial_references ("RootPOA").
-
-Mon Jul 12 15:40:39 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/TAO.dsp:
-        * orbsvcs/orbsvcs/orbsvcs.dsp: Merged additional MFC
-          configuration.  Thanks to John Morey <jmorey@tbi.com> for
-          submitting the patch.
-
-Mon Jul 12 15:15:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.{cpp, h}: Fixed behavior
-          of the reconfig scheduler so that it can be configured to return a
-          default value instead of throwing an exception if a schedule had not
-          been computed.  This is the behavior of the DynSched implementation.
-          Thanks to Tom Venturella <thomas.e.venturella@boeing.com> for
-          reporting this.
-
-Mon Jul 12 14:58:13 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/NestedUpcall/Simple/server.cpp: Fixed constness warning.
-
-        * examples/POA/Forwarding/MyFooServant.cpp:
-        * tests/POA/Identity/Identity.cpp:
-        * tests/POA/Deactivation/Deactivation.cpp:
-
-          Added ACE_UNUSED_ARGs.
-
-Mon Jul 12 14:46:43 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * examples/Event_Comm/Consumer.dsp:
-        * examples/Event_Comm/Notifier.dsp:
-        * examples/Event_Comm/Supplier.dsp:
-        * orbsvcs/tests/Trading/TradingLib.dsp:
-        * performance-tests/Latency/client.dsp:
-        * performance-tests/Latency/server.dsp:
-        * tests/Faults/client.dsp:
-        * tests/Faults/server.dsp:
-          Fixed dependencies in the Custom Build rules, many .idl files
-          did not depend on the IDL compiler.
-
-Mon Jul 12 14:18:53 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/ValueFactory_Map.cpp:
-          Added some inits to 0 to avert Linux/egcs warnings.
-
-Mon Jul 12 13:54:45 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp (TAO_ORB_Core): fixed MVS "from" codeset
-          translator.  Thanks to Jim Rogers <jrogers@viasoft.com> for
-          this fix.
-
-Mon Jul 12 12:58:01 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/util/utl_scope.cpp:
-          Corrected a mistake in the logic that caused a
-          failed lookup of a field to be given the type of
-          the previous field (if any). As a by-product, the
-          use of 'int' as a type (illegal) causes a lookup
-          error output for '_cxx_int'. This is not wholly
-          informative, but the corresponding syntax error
-          (based on the parse state) is 'illegal component
-          in scoped name', which is even less informative.
-          Thanks to Surovegin Eugene <Surovegin@SoftLab.RU>
-          for pointing out the code generation problem.
-
-Mon Jul 12 12:25:53 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp: Fixed some broken idl
-          flags.  Added -I../../tao flag to when compiling all idl files
-          so people won't have trouble compiling orbsvcs even when they
-          don't have ACE_ROOT or TAO_ROOT defined.
-          Thanks to John Morey <jmorey@tbi.com> for suggesting this.
-
-        * TAO-INSTALL.html:
-        * docs/compiler.html: Added more explanation about setting
-          TAO_ROOT or ACE_ROOT.
-
-Mon Jul 12 10:47:18 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp (reactor): check for non-zero return
-          from get_tss_resources ().  If 0, print error message
-          about no more TSS keys and return 0.  This allows the
-          MT_Cubit server to fail gracefully if it runs out of
-          TSS keys (it uses one key per thread).  Also, added the
-          non-zero check to all other uses of get_tss_resources ()
-          in the file.  [Bug 57]
-
-Mon Jul 12 10:43:54 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/ORB.cpp (resolve_initial_references):
-
-          Fixed bug where the object ID was not being properly appended
-          to multiple endpoints when using -ORBDefaultInitRef.  The task
-          of appending the object ID is now the responsibility of
-          TAO_Connector::make_mprofile() which actually gets invoked when
-          an CORBA::string_to_object() call is made.  The code in
-          resolve_initial_references() was redundant code since the code
-          in TAO_Connector::make_mprofile() already existed and is better
-          suited to handle pluggable protocols. -ORBDefaultInitRef now
-          works properly with all of TAO's pluggable protocols.
-
-        * tao/Pluggable.cpp (make_mprofile):
-
-          Fixed a bug where the location of the object key was being
-          evaluated everytime an addr from an endpoint with multiple addrs
-          was parsed.  The object key location should only be evaluated
-          once.  Endpoint searches were also being made throughout the
-          entire length of the IOR.  Endpoint searches should only occur
-          after the protocol specification and before the object key.
-          This fixes a bug that was preventing -ORBDefaultInitRef from
-          working properly when given an argument with multiple
-          endpoints.
-
-        * tao/UIOP_Acceptor.cpp:
-        * tao/UIOP_Connect.cpp:
-        * tao/UIOP_Connector.cpp:
-        * tao/UIOP_Factory.cpp:
-        * tao/UIOP_Profile.cpp:
-        * tao/UIOP_Transport.cpp:
-
-          Moved some headers outside of the ACE_LACKS_UNIX_DOMAIN_SOCKETS
-          guard to make sure we include the configuration header so that
-          ACE_LACKS_UNIX_DOMAIN_SOCKETS gets defined when necessary.  This
-          fixes compilation on platforms that don't support UNIX domain
-          sockets, such as Win32.
-
-        * tao/params.cpp (TAO_ORB_Parameters):
-
-          Added default_init_ref_ to the member initializer list.
-
-        * tao/TAO.dsp:
-
-          Added the UIOP pluggable protocol files to the project.  Their
-          contents will actually get #ifdefed out on Win32 platforms but
-          it is good to add them to the project to be consistent.
-
-Mon Jul 12 10:32:53 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/*.h: inserted pragma once into a bunch of headers
-          that didn't have it.  Thanks to Ossama for reporting this.
-
-Mon Jul 12 09:55:46 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/include/AST_Interface.h:
-        * TAO_IDL/ast/AST_Interface.cpp:
-          Modified fwd_redefinition_helper method to allow for
-          reopened modules.
-
-Mon Jul 12 09:50:22 1999  Steve Huston  <shuston@riverace.com>
-
-        * tao/DynUnion_i_T.cpp: Added #include "tao/Any.h" to pick up the
-          extract operators during template instantiation on IBM C++.
-
-        * TAO_IDL/driver/drv_preproc.cpp: Added +W 67 to CPP args for HP
-          aC++ - this shuts up the "invalid #pragma name" warnings from IDL.
-
-Mon Jul 12 09:00:47 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Exception.cpp (_tao_errno): conditionally compile
-          the ENOSYS case only if ENOSYS != EFAULT, to allow
-          building on BCB4, for example.  Thanks to
-          Eugene Surovegin <Surovegin@SoftLab.RU> for reporting
-          this problem and providing the fix. [Bug 60]
-
-Mon Jul 12 08:04:20 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Simple/time-date/Makefile: removed Time_DateC.o,
-          Time_DateS.o, and Time_Date_i.o from SIMPLE_SVR_OBJS.  This
-          allows the server to be linked without warnings on DU 5.0.
-          And, it allows the example to function as intended, i.e.,
-          the servants are now linked in at runtime. [Bug 59]
-
-Mon Jul 12 00:05:33 1999  nanbor  <nanbor@cs.wustl.edu>
-
-        * TAO version 0.4.1 released.
-
-Sun Jul 11 14:14:56 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/util/utl_scope.cpp:
-          Further mod to lookup functions in response to a bug
-          in compiling TAO/examples/Event_Comm.idl.
-
-Sun Jul 11 12:15:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * Reconfig_Scheduler_T.{cpp, h},
-          Reconfig_Sched_Utils.{cpp, h}: Fixes for nightly build log errors
-          and warnings.  Changed exception from UNKNOWN_TASK to INTERNAL,
-          added ACE_TYPENAME for traits, moved DFS ordering function from
-          scheduler to scheduling strategy.
-
-Sun Jul 11 03:25:07 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
-          (assign_priorities_i):
-          (init): The assignment operator of auto_ptr takes another
-          auto_ptr, not the pointer itself.
-
-Sat Jul 10 23:46:18 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/Options.html:
-        * docs/configurations.html: More updates to the configuration
-          document.
-
-Sat Jul 10 21:56:54 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/UIOP_Acceptor.h:
-        * tao/UIOP_Acceptor.cpp (open_i, close):
-
-          Added an "unlink_on_close_" member that flags whether or not the
-          UIOP rendezvous point should be unlinked when closing the
-          acceptor.  Currently this flag is only unset when an "address
-          already in use" error (EADDRINUSE) occurs.  An existing
-          rendezvous point shouldn't be unlinked if errno == EADDRINUSE
-          since it may be in use by another UIOP server/client. [Bug 52]
-
-        * tao/UIOP_Acceptor.cpp (create_mprofile):
-
-          Initialized a pointer to zero to prevent potential uninitialized
-          variable warnings.
-
-          Minor coding style updates.
-
-        * tao/UIOP_Profile.cpp (parse_string):
-
-          Inadvertently checked for incorrect return value while setting
-          the rendezvous point in the underlying ACE_UNIX_Addr.  The
-          problem was introduced when I fixed another problem.  URL style
-          object references are working again for UIOP.
-
-Sat Jul 10 20:31:36 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp (init): Changed
-          the use of auto_ptr::reset to release-and-assign since some
-          compilers are still implementaing the C++ standard draft, which
-          doesn't has reset() in auto_ptr.
-
-Sat Jul 10 19:40:41 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:  Removed a warning
-          on EGCS about the variable <retval> being used possibly
-          uninitialized.
-
-        * orbsvcs/tests/ImplRepo/nestea_server_i.cpp:  Removed a warning
-          on MSVC about a */ being found outside a comment.
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:  Instead of killing the
-          servers at the end of the *_ir tests, shut them down with
-          tao_ir.
-
-Sat Jul 10 19:20:55 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * examples/Simple/bank/Account_i.{h,cpp}:
-        * examples/Simple/echo/Echo_i.{h,cpp}: Added no-op copy
-          constructors to fool old g++ (2.7.2.3).
-
-Sat Jul 10 18:54:50 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-        * orbsvcs/orbsvcs/Event/Event_Channel.cpp:
-          Fixed warnings on HP-UX/aCC, thanks to Eric Mitchell for
-          facilitating the resources to find these problems.
-
-Sat Jul 10 17:35:45 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:
-          Added an init to 0 in each file to avert SunOS egcs warnings.
-
-Sat Jul 10 15:53:59 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * tao/Transport_Mux_Strategy.cpp: Single lined the #pragma lines
-          to fix the warnings in VxWorks.  Thanks to David for reporting
-          this and for Carlos for coming up with the solution.
 
 Fri Jul  9 19:12:14 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-        * tao/UIOP_Acceptor.{h,cpp} (open_i, rendezvous_point):
-        * tao/UIOP_Profile.{h,cpp}:
+	* tao/UIOP_Acceptor.{h,cpp} (open_i, rendezvous_point):
+	* tao/UIOP_Profile.{h,cpp}:
 
-          Moved the rendezvous point verification method to the UIOP
-          acceptor since it is the acceptor that should verify the
-          rendezvous point.  Previously, the rendezvous point was checked
-          on the client only when URL style object references were being
-          used.  That behavior was incorrect.
+	  Moved the rendezvous point verification method to the UIOP
+	  acceptor since it is the acceptor that should verify the
+	  rendezvous point.  Previously, the rendezvous point was checked
+	  on the client only when URL style object references were being
+	  used.  That behavior was incorrect.
 
-        * tao/Acceptor_Registry.cpp (open):
+	* tao/Acceptor_Registry.cpp (open):
 
-          Comment updates.
+	  Comment updates.
 
-        * tao/IIOP_Connector.cpp (preconnect):
+	* tao/IIOP_Connector.cpp (preconnect):
 
-          Updated default preconnect port to be 683 instead of 9999 since
-          the default port for CORBA 3 will be 683, as assigned by the
-          IANA.
+	  Updated default preconnect port to be 683 instead of 9999 since
+	  the default port for CORBA 3 will be 683, as assigned by the
+	  IANA.
 
-        * tao/IIOP_Profile.cpp (parse_string):
+	* tao/IIOP_Profile.cpp (parse_string):
 
-          Updated some brittle code and added some additional error checks.
+	  Updated some brittle code and added some additional error checks.
 
 Fri Jul  9 21:50:00 1999  Michael Kircher  <mk1@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_argument/ami_handler_vardecl_cs.cpp:
-          Fixed a not reachable switch statement.
+	* TAO_IDL/be/be_visitor_argument/ami_handler_vardecl_cs.cpp:
+	  Fixed a not reachable switch statement.
 
 Fri Jul  9 20:40:54 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO_IDL/include/utl_scope.h:
-        * TAO_IDL/util/utl_scope.cpp:
-          Extensive mods to lookup_by_name(), lookup_by_name_local(), and
-          iter_lookup_by_name_local() so they will traverse the scope tree
-          above the starting point and check for reopened modules.
+	* TAO_IDL/include/utl_scope.h:
+	* TAO_IDL/util/utl_scope.cpp:
+	  Extensive mods to lookup_by_name(), lookup_by_name_local(), and
+	  iter_lookup_by_name_local() so they will traverse the scope tree
+	  above the starting point and check for reopened modules.
 
 Fri Jul 09 18:54:40 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * version_tests.dsw (Project): Fixed location of POA Deactivation
-          project.
+	* version_tests.dsw (Project): Fixed location of POA Deactivation
+	  project.
 
 Fri Jul  9 17:21:26 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp:
-          Fixed two typos (misplaced parens) in generated code.
+	* TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp:
+	  Fixed two typos (misplaced parens) in generated code.
 
 Fri Jul  9 16:47:34 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-        * tao/IIOP_Connector.cpp (preconnect):
+	* tao/IIOP_Connector.cpp (preconnect):
 
-          If no port is specified then a default port of 9999 should be
-          used, as stated in the spec.
+	  If no port is specified then a default port of 9999 should be
+	  used, as stated in the spec.
 
 Fri Jul  9 16:44:49 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp:
-          Fixed several typos and misleading ACE_ERROR messages.
+	* TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp:
+	  Fixed several typos and misleading ACE_ERROR messages.
 
 Fri Jul  9 16:41:32 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * examples/Persistent_Grid/Grid_i.cpp:
-        * examples/Persistent_Grid/Grid_i.h:
-        * examples/Persistent_Grid/Makefile:
-        * examples/Persistent_Grid/Simple_util.cpp:
-        * examples/Persistent_Grid/server.cpp: Implemented Dr.Schmidt's
-          suggestions. Did a bit a code clean up. Tested on SunCC 5.0 and
-          g++ on SunOS5.5.1
+	* examples/Persistent_Grid/Grid_i.cpp:
+	* examples/Persistent_Grid/Grid_i.h:
+	* examples/Persistent_Grid/Makefile:
+	* examples/Persistent_Grid/Simple_util.cpp:
+	* examples/Persistent_Grid/server.cpp: Implemented Dr.Schmidt's
+	  suggestions. Did a bit a code clean up. Tested on SunCC 5.0 and
+	  g++ on SunOS5.5.1
 
 Fri Jul 09 16:12:32 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
-          (visit_interface):
-        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
-          (be_visitor_interface_any_op_cs): Added appropriate storage
-          class specifiers to the collocation stub factory function
-          pointer and the dummy pointer initializer integer.  Hopefully,
-          this will eliminate the bazillion warnings from OSF1.
+	* TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+	  (visit_interface):
+	* TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+	  (be_visitor_interface_any_op_cs): Added appropriate storage
+	  class specifiers to the collocation stub factory function
+	  pointer and the dummy pointer initializer integer.  Hopefully,
+	  this will eliminate the bazillion warnings from OSF1.
 
 Fri Jul  9 16:04:42 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-        * tao/Invocation.cpp (start):
+	* tao/Invocation.cpp (start):
 
-          Removed request_hdr time probe.  It is replaced by the time
-          probes described below.
+	  Removed request_hdr time probe.  It is replaced by the time
+	  probes described below.
 
-        * tao/{IIOP,UIOP}_Transport.cpp (start_request):
+	* tao/{IIOP,UIOP}_Transport.cpp (start_request):
 
-          Removed send_request() time probe and added one to
-          start_request() since the time spent in start_request() is more
-          important for benchmarking.
+	  Removed send_request() time probe and added one to
+	  start_request() since the time spent in start_request() is more
+	  important for benchmarking.
 
 Fri Jul  9 15:22:20 1999  Marina Spivak  <marina@cs.wustl.edu>
 
-        * orbsvcs/Naming_Service/Naming_Service.cpp:
-          Added a check for error conditions in the <init> method, after
-          <init_child_poa>, in order to shut down gracefully.
+	* orbsvcs/Naming_Service/Naming_Service.cpp:
+	  Added a check for error conditions in the <init> method, after
+	  <init_child_poa>, in order to shut down gracefully.
 
 Fri Jul  9 14:26:28 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO_IDL/be_include/be_string.h:
-        * TAO_IDL/be_include/be_predefined_type.h:
-        * TAO_IDL/be/be_string.cpp:
-        * TAO_IDL/be/be_predefined_type.cpp:
-          Added overrides for 2nd signature of overloaded
-          compute_tc_type() virtual function in base class be_type.
-          Averts warnings from KAI compiler.
+	* TAO_IDL/be_include/be_string.h:
+	* TAO_IDL/be_include/be_predefined_type.h:
+	* TAO_IDL/be/be_string.cpp:
+	* TAO_IDL/be/be_predefined_type.cpp:
+	  Added overrides for 2nd signature of overloaded
+	  compute_tc_type() virtual function in base class be_type.
+	  Averts warnings from KAI compiler.
 
 Fri Jul  9 14:10:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
 
@@ -2119,116 +467,116 @@ Fri Jul  9 14:10:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
 
 Fri Jul  9 12:59:05 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * examples/Simple/grid/Grid_i.h :
-        * examples/Simple/grid/Grid_i.cpp :Fixed a warning on
-          HP_UX. Thanks to Carlos for reporting this.
+	* examples/Simple/grid/Grid_i.h :
+	* examples/Simple/grid/Grid_i.cpp :Fixed a warning on
+	  HP_UX. Thanks to Carlos for reporting this.
 
 Fri Jul  9 11:14:03 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-        * docs/releasenotes/index.html:
+	* docs/releasenotes/index.html:
 
-          Updated the UIOP pluggable transport protocol usage guidelines
-          about the importance of using absolute and relative paths
-          consistently with a given UIOP rendezvous point.
+	  Updated the UIOP pluggable transport protocol usage guidelines
+	  about the importance of using absolute and relative paths
+	  consistently with a given UIOP rendezvous point.
 
 Fri Jul  9 10:58:41 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/tests/Property/run_test.pl:
-          Print messages to stderr to make the output readable
+	* orbsvcs/tests/Property/run_test.pl:
+	  Print messages to stderr to make the output readable
 
-        * orbsvcs/ImplRepo_Service/Makefile:
-          Updated dependencies
+	* orbsvcs/ImplRepo_Service/Makefile:
+	  Updated dependencies
 
-        * examples/OBV/Typed_Events/run_test.pl:
-          Added missing run_test script
+	* examples/OBV/Typed_Events/run_test.pl:
+	  Added missing run_test script
 
 Fri Jul  9 01:55:57 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
-          (visit_interface): Fixed type mismatch warning on KCC.
+	* TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+	  (visit_interface): Fixed type mismatch warning on KCC.
 
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
-          (visit_interface): Fixed unused argument warnings on egcs.
+	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+	  (visit_interface): Fixed unused argument warnings on egcs.
 
 Fri Jul 09 01:00:40 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * tao/DynAnyC.cpp: Removed a duplicated template instantiation.
+	* tao/DynAnyC.cpp: Removed a duplicated template instantiation.
 
-        * tao/Connector_Registry.cpp (preprocess_preconnects): Added a
-          static cast to a ssize_t value to avoid MSVC warnings.
+	* tao/Connector_Registry.cpp (preprocess_preconnects): Added a
+	  static cast to a ssize_t value to avoid MSVC warnings.
 
 Thu Jul  8 23:34:42 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * examples/Persistent_Grid/README:
-        * examples/Persistent_Grid/Grid_Client_i.cpp:
-        * examples/Persistent_Grid/Grid_i.cpp:
-        * examples/Persistent_Grid/Persistent_Client_i.cpp:
-        * examples/Persistent_Grid/Simple_util.cpp:
-        * examples/Persistent_Grid/client.cpp:
-        * examples/Persistent_Grid/persistent_client.cpp:
-        * examples/Persistent_Grid/server.cpp:
-        * examples/Persistent_Grid/Grid_Client_i.h
-        * examples/Persistent_Grid/Grid_i.h
-        * examples/Persistent_Grid/Persistent_Client.h
-        * examples/Persistent_Grid/Simple_util.h
-        * examples/Persistent_Grid/run_test.pl
-        * examples/Persistent_Grid/Makefile
-        * examples/Persistent_Grid/Persistent_Grid.dsw
-        * examples/TAO_Examples.dsw
-        * examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp:
-        * examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp:
-        * examples/Persistent_Grid/Persistent_Grid_Client_Second_Files.dsp:
-          A new example added to show the persistence nature of the
-          server. Please refer to the README file in that directory for
-          info on how to build and run the tests.
+	* examples/Persistent_Grid/README:
+	* examples/Persistent_Grid/Grid_Client_i.cpp:
+	* examples/Persistent_Grid/Grid_i.cpp:
+	* examples/Persistent_Grid/Persistent_Client_i.cpp:
+	* examples/Persistent_Grid/Simple_util.cpp:
+	* examples/Persistent_Grid/client.cpp:
+	* examples/Persistent_Grid/persistent_client.cpp:
+	* examples/Persistent_Grid/server.cpp:
+	* examples/Persistent_Grid/Grid_Client_i.h
+	* examples/Persistent_Grid/Grid_i.h
+	* examples/Persistent_Grid/Persistent_Client.h
+	* examples/Persistent_Grid/Simple_util.h
+	* examples/Persistent_Grid/run_test.pl
+	* examples/Persistent_Grid/Makefile
+	* examples/Persistent_Grid/Persistent_Grid.dsw
+	* examples/TAO_Examples.dsw
+	* examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp:
+	* examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp:
+	* examples/Persistent_Grid/Persistent_Grid_Client_Second_Files.dsp:
+	  A new example added to show the persistence nature of the
+	  server. Please refer to the README file in that directory for
+	  info on how to build and run the tests.
 
 Thu Jul 08 23:55:46 1999  Michael Kircher  <mk1@cs.wustl.edu>
 
-        * tao/TAO.dsp
-        * tao/TAO_Static.dsp: Added the Files Pollable{C,S}.{h,cpp}
-          and Asynch_Invocation.{h,cpp} to the MSVC project files.
+	* tao/TAO.dsp
+	* tao/TAO_Static.dsp: Added the Files Pollable{C,S}.{h,cpp}
+	  and Asynch_Invocation.{h,cpp} to the MSVC project files.
 
 Thu Jul 08 23:29:46 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * tao/Servant_Base.{h,cpp}: Removed the _create_collocated_objref method.
+	* tao/Servant_Base.{h,cpp}: Removed the _create_collocated_objref method.
 
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp: Changed to use
-          a collocation stub factory function pointer to generate
-          collocated stubs.   The hook (function pointer) is defined in
-          *C.{h,cpp} and default to 0.  If the skeleton file is linked
-          with the stub file, the hook will be initialized to use a
-          factory function defined in the skeleton file.
-
-        * TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp:  We
-          no longer need to initialize thru_poa stubs with a servant
-          pointer.  Also removed get_servant() method from thru_poa stub.
-
-        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:  Borrow these two
-          file to define the collocation stub factory function pointer.
+	* TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+	* TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+	* TAO_IDL/be/be_visitor_interface/interface_ss.cpp: Changed to use
+	  a collocation stub factory function pointer to generate
+	  collocated stubs.   The hook (function pointer) is defined in
+	  *C.{h,cpp} and default to 0.  If the skeleton file is linked
+	  with the stub file, the hook will be initialized to use a
+	  factory function defined in the skeleton file.
+
+	* TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp:
+	* TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp:  We
+	  no longer need to initialize thru_poa stubs with a servant
+	  pointer.  Also removed get_servant() method from thru_poa stub.
+
+	* TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+	* TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:  Borrow these two
+	  file to define the collocation stub factory function pointer.
 
 Thu Jul  8 22:55:59 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * Thanks to Michael Kircher and Carlos, we have put together most
-          of the TAO_IDL code and tao code for the AMI call back
-          implementation. This commit is the result of the merging process
-          between the "ami_phase3" branch and the current branch.
+	* Thanks to Michael Kircher and Carlos, we have put together most
+	  of the TAO_IDL code and tao code for the AMI call back
+ 	  implementation. This commit is the result of the merging process
+ 	  between the "ami_phase3" branch and the current branch.
 
-        * Most of the support for the AMI Callback is added. But all the
-          AMI specific code is conditionally compiled using
-          "TAO_HAS_CORBA_MESSAGING" and "TAO_POLLER".
+  	* Most of the support for the AMI Callback is added. But all the
+	  AMI specific code is conditionally compiled using
+ 	  "TAO_HAS_CORBA_MESSAGING" and "TAO_POLLER".
 
 Thu Jul  8 21:50:02 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tests/CDR/run_test.pl:
-          The code to check for errors was broken.
+	* tests/CDR/run_test.pl:
+	  The code to check for errors was broken.
 
-        * tao/PolicyC.cpp:
-          Added missing template instantiation
+	* tao/PolicyC.cpp:
+	  Added missing template instantiation
 
 Thu Jul 08 21:47:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
 
@@ -2240,98 +588,98 @@ Thu Jul 08 21:47:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
 
 Thu Jul  8 21:31:40 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/Typecode.cpp:
-          Added missing template instantiation.
+	* tao/Typecode.cpp:
+	  Added missing template instantiation.
 
 Thu Jul  8 21:02:58 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-        * tao/Connector_Registry.cpp (preprocess_preconnects):
+	* tao/Connector_Registry.cpp (preprocess_preconnects):
 
-          Minor fix for case when preconnect string contains no
-          preconnects (e.g.: "iiop://").
+	  Minor fix for case when preconnect string contains no
+	  preconnects (e.g.: "iiop://").
 
-        * tao/{IIOP,UIOP}_Connect.cpp:
+	* tao/{IIOP,UIOP}_Connect.cpp:
 
-          Cosmetic updates.
+	  Cosmetic updates.
 
 Thu Jul  8 17:18:36 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-        * tao/params.{h,cpp}:
-
-          Changed the preconnects container to an
-          ACE_Unbounded_Queue<ACE_CString> since it allows duplicate
-          values and since it has already been instantiated in ACE.  Since
-          it has already been instantiated in ACE, no increase in TAO's
-          footprint will occur.  Furthermore, since the preconnect
-          processing is not in a performance critical path, no degradation
-          in performance will occur. [Bug 4]
+	* tao/params.{h,cpp}:
 
-        * tao/Connector_Registry.{h,cpp}:
-
-          Added a new preprocess_preconnects() method to "squeeze" all
-          protocol similar preconnects into a single string.  This
-          preprocessing gets around having to iterate over all of the
-          loaded protocols in each protocol connector.  Protocol iteration
-          will remain in the connector registry.  Furthermore,
-          preprocessing the preconnects in this manner also makes it
-          easier for protocol implementers to parse the preconnects.
-          [Bug 4]
-
-        * tao/Protocol_Factory.{h,cpp}:
-        * tao/IIOP_Factory.{h,cpp}:
-        * tao/UIOP_Factory.{h,cpp}:
-
-          Added a prefix() method that returns the expected prefix for the
-          given transport protocol.  One such method already exists in
-          each protocol's Profile class.  However, it makes more sense to
-          get the prefix from the protocol factory in the case that this
-          newly added method is used, currently only in preconnect
-          processing. [Bug 4]
+	  Changed the preconnects container to an
+	  ACE_Unbounded_Queue<ACE_CString> since it allows duplicate
+	  values and since it has already been instantiated in ACE.  Since
+	  it has already been instantiated in ACE, no increase in TAO's
+	  footprint will occur.  Furthermore, since the preconnect
+	  processing is not in a performance critical path, no degradation
+	  in performance will occur. [Bug 4]
 
-        * tao/ORB_Core.cpp (init):
+	* tao/Connector_Registry.{h,cpp}:
 
-          The preconnect provided on the command line wasn't being
-          "consumed" during command line parsing.  Thanks to Steve Totten
-          <totten_s@ociweb.com> for reporting this problem and providing a
-          fix.  [Bug 39]
+	  Added a new preprocess_preconnects() method to "squeeze" all
+	  protocol similar preconnects into a single string.  This
+	  preprocessing gets around having to iterate over all of the
+	  loaded protocols in each protocol connector.  Protocol iteration
+	  will remain in the connector registry.  Furthermore,
+	  preprocessing the preconnects in this manner also makes it
+	  easier for protocol implementers to parse the preconnects.
+	  [Bug 4]
 
-          Update related to the preconnect fixes described above. [Bug 4]
+	* tao/Protocol_Factory.{h,cpp}:
+	* tao/IIOP_Factory.{h,cpp}:
+	* tao/UIOP_Factory.{h,cpp}:
 
-        * tao/ORB_Core.h (TAO_ORB_Core):
+	  Added a prefix() method that returns the expected prefix for the
+	  given transport protocol.  One such method already exists in
+	  each protocol's Profile class.  However, it makes more sense to
+	  get the prefix from the protocol factory in the case that this
+	  newly added method is used, currently only in preconnect
+	  processing. [Bug 4]
 
-          Comment updates.
+	* tao/ORB_Core.cpp (init):
 
-Thu Jul  8 16:30:40 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+	  The preconnect provided on the command line wasn't being
+	  "consumed" during command line parsing.  Thanks to Steve Totten
+	  <totten_s@ociweb.com> for reporting this problem and providing a
+	  fix.  [Bug 39]
 
-        * tao/Sequence_T.h:
-        * tao/Sequence_T.i:
-        * tao/Sequence_T.cpp:
-          Sequences of pseudo objects require a different Object_Manager
-          class
+	  Update related to the preconnect fixes described above. [Bug 4]
 
-        * TAO_IDL/be/be_visitor_sequence/elemtype.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:
-          Fixed to generate the new Pseudo_Object_Manager<> class
+	* tao/ORB_Core.h (TAO_ORB_Core):
 
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
-          The T::_nil() method is defined in the header file to work
-          around g++ problems.
+	  Comment updates.
 
-        * tao/DomainC.cpp:
-        * tao/DomainC.i:
-        * tao/DynAnyC.cpp:
-        * tao/DynSequence_i.cpp:
-        * tao/MessagingC.cpp:
-        * tao/PollableC.cpp:
-        * tao/Request.cpp:
-          Added missing template instantiations
+Thu Jul  8 16:30:40 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/Channel_Clients_T.h:
-          Added missing default parameters
+	* tao/Sequence_T.h:
+	* tao/Sequence_T.i:
+	* tao/Sequence_T.cpp:
+	  Sequences of pseudo objects require a different Object_Manager
+	  class
+
+	* TAO_IDL/be/be_visitor_sequence/elemtype.cpp:
+	* TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp:
+	* TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp:
+	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:
+	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:
+	  Fixed to generate the new Pseudo_Object_Manager<> class
+
+	* TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+	* TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
+	  The T::_nil() method is defined in the header file to work
+	  around g++ problems.
+
+	* tao/DomainC.cpp:
+	* tao/DomainC.i:
+	* tao/DynAnyC.cpp:
+	* tao/DynSequence_i.cpp:
+	* tao/MessagingC.cpp:
+	* tao/PollableC.cpp:
+	* tao/Request.cpp:
+	  Added missing template instantiations
+
+	* orbsvcs/orbsvcs/Channel_Clients_T.h:
+	  Added missing default parameters
 
 Thu Jul 08 15:55:17 1999  David L. Levine  <levine@cs.wustl.edu>
 
@@ -2521,7 +869,7 @@ Wed Jul 07 16:25:05 1999  David L. Levine  <levine@cs.wustl.edu>
             in the 7 bit minor code field.  _info then prints
             out the value.  Not perfect, due to the loss of
             information, but it often provides a lot more useful
-            information than it did before.  [Bug 18]
+            information than it did before.  [18]
 
 Wed Jul  7 16:14:55 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
@@ -4418,7 +2766,8 @@ Sun Jun 27 20:29:38 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
         * tao/POA_CORBA.h (POA_CORBA): Added a no-op constructor for
           the _tao_collocated_Current class to work around a bug with
-          IBM's VisualAge C++ compiler.
+          IBM's VisualAge C++ compiler.  Thanks to Rene Matteau
+          <matteau@ca.ibm.com> for reporting this.
 
         * tao/encode.cpp (encode): Borland's C++ Builder 4.0 doesn't seem
           to align caught exceptions along the correct boundaries!
@@ -6526,340 +4875,340 @@ Sun Jun 20 14:39:23 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 Wed Jul  7 18:13:40 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * tao/Invocation.cpp: Removed the loop around the wait_for_reply.
+	* tao/Invocation.cpp: Removed the loop around the wait_for_reply.
 
-        * TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp: Fixed CC5
-          warnings.
+	* TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp: Fixed CC5
+	  warnings.
 
-        * TAO/tao/Invocation.cpp
-        * TAO/tao/Invocation.i
-        * TAO/tao/Reply_Dispatcher.cpp
-        * TAO/tao/Reply_Dispatcher.h: Integrated the CDR changes done in
-          ACE_CDR. Stealing the CDR content is coded here now.
+	* TAO/tao/Invocation.cpp
+	* TAO/tao/Invocation.i
+	* TAO/tao/Reply_Dispatcher.cpp
+	* TAO/tao/Reply_Dispatcher.h: Integrated the CDR changes done in
+	  ACE_CDR. Stealing the CDR content is coded here now.
 
-        * TAO/tests/AMI/orb_creation.cpp: Fixed CC5 warnings.
+	* TAO/tests/AMI/orb_creation.cpp: Fixed CC5 warnings.
 
 Wed Jul  7 10:55:06 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * Asynch_Invocation.cpp
-        * Asynch_Invocation.h
-        * MessagingC.h
-        * PollableC.cpp
-        * PollableC.h
-        * PollableS.cpp
-        * PollableS.h
-        * Reply_Dispatcher.cpp
-        * Reply_Dispatcher.h: Guarded the AMI specific classes etc with
-          TAO_HAS_CORBA_MESSAGING && TAO_POLLER.
+	* Asynch_Invocation.cpp
+	* Asynch_Invocation.h
+	* MessagingC.h
+	* PollableC.cpp
+	* PollableC.h
+	* PollableS.cpp
+	* PollableS.h
+	* Reply_Dispatcher.cpp
+	* Reply_Dispatcher.h: Guarded the AMI specific classes etc with
+	  TAO_HAS_CORBA_MESSAGING && TAO_POLLER.
 
 Tue Jul  6 22:10:00 1999  Michael Kircher  <mk1@cs.wustl.edu>
 
-        * tao/PollableS.cpp:
-          Replaced three ACE_BASE_CLASS macros with ACE_CORBA_1 macros to
-          get VC to compile it.
+	* tao/PollableS.cpp:
+	  Replaced three ACE_BASE_CLASS macros with ACE_CORBA_1 macros to
+	  get VC to compile it.
 
-        * tao/TAO.dsp
-        * tao/TAO_Static.dsp:
+	* tao/TAO.dsp
+	* tao/TAO_Static.dsp:
           Added the files Pollable{C,S}.{h,cpp} and Asynch_Invocation.{h,cpp}.
 
-        * TAO_IDL/be_include/be_decl.h
-        * TAO_IDL/be/be_decl.cpp
-        * TAO_IDL/be_include/be_interface.h
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
-        * TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
-        * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
-        * TAO_IDL/be/be_visitor_argument/ami_handler_result_arg.cpp:
-          Added code to generate ami_handler_ names. The generated names
-          are held in the corresponding classes, which is then also
-          responsible for deleting it.
-
-        * TAO_IDL/be/be_visitor_operation/ami_handler_argument_marshal.cpp
-        * TAO_IDL/be_include/be_visitor_operation/ami_handler_argument_marshal.h
-        * TAO_IDL/be/be_visitor_argument/ami_handler_upcall_cs.cpp
-        * TAO_IDL/be_include/be_visitor_argument/ami_handler_upcall_cs.h
-        * TAO_IDL/be/be_visitor_argument/ami_handler_vardecl_cs.cpp
-        * TAO_IDL/be_include/be_visitor_argument/ami_handler_vardecl_cs.h
-        * TAO_IDL/be/be_visitor_argument/ami_handler_compiled_marshal_cs.cpp
-        * TAO_IDL/be_include/be_visitor_argument/ami_handler_compiled_marshal_cs.h:
+	* TAO_IDL/be_include/be_decl.h
+	* TAO_IDL/be/be_decl.cpp
+  	* TAO_IDL/be_include/be_interface.h
+  	* TAO_IDL/be/be_interface.cpp:
+  	* TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
+  	* TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
+  	* TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
+  	* TAO_IDL/be/be_visitor_argument/ami_handler_result_arg.cpp:
+	  Added code to generate ami_handler_ names. The generated names
+	  are held in the corresponding classes, which is then also
+	  responsible for deleting it.
+
+  	* TAO_IDL/be/be_visitor_operation/ami_handler_argument_marshal.cpp
+  	* TAO_IDL/be_include/be_visitor_operation/ami_handler_argument_marshal.h
+  	* TAO_IDL/be/be_visitor_argument/ami_handler_upcall_cs.cpp
+  	* TAO_IDL/be_include/be_visitor_argument/ami_handler_upcall_cs.h
+  	* TAO_IDL/be/be_visitor_argument/ami_handler_vardecl_cs.cpp
+  	* TAO_IDL/be_include/be_visitor_argument/ami_handler_vardecl_cs.h
+  	* TAO_IDL/be/be_visitor_argument/ami_handler_compiled_marshal_cs.cpp
+  	* TAO_IDL/be_include/be_visitor_argument/ami_handler_compiled_marshal_cs.h:
           Added these files for code generation of the AMI Handler
-          skeleton.
+	  skeleton.
 
         * TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp
-        * TAO_IDL/be_include/be_visitor_operation/ami_handler_skeleton_cs.h
-        * TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp:
+  	* TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp
+  	* TAO_IDL/be_include/be_visitor_operation/ami_handler_skeleton_cs.h
+  	* TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp:
           Made changes to generate skeleton code for the AMI handler.
 
-        * TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_cs.h
-        * TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp:
-          Added these files for code generation of the AMI handler
-          servant.
+  	* TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_cs.h
+	* TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp:
+	  Added these files for code generation of the AMI handler
+	  servant.
 
-        * TAO_IDL/be/be_codegen.h
-        * TAO_IDL/be/be_visitor_factory.cpp
-        * TAO_IDL/be/be_visitor_interface.cpp
-        * TAO_IDL/be_include/be_visitor_interface.h
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
-          Made changes to generate servant code for the AMI handler.
+  	* TAO_IDL/be/be_codegen.h
+	* TAO_IDL/be/be_visitor_factory.cpp
+  	* TAO_IDL/be/be_visitor_interface.cpp
+  	* TAO_IDL/be_include/be_visitor_interface.h
+  	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+    	  Made changes to generate servant code for the AMI handler.
 
 Tue Jul  6 09:55:42 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * tao/Invocation.cpp
-        * tao/Wait_Strategy.cpp:Commented out the call to
-          <sending_request> in Invocation class.
+	* tao/Invocation.cpp
+	* tao/Wait_Strategy.cpp:Commented out the call to
+	  <sending_request> in Invocation class.
 
-        * client.muxed.conf: Added this file. This enables MT wait
-          strategy and MUXED TMS.
+	* client.muxed.conf: Added this file. This enables MT wait
+	  strategy and MUXED TMS.
 
-        * tests/AMI/client.cpp: Addes sendc method.
+	* tests/AMI/client.cpp: Addes sendc method.
 
 
 
-        * tests/AMI/Makefile
-        * tests/AMI/run_test.pl
-        * tests/AMI/simple-client.conf
-        * tests/AMI/simple-client.cpp
-        * tests/AMI/test-handC.cpp
-        * tests/AMI/test_i.cpp
-        * tests/AMI/test_i.h
-        * tests/AMI/test_i.i:
-          Cosmetic changes to print usefull debug messages with thread id
-          etc.
+	* tests/AMI/Makefile
+	* tests/AMI/run_test.pl
+	* tests/AMI/simple-client.conf
+	* tests/AMI/simple-client.cpp
+	* tests/AMI/test-handC.cpp
+	* tests/AMI/test_i.cpp
+	* tests/AMI/test_i.h
+	* tests/AMI/test_i.i:
+	  Cosmetic changes to print usefull debug messages with thread id
+	  etc.
 
-        * tao/Transport_Mux_Strategy.cpp
-        * tao/Transport_Mux_Strategy.h
-          Changes to these files again for making it MT safe. Added
-          SYNCH_MUTEX to the Hash Table. and protected the
-          request_id_generator with a lock.
+	* tao/Transport_Mux_Strategy.cpp
+	* tao/Transport_Mux_Strategy.h
+	  Changes to these files again for making it MT safe. Added
+	  SYNCH_MUTEX to the Hash Table. and protected the
+	  request_id_generator with a lock.
 
 
-        * tao/GIOP.cpp
-        * tao/IIOP_Transport.cpp
-        * tao/Invocation.cpp
-        * tao/Invocation.i
-        * tao/Pluggable.cpp
-        * tao/Pluggable.h
-        * tao/Reply_Dispatcher.cpp
-        * tao/Reply_Dispatcher.h
-        * tao/Transport_Mux_Strategy.cpp
-        * tao/Transport_Mux_Strategy.h
-        * tao/Wait_Strategy.cpp
-
-          Ooooh!!!. Got the Muxed TMS to work. I havent taken care of the
-          MT case yet. Need to make the Hash Table with SYNCH
-          MUTEX. Things should be ok then.
+	* tao/GIOP.cpp
+	* tao/IIOP_Transport.cpp
+	* tao/Invocation.cpp
+	* tao/Invocation.i
+	* tao/Pluggable.cpp
+	* tao/Pluggable.h
+	* tao/Reply_Dispatcher.cpp
+	* tao/Reply_Dispatcher.h
+	* tao/Transport_Mux_Strategy.cpp
+	* tao/Transport_Mux_Strategy.h
+	* tao/Wait_Strategy.cpp
 
-Sun Jul  4 13:00:38 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+    	  Ooooh!!!. Got the Muxed TMS to work. I havent taken care of the
+	  MT case yet. Need to make the Hash Table with SYNCH
+	  MUTEX. Things should be ok then.
 
-        * Transport_Mux_Strategy.cpp
-        * Transport_Mux_Strategy.h
-        * default_client.cpp: Implemented Muxed TMS. But have nt got to
-          working yet. It is just there not burting anything.
+Sun Jul  4 13:00:38 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * tao/Asynch_Invocation.cpp
-        * tao/Asynch_Invocation.h
-        * tao/Asynch_Invocation.i
-        * tao/Client_Strategy_Factory.cpp
-        * tao/Client_Strategy_Factory.h
-        * tao/Invocation.cpp
-        * tao/Invocation.h
-        * tao/Invocation.i
-        * tao/Pluggable.cpp
-        * tao/Reply_Dispatcher.cpp
-        * tao/Reply_Dispatcher.h
-        * tao/Transport_Mux_Strategy.cpp
-        * tao/Transport_Mux_Strategy.h
-        * tao/default_client.cpp
-        * tao/default_client.h
-
-          Moved the message state from <Invocation> classes to the
-          Transport Mux Strategy. This makes it  to have the behavior of
-          Transport object acccesing the messaging state uniform, across
-          Muxed and Exclusive TMS. I have not done Muxed TMS yet.
+	* Transport_Mux_Strategy.cpp
+	* Transport_Mux_Strategy.h
+	* default_client.cpp: Implemented Muxed TMS. But have nt got to
+	  working yet. It is just there not burting anything.
+
+	* tao/Asynch_Invocation.cpp
+	* tao/Asynch_Invocation.h
+	* tao/Asynch_Invocation.i
+	* tao/Client_Strategy_Factory.cpp
+	* tao/Client_Strategy_Factory.h
+	* tao/Invocation.cpp
+	* tao/Invocation.h
+	* tao/Invocation.i
+	* tao/Pluggable.cpp
+	* tao/Reply_Dispatcher.cpp
+	* tao/Reply_Dispatcher.h
+	* tao/Transport_Mux_Strategy.cpp
+	* tao/Transport_Mux_Strategy.h
+	* tao/default_client.cpp
+	* tao/default_client.h
+
+	  Moved the message state from <Invocation> classes to the
+	  Transport Mux Strategy. This makes it  to have the behavior of
+	  Transport object acccesing the messaging state uniform, across
+	  Muxed and Exclusive TMS. I have not done Muxed TMS yet.
 
 Sat Jul  3 10:54:00 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_factory.cpp
-        * TAO_IDL/be_include/be_codegen.h
-        * tao/Asynch_Invocation.cpp
-        * tao/Asynch_Invocation.h
-        * tao/Asynch_Invocation.i
-        * tao/Invocation.cpp
-        * tao/Invocation.h
+	* TAO_IDL/be/be_visitor_factory.cpp
+	* TAO_IDL/be_include/be_codegen.h
+	* tao/Asynch_Invocation.cpp
+	* tao/Asynch_Invocation.h
+	* tao/Asynch_Invocation.i
+	* tao/Invocation.cpp
+	* tao/Invocation.h
 
-          Moved the transport_->idle () to the derived class'
-          constructors.
+  	  Moved the transport_->idle () to the derived class'
+	  constructors.
 
-        * tests/AMI/test.idl
+	* tests/AMI/test.idl
 
-          Just commented out the other methods. Left only get_number.
+  	  Just commented out the other methods. Left only get_number.
 
-        * Makefile
-        * client.tss.conf
+	* Makefile
+	* client.tss.conf
         * server.dsp
-        * test_i.cpp
-        * README
-        * orb_creation.cpp
-        * simple-client.conf
-        * test_i.h
-        * client.conf
-        * orb_creation.dsp
-        * simple-client.cpp
-        * test_i.i
-        * client.cpp
-        * run_test.pl*
-        * simple_client.dsp
-        * update.log
-        * client.dsp
-        * server.conf
-        * test-handC.cpp
-
-          Files for the simple test. But you actually need server and
-          simple-client test files right now.
-
-
-        * tests/AMI/simple-client.cpp: Removed the iteration part from the
-          test. Let us keep it really simple.
-
-        * TAO_IDL/be/be_visitor_factory.cpp
-        * TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
-          Changes for generating Reply Handler skeletons.
-
-        * TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp:
-          Added this file. This file generates the demarshalling skeletons
-          for the Reply Handler and then calls the Reply Handler's call
-          back hook methods. This file is not fully done yet. But this
-          visitor is not used for the time being.
-
-        * tao/Transport_Mux_Strategy.cpp: Fixed the explicit template
-          instantiation problems.
+	* test_i.cpp
+	* README
+	* orb_creation.cpp
+	* simple-client.conf
+	* test_i.h
+	* client.conf
+	* orb_creation.dsp
+	* simple-client.cpp
+	* test_i.i
+	* client.cpp
+	* run_test.pl*
+	* simple_client.dsp
+	* update.log
+	* client.dsp
+	* server.conf
+	* test-handC.cpp
+
+  	  Files for the simple test. But you actually need server and
+	  simple-client test files right now.
+
+
+	* tests/AMI/simple-client.cpp: Removed the iteration part from the
+	  test. Let us keep it really simple.
+
+	* TAO_IDL/be/be_visitor_factory.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
+	  Changes for generating Reply Handler skeletons.
+
+	* TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp:
+	  Added this file. This file generates the demarshalling skeletons
+	  for the Reply Handler and then calls the Reply Handler's call
+	  back hook methods. This file is not fully done yet. But this
+	  visitor is not used for the time being.
+
+	* tao/Transport_Mux_Strategy.cpp: Fixed the explicit template
+	  instantiation problems.
 
 Fri Jul  2 16:28:08 1999 Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-          Another big step generating code for AMI. Done with sendc
-          methods and Reply Handler call back methods. Both header files
-          and cpp files contents.
-
-          TO-DO: Reply Handler skeletons. Reply Handler servants.
-
-        * tao/Asynch_Invocation.h
-        * tao/Asynch_Invocation.i
-        * tao/Makefile
-        * tao/MessagingC.h
-        * tao/MessagingS.cpp
-        * tao/Reply_Dispatcher.cpp
-        * tao/Reply_Dispatcher.h
-
-        * TAO_IDL/Makefile
-        * TAO_IDL/ast/ast_decl.cpp
-        * TAO_IDL/be/be_codegen.cpp
-        * TAO_IDL/be/be_decl.cpp
-        * TAO_IDL/be/be_interface.cpp
-        * TAO_IDL/be/be_type.cpp
-        * TAO_IDL/be/be_visitor_argument.cpp
-        * TAO_IDL/be/be_visitor_factory.cpp
-        * TAO_IDL/be/be_visitor_interface.cpp
-        * TAO_IDL/be/be_visitor_operation.cpp
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
-        * TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp
-        * TAO_IDL/be/be_visitor_interface/interface.cpp
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_ch.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp
-        * TAO_IDL/be/be_visitor_operation/argument.cpp
-        * TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
-        * TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp
-        * TAO_IDL/be/be_visitor_operation/rettype.cpp
-        * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
-        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
-        * TAO_IDL/be_include/be_codegen.h
-        * TAO_IDL/be_include/be_decl.h
-        * TAO_IDL/be_include/be_interface.h
-        * TAO_IDL/be_include/be_type.h
-        * TAO_IDL/be_include/be_visitor_argument.h
-        * TAO_IDL/be_include/be_visitor_interface.h
-        * TAO_IDL/be_include/be_visitor_operation.h
-        * TAO_IDL/include/ast_decl.h
-
-          Added the following files for the changes mentioned above.
-
-        * TAO_IDL/be/be_visitor_rettype.cpp
-        * TAO_IDL/be/be_visitor_argument/ami_handler_result_arg.cpp
-        * TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp
-        * TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
-        * TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_handler_result_arg.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_handler_operation.cpp
-        * TAO_IDL/be_include/be_visitor_argument/ami_handler_result_arg.h
-        * TAO_IDL/be_include/be_visitor_interface/collocated_ami_handler_ch.h
-        * TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_ch.h
-        * TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_cs.h
-        * TAO_IDL/be_include/be_visitor_operation/ami_handler_operation_cs.h
-        * TAO_IDL/be_include/be_visitor_operation/ami_handler_result_arg.h
-        * TAO_IDL/be_include/be_visitor_operation/ami_handler_operation.h
+	  Another big step generating code for AMI. Done with sendc
+	  methods and Reply Handler call back methods. Both header files
+	  and cpp files contents.
+
+  	  TO-DO: Reply Handler skeletons. Reply Handler servants.
+
+	* tao/Asynch_Invocation.h
+	* tao/Asynch_Invocation.i
+	* tao/Makefile
+	* tao/MessagingC.h
+	* tao/MessagingS.cpp
+	* tao/Reply_Dispatcher.cpp
+	* tao/Reply_Dispatcher.h
+
+	* TAO_IDL/Makefile
+	* TAO_IDL/ast/ast_decl.cpp
+	* TAO_IDL/be/be_codegen.cpp
+	* TAO_IDL/be/be_decl.cpp
+	* TAO_IDL/be/be_interface.cpp
+	* TAO_IDL/be/be_type.cpp
+	* TAO_IDL/be/be_visitor_argument.cpp
+	* TAO_IDL/be/be_visitor_factory.cpp
+	* TAO_IDL/be/be_visitor_interface.cpp
+	* TAO_IDL/be/be_visitor_operation.cpp
+	* TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp
+	* TAO_IDL/be/be_visitor_interface/interface.cpp
+	* TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_ch.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp
+	* TAO_IDL/be/be_visitor_operation/argument.cpp
+	* TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
+	* TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
+	* TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/rettype.cpp
+	* TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
+	* TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+	* TAO_IDL/be_include/be_codegen.h
+	* TAO_IDL/be_include/be_decl.h
+	* TAO_IDL/be_include/be_interface.h
+	* TAO_IDL/be_include/be_type.h
+	* TAO_IDL/be_include/be_visitor_argument.h
+	* TAO_IDL/be_include/be_visitor_interface.h
+	* TAO_IDL/be_include/be_visitor_operation.h
+	* TAO_IDL/include/ast_decl.h
+
+  	  Added the following files for the changes mentioned above.
+
+	* TAO_IDL/be/be_visitor_rettype.cpp
+	* TAO_IDL/be/be_visitor_argument/ami_handler_result_arg.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
+	* TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_result_arg.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_operation.cpp
+	* TAO_IDL/be_include/be_visitor_argument/ami_handler_result_arg.h
+	* TAO_IDL/be_include/be_visitor_interface/collocated_ami_handler_ch.h
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_ch.h
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_cs.h
+	* TAO_IDL/be_include/be_visitor_operation/ami_handler_operation_cs.h
+	* TAO_IDL/be_include/be_visitor_operation/ami_handler_result_arg.h
+	* TAO_IDL/be_include/be_visitor_operation/ami_handler_operation.h
 
 Wed Jun 23 23:19:34 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-           Added Asynch Invocation class. It makes invocations without
-           waiting for the reply. Implemented a portion of Asynch Reply
-           Dispatcher and Muxed TMS. Not complete yet.
+	   Added Asynch Invocation class. It makes invocations without
+	   waiting for the reply. Implemented a portion of Asynch Reply
+	   Dispatcher and Muxed TMS. Not complete yet.
 
-         * tao/IIOP_Transport.cpp:
-         * tao/Invocation.cpp:
-         * tao/Invocation.p:
-         * tao/Makefilp:
-         * tao/Reply_Dispatcher.cpp:
-         * tao/Reply_Dispatcher.p:
-         * tao/Transport_Mux_Strategy.cpp:
-         * tao/Transport_Mux_Strategy.p:
+  	 * tao/IIOP_Transport.cpp:
+	 * tao/Invocation.cpp:
+	 * tao/Invocation.p:
+	 * tao/Makefilp:
+	 * tao/Reply_Dispatcher.cpp:
+	 * tao/Reply_Dispatcher.p:
+	 * tao/Transport_Mux_Strategy.cpp:
+	 * tao/Transport_Mux_Strategy.p:
 
-        Added the following files.
+  	Added the following files.
 
-         * tao/Asynch_Invocation.cpp:
-         * tao/Asynch_Invocation.h:
-         * tao/Asynch_Invocation.i:
+	 * tao/Asynch_Invocation.cpp:
+	 * tao/Asynch_Invocation.h:
+	 * tao/Asynch_Invocation.i:
 
 Tue Jun 22 11:59:06 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        One more big step on generating AMI call back code. If I get rid
-        of the references to the ReplyHandler from the generated files,
-        I could get things to compile.
-
-        * TAO_IDL/Makefile:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_factory.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_scope.cpp:
-        * TAO_IDL/be/be_visitor_argument/ami_handler_arglist.cpp:
-        * TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_visitor_interface.h:
-        * TAO_IDL/be_include/be_visitor_operation/ami_handler_arglist.h:
-
-        Changes for the above.
-
-        * TAO_IDL/be/be_visitor_interface/ami_handler_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp:
-        * TAO_IDL/be_include/be_visitor_interface/ami_handler_cs.h:
-        * TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_ch.h:
-
-        Added these files.
+  	One more big step on generating AMI call back code. If I get rid
+	of the references to the ReplyHandler from the generated files,
+	I could get things to compile.
+
+	* TAO_IDL/Makefile:
+	* TAO_IDL/be/be_codegen.cpp:
+	* TAO_IDL/be/be_interface.cpp:
+	* TAO_IDL/be/be_visitor_factory.cpp:
+	* TAO_IDL/be/be_visitor_interface.cpp:
+	* TAO_IDL/be/be_visitor_scope.cpp:
+	* TAO_IDL/be/be_visitor_argument/ami_handler_arglist.cpp:
+	* TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp:
+	* TAO_IDL/be/be_visitor_interface/interface.cpp:
+	* TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_arglist.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_ch.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp:
+	* TAO_IDL/be_include/be_codegen.h:
+	* TAO_IDL/be_include/be_visitor_interface.h:
+	* TAO_IDL/be_include/be_visitor_operation/ami_handler_arglist.h:
+
+  	Changes for the above.
+
+  	* TAO_IDL/be/be_visitor_interface/ami_handler_cs.cpp:
+	* TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp:
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_cs.h:
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_ch.h:
+
+  	Added these files.
 
 Sun Jun 20 07:40:02 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
 
diff --git a/TAO/Makefile b/TAO/Makefile
index 169784a4efc..9af9addbdc7 100644
--- a/TAO/Makefile
+++ b/TAO/Makefile
@@ -104,5 +104,5 @@ CHECK =
 #### Then, make releasetao is invoked to actually create the kit.
 release: INSTALL
 	@$(ACE_ROOT)/bin/make_release $(CHECK) -k tao -t $(REL) \
-	   -c "$(CONTROLLED_FILES)" -r "$(RELEASE_FILES)" -u  &&  \
+	   -c "$(CONTROLLED_FILES)" -r "$(RELEASE_FILES)"  &&  \
 	 cd ..  &&  $(MAKE) releasetao
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 6f00d306627..ddc8bf017c4 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -25,8 +25,8 @@
 To: ace-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 0.4.3
-    ACE VERSION: 4.6.46
+    TAO VERSION: 0.4
+    ACE VERSION: 4.6.43
 
     HOST MACHINE and OPERATING SYSTEM:
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 8ff61a0accc..10cbae294a0 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -189,13 +189,14 @@ compiler) add a variable <CODE>CPP_LOCATION</CODE> to your environment
 and set it to the compiler you want to use.  This variable will
 override the default.  </P>
 
-<P>Set <CODE>ACE_ROOT</CODE> environment variable as outlined in the <a
-href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html"> ACE
-installation notes</A>.  Alternatively, you can use <code> TAO_ROOT </code>
-environment variable if you have customized TAO installation.  This is only
-required if you are planning to use the &lt;orb.idl&gt; standard include in your
-IDL code.  Notice that some of the TAO services use this feature, so you are
-better off definining the environment variable in all cases.  </P>
+<P>Set <CODE>ACE_ROOT</CODE> environment variable as outlined in the
+    <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">ACE installation notes</A>.
+      This is only required if you are planning to use the
+      &lt;orb.idl&gt; standard include in your IDL code.
+      Notice that some of the TAO services use this feature, so you
+      are better off definining the environment variable in all
+      cases.
+</P>
 
 <p><a href="http://www.torus-software.com/">Barry
 Hoggard</a> maintains a <a
diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile
index 5a1612caa20..e6bc88821c6 100644
--- a/TAO/TAO_IDL/Makefile
+++ b/TAO/TAO_IDL/Makefile
@@ -14,6 +14,7 @@ endif # ! TAO_ROOT
 
 BIN     = tao_idl
 LDLIBS = -lACE
+BUILD   = $(BIN)
 
 VPATH=.:driver:fe:ast:util:narrow:be
 
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 762f4001986..c8e1dc69352 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -648,72 +648,69 @@ AST_Interface::dump(ostream &o)
 }
 
 void
-AST_Interface::fwd_redefinition_helper (AST_Interface *&i, 
-                                        UTL_Scope *s,
-                                        UTL_StrList *p)
+AST_Interface::fwd_redefinition_helper (AST_Interface *&i, UTL_Scope *s,
+                                                           UTL_StrList *p)
 {
-  AST_Decl *d = NULL;
-  AST_Interface *fd = NULL;
-
-  if (i != NULL && (d = s->lookup_by_name (i->name (), 
-                                           I_FALSE)) 
-      != NULL) 
-    {
-      // See if we're defining a forward declared interface.
-      if (d->node_type () == AST_Decl::NT_interface) 
-        {
-          // Narrow to an interface
-          fd = AST_Interface::narrow_from_decl (d);
-
-          // Successful?
-          if (fd == NULL) 
-            {
-              // Should we give an error here? ... no, look in fe_add_interface
-            }
-
-          // If it is a forward declared interface..
-          else if (!fd->is_defined ()) 
-            {
-              // Check if redefining in same scope. If a module is reopened,
-              // a new pointer in created, and the first term below will be true.
-              // In that case, the scoped names must be compared.
-              if (fd->defined_in () != s 
-                  && !AST_Interface::compare_names (fd, 
-                                                    i)) 
-                {
-                  idl_global->err ()->error2 (UTL_Error::EIDL_SCOPE_CONFLICT,
-                                              i,
-                                              fd);
-                }
-
-              // All OK, do the redefinition
-              else 
-                {
-#                 ifdef IDL_HAS_VALUETYPE
-
-                  // only redefinition of the same kind
-                  if ((i->is_valuetype () != fd->is_valuetype ()) 
-                      || (i->is_abstract_valuetype () != fd->is_abstract_valuetype ()) 
-                      || (i->is_abstract_interface () != fd->is_abstract_interface ()))
-                    {
-                      idl_global->err ()->error2 (UTL_Error::EIDL_REDEF, 
-                                                  i, 
-                                                  fd);
-                      return;
-                    }
-
-#                 endif /* IDL_HAS_VALUETYPE */
-
-                  fd->redefine (i, 
-                                p);
-
-                  // Use full definition node
-                  delete i;
-                  i = fd;
-                }
-            }
+  AST_Decl        *d = NULL;
+  AST_Interface   *fd = NULL;
+
+  if (i != NULL &&
+      (d = s->lookup_by_name(i->name(), I_FALSE)) != NULL) {
+    /*
+     * See if we're defining a forward declared interface.
+     */
+    if (d->node_type() == AST_Decl::NT_interface) {
+      /*
+       * Narrow to an interface
+       */
+      fd = AST_Interface::narrow_from_decl(d);
+      /*
+       * Successful?
+       */
+      if (fd == NULL) {
+        /*
+         * Should we give an error here? ... no, look in fe_add_interface
+         */
+      }
+      /*
+       * If it is a forward declared interface..
+       */
+      else if (!fd->is_defined()) {
+        /*
+         * Check if redefining in same scope
+         */
+        if (fd->defined_in() != s) {
+          idl_global->err()
+             ->error3(UTL_Error::EIDL_SCOPE_CONFLICT,
+                      i,
+                      fd,
+                      ScopeAsDecl(s));
+        }
+        /*
+         * All OK, do the redefinition
+         */
+        else {
+#         ifdef IDL_HAS_VALUETYPE
+          /* only redefinition of the same kind */
+          if ((i->is_valuetype() != fd->is_valuetype()) ||
+              (i->is_abstract_valuetype() != fd->is_abstract_valuetype()) ||
+              (i->is_abstract_interface() != fd->is_abstract_interface()))
+          {
+             idl_global->err()->error2(UTL_Error::EIDL_REDEF, i, fd);
+             return;
+          }
+#         endif /* IDL_HAS_VALUETYPE */
+
+          fd->redefine (i, p);
+          /*
+           * Use full definition node
+           */
+          delete i;
+          i = fd;
         }
+      }
     }
+  }
 }
 
 
@@ -760,52 +757,6 @@ AST_Interface::set_n_inherits(long i)
   pd_n_inherits = i;
 }
 
-// Get the scoped names and, if they are the same 
-// length, iterate over them, comparing each term.
-idl_bool
-AST_Interface::compare_names (AST_Interface *that,
-                              AST_Interface *other)
-{
-  UTL_ScopedName *that_name = that->name ();
-  UTL_ScopedName *other_name = other->name ();
-
-  long that_length = that_name->length ();
-
-  if (that_length != other_name->length ())
-    {
-      return I_FALSE;
-    }
-
-  Identifier *that_id = 0;
-  Identifier *other_id = 0;
-
-  UTL_IdListActiveIterator *that_iter = 
-    new UTL_IdListActiveIterator (that_name);
-  UTL_IdListActiveIterator *other_iter = 
-    new UTL_IdListActiveIterator (other_name);
-
-  for (int i = 0; i < that_length; i++)
-    {
-      that_id = that_iter->item ();
-      other_id = other_iter->item ();
-
-      if (ACE_OS::strcmp (that_id->get_string (),
-                          other_id->get_string ()))
-        {
-          delete that_iter;
-          delete other_iter;
-          return I_FALSE;
-        }
-
-      that_iter->next ();
-      other_iter->next ();
-    }
-
-  delete that_iter;
-  delete other_iter;
-  return I_TRUE;
-}
-
 /*
  * Narrowing methods
  */
diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp
index 1e7b22dab0c..7cb74273141 100644
--- a/TAO/TAO_IDL/ast/ast_union.cpp
+++ b/TAO/TAO_IDL/ast/ast_union.cpp
@@ -129,9 +129,6 @@ AST_Union::AST_Union(AST_ConcreteType *dt, UTL_ScopedName *n, UTL_StrList *p)
     case AST_PredefinedType::PT_char:
       pd_udisc_type = AST_Expression::EV_char;
       break;
-    case AST_PredefinedType::PT_wchar:
-      pd_udisc_type = AST_Expression::EV_wchar;
-      break;
     case AST_PredefinedType::PT_octet:
       pd_udisc_type = AST_Expression::EV_octet;
       break;
diff --git a/TAO/TAO_IDL/be/be_args.cpp b/TAO/TAO_IDL/be/be_args.cpp
index fd4091222af..67bcd83d2b9 100644
--- a/TAO/TAO_IDL/be/be_args.cpp
+++ b/TAO/TAO_IDL/be/be_args.cpp
@@ -82,10 +82,6 @@ BE_prep_arg(char *s, idl_bool)
 {
   const char arg_macro[]="export_macro=";
   const char arg_include[]="export_include=";
-  const char skel_arg_macro[]="skel_export_macro=";
-  const char skel_arg_include[]="skel_export_include=";
-  const char stub_arg_macro[]="stub_export_macro=";
-  const char stub_arg_include[]="stub_export_include=";
   const char arg_pch_include[]="pch_include=";
 #ifdef IDL_HAS_VALUETYPE
   const char obv_opt_accessor[]="obv_opt_accessor";
@@ -99,33 +95,12 @@ BE_prep_arg(char *s, idl_bool)
       if (ACE_OS::strstr (arg, arg_macro) == arg)
         {
           char* val = arg + sizeof (arg_macro) - 1;
-          idl_global->skel_export_macro (val);
-          idl_global->stub_export_macro (val);
+          idl_global->export_macro (val);
         }
       else if (ACE_OS::strstr (arg, arg_include) == arg)
         {
           char* val = arg + sizeof (arg_include) - 1;
-          idl_global->stub_export_include (val);
-        }
-      else if (ACE_OS::strstr (arg, skel_arg_macro) == arg)
-        {
-          char* val = arg + sizeof (skel_arg_macro) - 1;
-          idl_global->skel_export_macro (val);
-        }
-      else if (ACE_OS::strstr (arg, skel_arg_include) == arg)
-        {
-          char* val = arg + sizeof (skel_arg_include) - 1;
-          idl_global->skel_export_include (val);
-        }
-      else if (ACE_OS::strstr (arg, stub_arg_macro) == arg)
-        {
-          char* val = arg + sizeof (stub_arg_macro) - 1;
-          idl_global->stub_export_macro (val);
-        }
-      else if (ACE_OS::strstr (arg, stub_arg_include) == arg)
-        {
-          char* val = arg + sizeof (stub_arg_include) - 1;
-          idl_global->stub_export_include (val);
+          idl_global->export_include (val);
         }
       else if (ACE_OS::strstr (arg, arg_pch_include) == arg)
         {
diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
index 3d299062f36..dac2ad3fc56 100644
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ b/TAO/TAO_IDL/be/be_array.cpp
@@ -100,7 +100,7 @@ be_array::tao_name (void)
         }
 
       char buf[16];
-      ACE_OS::sprintf (buf, "_%4.4x", ((int) expr->ev ()->u.ulval));
+      ACE_OS::sprintf (buf, "_%04.4x", ((int)expr->ev ()->u.ulval));
       ACE_OS::strcat (this->tao_name_, buf);
     }
   return this->tao_name_;
@@ -232,7 +232,6 @@ be_array::compute_size_type (void)
 
   // our size type is the same as our type
   this->size_type (type->size_type ());
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 8b3c5b01397..0d943c59d16 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -186,26 +186,26 @@ TAO_CodeGen::start_client_header (const char *fname)
 
       // Other include files.
 
-      if (idl_global->stub_export_include () != 0)
+      if (idl_global->export_include () != 0)
         {
           *this->client_header_ << "#include \""
-                                << idl_global->stub_export_include ()
+                                << idl_global->export_include ()
                                 << "\"\n";
         }
 
-      // Include the Messaging files if AMI is enabled.
+      // Include the Messaging files if AMI is enabled. 
       if (idl_global->ami_call_back () == I_TRUE)
         {
           // Include Messaging skeleton file.
           *this->client_header_ << "#include ";
-
+          
           if (idl_global->changing_standard_include_files () == 1)
             *this->client_header_ << "\"";
           else
             *this->client_header_ << "<";
-
+          
           *this->client_header_ << "tao/MessagingS.h";
-
+          
           if (idl_global->changing_standard_include_files () == 1)
             *this->client_header_ << "\"\n";
           else
@@ -213,14 +213,14 @@ TAO_CodeGen::start_client_header (const char *fname)
 
           // Including Asynch Invocation file.
           *this->client_header_ << "#include ";
-
+          
           if (idl_global->changing_standard_include_files () == 1)
             *this->client_header_ << "\"";
           else
             *this->client_header_ << "<";
-
+          
           *this->client_header_ << "tao/Asynch_Invocation.h";
-
+          
           if (idl_global->changing_standard_include_files () == 1)
             *this->client_header_ << "\"\n";
           else
@@ -270,7 +270,7 @@ TAO_CodeGen::start_client_header (const char *fname)
       *this->client_header_ << "#undef TAO_EXPORT_MACRO\n";
       *this->client_header_ << "#endif\n";
       *this->client_header_ << "#define TAO_EXPORT_MACRO "
-                            << idl_global->stub_export_macro ()
+                            << idl_global->export_macro ()
                             << be_nl;
 
       // Generate export macro for nested classes
@@ -280,7 +280,7 @@ TAO_CodeGen::start_client_header (const char *fname)
         << "#    undef TAO_EXPORT_NESTED_MACRO\n"
         << "#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */\n"
         << "#  define TAO_EXPORT_NESTED_MACRO "
-        << idl_global->stub_export_macro ()
+        << idl_global->export_macro ()
         << be_nl
         << "#endif /* TAO_EXPORT_NESTED_CLASSES */\n";
 
@@ -462,13 +462,6 @@ TAO_CodeGen::start_server_header (const char *fname)
                             << "#pragma warning(disable:4250)\n"
                             << "#endif /* _MSC_VER */\n\n";
 
-      if (idl_global->skel_export_include () != 0)
-        {
-          *this->server_header_ << "#include \""
-                                << idl_global->skel_export_include ()
-                                << "\"\n";
-        }
-
       return 0;
     }
 }
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index 92d7efb4790..b658bae2df4 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -40,15 +40,11 @@ be_decl::be_decl (void)
     cli_hdr_cdr_op_gen_ (I_FALSE),
     cli_stub_cdr_op_gen_ (I_FALSE),
     cli_inline_cdr_op_gen_ (I_FALSE),
-    fullname_ (0),
-    ami_handler_fullname_ (0),
-    flatname_ (0),
-    ami_handler_flatname_ (0),
+    full_name_ (0),
+    flat_name_ (0),
     repoID_ (0),
-    ami_handler_repoID_ (0),
     prefix_ (0),
-    size_type_ (be_decl::SIZE_UNKNOWN),
-    has_constructor_ (I_FALSE)
+    size_type_ (be_decl::SIZE_UNKNOWN)
 {
 }
 
@@ -69,51 +65,32 @@ be_decl::be_decl (AST_Decl::NodeType type,
     cli_stub_any_op_gen_ (I_FALSE),
     cli_hdr_cdr_op_gen_ (I_FALSE),
     cli_stub_cdr_op_gen_ (I_FALSE),
-    fullname_ (0),
-    ami_handler_fullname_ (0),
-    flatname_ (0),
-    ami_handler_flatname_ (0),
+    full_name_ (0),
+    flat_name_ (0),
     repoID_ (0),
-    ami_handler_repoID_ (0),
     prefix_ (0),
-    size_type_ (be_decl::SIZE_UNKNOWN),
-    has_constructor_ (I_FALSE)
+    size_type_ (be_decl::SIZE_UNKNOWN)
 {
 }
 
 //destructor
 be_decl::~be_decl (void)
 {
-  if (this->fullname_ != 0)
+  if (this->full_name_ != 0)
     {
-      delete[] this->fullname_;
-      this->fullname_ = 0;
+      delete[] this->full_name_;
+      this->full_name_ = 0;
     }
-  if (this->ami_handler_fullname_ != 0)
+  if (this->flat_name_ != 0)
     {
-      delete[] this->ami_handler_fullname_;
-      this->ami_handler_fullname_ = 0;
-    }
-  if (this->flatname_ != 0)
-    {
-      delete[] this->flatname_;
-      this->flatname_ = 0;
-    }
-  if (this->ami_handler_flatname_ != 0)
-    {
-      delete[] this->ami_handler_flatname_;
-      this->ami_handler_flatname_ = 0;
+      delete[] this->flat_name_;
+      this->flat_name_ = 0;
     }
   if (this->repoID_ != 0)
     {
       delete[] this->repoID_;
       this->repoID_ = 0;
     }
-  if (this->ami_handler_repoID_ != 0)
-    {
-      delete[] this->ami_handler_repoID_;
-      this->ami_handler_repoID_ = 0;
-    }
   if (this->prefix_ != 0)
     {
       delete[] this->prefix_;
@@ -149,30 +126,19 @@ be_decl::size_type (be_decl::SIZE_TYPE st)
 }
 
 const char*
-be_decl::fullname (void)
+be_decl::full_name (void)
 {
-  if (!this->fullname_)
-    compute_fullname ();
+  if (!this->full_name_)
+    compute_full_name ();
 
-  return this->fullname_;
+  return this->full_name_;
 }
 
-const char*
-be_decl::ami_handler_fullname (void)
-{
-  if (!this->ami_handler_fullname_)
-    compute_ami_handler_name (this->fullname (),
-                              this->ami_handler_fullname_);
-
-  return this->ami_handler_fullname_;
-}
-
-
 // compute stringified fully scoped name
 void
-be_decl::compute_fullname (void)
+be_decl::compute_full_name (void)
 {
-  if (fullname_)
+  if (full_name_)
     return;
   else
     {
@@ -204,19 +170,19 @@ be_decl::compute_fullname (void)
         }
       delete i;
 
-      this->fullname_ = new char [namelen+1];
-      this->fullname_[0] = '\0';
+      this->full_name_ = new char [namelen+1];
+      this->full_name_[0] = '\0';
       first = I_TRUE;
       second = I_FALSE;
       i = new UTL_IdListActiveIterator (this->name ());
       while (!(i->is_done ()))
         {
           if (!first)
-            ACE_OS::strcat (this->fullname_, "::");
+            ACE_OS::strcat (this->full_name_, "::");
           else if (second)
             first = second = I_FALSE;
           // print the identifier
-          ACE_OS::strcat (this->fullname_, i->item ()->get_string ());
+          ACE_OS::strcat (this->full_name_, i->item ()->get_string ());
           if (first)
             {
               if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
@@ -232,30 +198,81 @@ be_decl::compute_fullname (void)
   return;
 }
 
-const char*
-be_decl::flatname (void)
+void
+be_decl::compute_full_name  (const char *prefix, 
+                            const char *suffix,
+                            char *&name)
 {
-  if (!this->flatname_)
-    this->compute_flatname ();
+  if (prefix == 0 || suffix == 0)
+    return;
+
+  ACE_CString prefix_str (prefix);
+  ACE_CString suffix_str (suffix);
+
+  ACE_CString result_str;
+
+  // Get parent.
+  if (this->defined_in () == 0)
+    {
+      // Global scope.
+
+      // Prefix.
+      result_str = prefix_str;
 
-  return this->flatname_;
+      // Local name.
+      result_str += ACE_CString (this->local_name ()->get_string ());
+
+      // Suffix.
+      result_str += suffix_str;
+    }
+  else
+    {
+      // Get scope name.
+      be_decl *parent = be_scope::narrow_from_scope (this->defined_in ())->decl ();
+      if (parent == 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "(%N:%l) be_decl::"
+                      "compute_flat_name - "
+                      "scope name is nil\n"));
+        }
+
+      // Parent name.
+      result_str = ACE_CString (parent->full_name ());
+
+      // _
+      if (ACE_OS::strcmp (parent->full_name (), "") != 0)
+        result_str += ACE_CString ("::");
+
+      // Prefix.
+      result_str += prefix_str;
+
+      // Local name.
+      result_str += ACE_CString (this->local_name ()->get_string ());
+
+      // Suffix.
+      result_str += suffix_str;
+    }
+
+  name = result_str.rep ();
 }
 
+
 const char*
-be_decl::ami_handler_flatname (void)
+be_decl::flat_name (void)
 {
-  if (!this->ami_handler_flatname_)
-    this->compute_flatname ("AMI_","_Handler");
+  if (!this->flat_name_)
+    this->compute_flat_name ();
 
-  return this->ami_handler_flatname_;
+  return this->flat_name_;
 }
 
 
 // compute stringified flattened fully scoped name
 void
-be_decl::compute_flatname (void)
+be_decl::compute_flat_name (void)
 {
-  if (flatname_)
+  if (flat_name_)
     return;
   else
     {
@@ -288,19 +305,19 @@ be_decl::compute_flatname (void)
         }
       delete i;
 
-      this->flatname_ = new char [namelen+1];
-      this->flatname_[0] = '\0';
+      this->flat_name_ = new char [namelen+1];
+      this->flat_name_[0] = '\0';
       first = I_TRUE;
       second = I_FALSE;
       i = new UTL_IdListActiveIterator (this->name ());
       while (!(i->is_done ()))
         {
           if (!first)
-            ACE_OS::strcat (this->flatname_, "_");
+            ACE_OS::strcat (this->flat_name_, "_");
           else if (second)
             first = second = I_FALSE;
           // print the identifier
-          ACE_OS::strcat (this->flatname_, i->item ()->get_string ());
+          ACE_OS::strcat (this->flat_name_, i->item ()->get_string ());
           if (first)
             {
               if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
@@ -318,11 +335,13 @@ be_decl::compute_flatname (void)
 
 
 
-char *
-be_decl::compute_flatname  (const char *prefix, const char *suffix)
+void
+be_decl::compute_flat_name  (const char *prefix, 
+                            const char *suffix,
+                            char *&name)
 {
   if (prefix == 0 || suffix == 0)
-    return 0;
+    return;
 
   ACE_CString prefix_str (prefix);
   ACE_CString suffix_str (suffix);
@@ -349,22 +368,21 @@ be_decl::compute_flatname  (const char *prefix, const char *suffix)
       be_decl *parent = be_scope::narrow_from_scope (this->defined_in ())->decl ();
       if (parent == 0)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_decl::"
-                             "compute_flat_name - "
-                             "scope name is nil\n"),
-                            0);
+          ACE_ERROR ((LM_ERROR,
+                      "(%N:%l) be_decl::"
+                      "compute_flat_name - "
+                      "scope name is nil\n"));
         }
 
       // Parent name.
-      result_str = ACE_CString (parent->fullname ());
+      result_str = ACE_CString (parent->full_name ());
 
       // _
-      if (ACE_OS::strcmp (parent->fullname (), "") != 0)
+      if (ACE_OS::strcmp (parent->full_name (), "") != 0)
         result_str += ACE_CString ("_");
 
       // Prefix.
-      result_str += ACE_CString ("AMI_");
+      result_str += prefix_str;
 
       // Local name.
       result_str += ACE_CString (this->local_name ()->get_string ());
@@ -373,8 +391,7 @@ be_decl::compute_flatname  (const char *prefix, const char *suffix)
       result_str += suffix_str;
     }
 
-  this->ami_handler_flatname_ = result_str.rep ();
-  return this->ami_handler_flatname_;
+  name = result_str.rep ();
 }
 
 const char *
@@ -387,16 +404,6 @@ be_decl::repoID (void)
 }
 
 
-const char *
-be_decl::ami_handler_repoID (void)
-{
-  if (!this->ami_handler_repoID_)
-    this->compute_repoID ("AMI_","_Handler");
-
-  return this->ami_handler_repoID_;
-}
-
-
 // compute stringified repository ID
 void
 be_decl::compute_repoID (void)
@@ -472,12 +479,14 @@ be_decl::compute_repoID (void)
 
 // Apply the prefix and suffix to the local name and compute the
 // repoID.  Both the parameters should be non-null.
-char *
-be_decl::compute_repoID (const char *prefix, const char *suffix)
+void
+be_decl::compute_repoID (const char *prefix, 
+                         const char *suffix,
+                         char *&name)
 {
   // Prefix and suffix should be valid.
   if (prefix == 0 || suffix == 0)
-    return 0;
+    return;
 
   // First prepare the result without IDL: and  :1.0 strings.
 
@@ -607,56 +616,7 @@ be_decl::compute_repoID (const char *prefix, const char *suffix)
   delete result;
   result = 0;
 
-  this->ami_handler_repoID_ = repoID.rep ();
-
-  return this->ami_handler_repoID_;
-}
-
-
-int
-be_decl::compute_ami_handler_name (const char *name,
-                                        char *&ami_handler_name)
-{
-  int name_length = ACE_OS::strlen (name);
-  int ami_handler_length = ACE_OS::strlen ("AMI__HANDLER");
-
-  ACE_NEW_RETURN (ami_handler_name,
-                  char[name_length + ami_handler_length+1],
-                  -1);
-
-  // copy it in
-  ACE_OS::strcpy (ami_handler_name, name);
-
-  const char *interface_name = 0;
-  int i = ACE_OS::strlen (name);
-  for (;i >= 1; i--)
-    {
-      if (name[i-1] == ':' && name[i] == ':')
-        {
-          interface_name = &name[i+1];
-          break;
-        }
-      else if (i >= 3)
-        if (name[i-3] == 'P' &&
-            name[i-2] == 'O' &&
-            name[i-1] == 'A' &&
-            name[i] == '_')
-          {
-            interface_name = &name[i+1];
-            break;
-          }
-  }
-
-  if (interface_name == 0)
-    interface_name = name;
-
-  ACE_OS::strcpy(&ami_handler_name[name_length-ACE_OS::strlen(interface_name)],"AMI_");
-  ACE_OS::strcpy(&ami_handler_name[name_length-ACE_OS::strlen(interface_name)+4],
-                 interface_name);
-  ACE_OS::strcpy(&ami_handler_name[name_length+4],
-                 "_Handler");
-
-  return 0;
+  name = repoID.rep ();
 }
 
 
@@ -954,30 +914,12 @@ be_decl::is_child (be_decl *node)
       if (!bd)
         return 0;
 
-      if (!ACE_OS::strcmp (bd->fullname (), node->fullname ()))
+      if (!ACE_OS::strcmp (bd->full_name (), node->full_name ()))
         return 1; // true
     }
   return 0; // not a child
 }
 
-idl_bool
-be_decl::has_constructor (void)
-{
-  return this->has_constructor_;
-}
-
-void
-be_decl::has_constructor (idl_bool value)
-{
-  // Similarly to be_decl::size_type_, once this
-  // gets set to I_TRUE, we don't want it to
-  // change back.
-  if (!this->has_constructor_)
-    {
-      this->has_constructor_ = value;
-    }
-}
-
 // narrowing methods
 IMPL_NARROW_METHODS1 (be_decl, AST_Decl)
 IMPL_NARROW_FROM_DECL (be_decl)
diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp
index e0db61e127f..6b9a4d2e143 100644
--- a/TAO/TAO_IDL/be/be_field.cpp
+++ b/TAO/TAO_IDL/be/be_field.cpp
@@ -53,10 +53,6 @@ be_field::compute_size_type (void)
   // our size type is the same as our type
   this->size_type (type->size_type ()); // as a side effect will also update
                                         // the size type of parent
-
-  // and while we're here, take care of has_constructor
-  this->has_constructor (type->has_constructor ());
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
index c4ec5e1918a..3b9a9f7877d 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -185,13 +185,13 @@ TAO_OutStream::nl (void)
 
 // macro generation
 int
-TAO_OutStream::gen_ifdef_macro (const char *flatname, const char *suffix)
+TAO_OutStream::gen_ifdef_macro (const char *flat_name, const char *suffix)
 {
   static char macro [NAMEBUFSIZE];
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
 
   ACE_OS::memset (macro, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (macro, "_%s_", cg->upcase (flatname));
+  ACE_OS::sprintf (macro, "_%s_", cg->upcase (flat_name));
   if (suffix)
     {
       //ACE_OS::sprintf (macro, "%s_%s_", macro, cg->upcase (suffix));
@@ -315,7 +315,7 @@ TAO_OutStream::operator<< (const ACE_CDR::Short num)
 TAO_OutStream &
 TAO_OutStream::operator<< (const ACE_CDR::ULong num)
 {
-  ACE_OS::fprintf (this->fp_, "%lu", (unsigned long) num);
+  ACE_OS::fprintf (this->fp_, "%lu", num);
   ACE_OS::fflush (fp_);
   return *this;
 }
@@ -323,7 +323,7 @@ TAO_OutStream::operator<< (const ACE_CDR::ULong num)
 TAO_OutStream &
 TAO_OutStream::operator<< (const ACE_CDR::Long num)
 {
-  ACE_OS::fprintf (this->fp_, "%ld", (long) num);
+  ACE_OS::fprintf (this->fp_, "%ld", num);
   ACE_OS::fflush (fp_);
   return *this;
 }
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index c6312cdf8a6..73685856081 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -15,7 +15,8 @@
 // = AUTHOR
 //    Copyright 1994-1995 by Sun Microsystems, Inc.
 //    and
-//    Aniruddha Gokhale
+//    Aniruddha Gokhale,
+//    Michael Kircher
 //
 // ============================================================================
 
@@ -32,309 +33,107 @@ ACE_RCSID(be, be_interface, "$Id$")
 
 // default constructor
 be_interface::be_interface (void)
-  : full_skel_name_ (0),
-    ami_handler_full_skel_name_ (0),
-    skel_count_ (0),
-    full_coll_name_ (0),
-    cached_coll_name_type_ (-1),
-    ami_handler_full_coll_name_ (0),
-    local_coll_name_ (0),
-    ami_handler_local_coll_name_ (0),
-    ami_handler_local_name_ (0),
-    in_mult_inheritance_ (-1)
+  : skel_count_ (0),
+    in_mult_inheritance_ (-1),
+    strategy_ (new be_interface_default_strategy (this))
 {
   this->size_type (be_decl::VARIABLE); // always the case
-  this->has_constructor (I_TRUE);      // always the case
 }
 
 // constructor used to build the AST
-be_interface::be_interface (UTL_ScopedName *n, AST_Interface **ih, long nih,
+be_interface::be_interface (UTL_ScopedName *n, 
+                            AST_Interface **ih, 
+                            long nih,
                             UTL_StrList *p)
   : AST_Interface (n, ih, nih, p),
     AST_Decl (AST_Decl::NT_interface, n, p),
     UTL_Scope (AST_Decl::NT_interface),
-    full_skel_name_ (0),
-    ami_handler_full_skel_name_ (0),
     skel_count_ (0),
-    full_coll_name_ (0),
-    ami_handler_full_coll_name_ (0),
-    local_coll_name_ (0),
-    ami_handler_local_coll_name_ (0),
-    ami_handler_local_name_ (0),
-    in_mult_inheritance_ (-1)
+    in_mult_inheritance_ (-1),
+    strategy_ (new be_interface_default_strategy (this))
 {
   this->size_type (be_decl::VARIABLE); // always the case
-  this->has_constructor (I_TRUE);      // always the case
 }
 
 be_interface::~be_interface (void)
 {
-  if (this->full_skel_name_ != 0)
-    {
-      delete[] this->full_skel_name_;
-      this->full_skel_name_ = 0;
-    }
-  if (this->ami_handler_full_skel_name_ != 0)
-    {
-      delete[] this->ami_handler_full_skel_name_;
-      this->ami_handler_full_skel_name_ = 0;
-    }
-  if (this->full_coll_name_ != 0)
-    {
-      delete[] this->full_coll_name_;
-      this->full_coll_name_ = 0;
-    }
-  if (this->ami_handler_full_coll_name_ != 0)
-    {
-      delete[] this->ami_handler_full_coll_name_;
-      this->ami_handler_full_coll_name_ = 0;
-    }
-  if (this->local_coll_name_ != 0)
-    {
-      delete[] this->local_coll_name_;
-      this->local_coll_name_ = 0;
-    }
-  if (this->ami_handler_local_coll_name_ != 0)
-    {
-      delete[] this->ami_handler_local_coll_name_;
-      this->ami_handler_local_coll_name_ = 0;
-    }
-  if (this->ami_handler_local_name_ != 0)
-    {
-      delete[] this->ami_handler_local_name_;
-      this->ami_handler_local_name_ = 0;
-    }
+  // We know that it cannot be 0, but..
+  if (!this->strategy_)
+    delete this->strategy_;
 }
 
-// compute stringified fully qualified collocated class name.
-void
-be_interface::compute_coll_name (int type)
+be_interface_type_strategy *
+be_interface::set_strategy (be_interface_type_strategy *new_strategy)
 {
-  if (type == this->cached_coll_name_type_ && this->full_coll_name_ != 0)
-    return;
-  else
-    {
-      this->cached_coll_name_type_ = type;
-      delete this->full_coll_name_;
-      delete this->local_coll_name_;
-    }
+  be_interface_type_strategy *old = this->strategy_;
 
-  static const char *collocated_names[] = { "_tao_thru_poa_collocated_",
-                                            "_tao_direct_collocated_" };
-  const char poa[] = "POA_";
-  // Reserve enough room for the "POA_" prefix, the "_tao_collocated_"
-  // prefix and the local name and the (optional) "::"
-  const char *collocated = collocated_names[type];
-
-  int namelen = ACE_OS::strlen (collocated) + sizeof (poa) + 1;
+  if (new_strategy != 0)
+    this->strategy_ = new_strategy;
 
-  UTL_IdListActiveIterator *i;
-  ACE_NEW (i, UTL_IdListActiveIterator (this->name ()));
-  while (!i->is_done ())
-    {
-      // reserve 2 characters for "::".
-      namelen += ACE_OS::strlen (i->item ()->get_string ()) + 2;
-      i->next ();
-    }
-  delete i;
-
-  ACE_NEW (this->full_coll_name_,
-           char[namelen+1]);
-  this->full_coll_name_[0] = 0; // null terminate the string...
-
-  // Iterate again....
-  ACE_NEW (i, UTL_IdListActiveIterator (this->name ()));
-
-  // Only the first component get the "POA_" preffix.
-  int poa_added = 0;
-  while (!i->is_done ())
-    {
-      const char* item = i->item ()->get_string ();
+  return old;
+}
 
-      // Increase right away, so we can test for the final component
-      // in the loop.
-      i->next ();
 
-      // We add the POA_ preffix only if the first component is not
-      // the global scope...
-      if (ACE_OS::strcmp (item, "") != 0)
-        {
-          if (!i->is_done ())
-            {
-              // We only add the POA_ preffix if there are more than
-              // two components in the name, in other words, if the
-              // class is inside some scope.
-              if (!poa_added)
-                {
-                  ACE_OS::strcat (this->full_coll_name_, poa);
-                  poa_added = 1;
-                }
-              ACE_OS::strcat (this->full_coll_name_, item);
-              ACE_OS::strcat (this->full_coll_name_, "::");
-            }
-          else
-            {
-              ACE_OS::strcat (this->full_coll_name_, collocated);
-              ACE_OS::strcat (this->full_coll_name_, item);
-            }
-        }
-    }
-  delete i;
-
-  // Compute the local name for the collocated class.
-  int localen = ACE_OS::strlen (collocated) + 1;
-  localen += ACE_OS::strlen (this->local_name ()->get_string ());
-  ACE_NEW (this->local_coll_name_, char[localen]);
-  ACE_OS::strcpy(this->local_coll_name_, collocated);
-  ACE_OS::strcat(this->local_coll_name_,
-                 this->local_name ()->get_string ());
+const char *
+be_interface::local_name (void) const
+{
+  // return the local name
+  return this->strategy_->local_name ();
 }
 
 const char *
-be_interface::full_coll_name (int type)
+be_interface::full_name (void) const
 {
-  this->compute_coll_name (type);
-
-  return this->full_coll_name_;
+  // return the stringified full name
+  return this->strategy_->full_name ();
 }
 
-const char*
-be_interface::local_coll_name (int type) const
+const char *
+be_interface::flat_name (void) const
 {
-  ACE_const_cast (be_interface*, this)->compute_coll_name (type);
-
-  return this->local_coll_name_;
+  // return the flattened full scoped name.
+  return this->strategy_->flat_name ();
 }
 
-
-const char*
-be_interface::ami_handler_full_coll_name (void)
+const char *
+be_interface::repoID (void) const
 {
-  if (this->ami_handler_full_coll_name_ == 0)
-    {
-      // @@ Michael: We need to check this one. I am just passing 1
-      //    for the time being. (Alex).
-      compute_ami_handler_name (this->full_coll_name(1),
-                                this->ami_handler_full_coll_name_);
-    }
-
-  return this->ami_handler_full_coll_name_;
+  // retrieve the repository ID.
+  return this->strategy_->repoID ();
 }
 
-const char*
-be_interface::ami_handler_local_coll_name (void)
+const char *
+be_interface::full_skel_name (void) const
 {
-  if (this->ami_handler_local_coll_name_ == 0)
-    {
-      // @@ Michael: We need to check this one. I am just passing 1
-      //    for the time being. (Alex).
-      compute_ami_handler_name (this->local_coll_name(1),
-                                this->ami_handler_local_coll_name_);
-    }
-
-  return this->ami_handler_local_coll_name_;
+  // retrieve the fully scoped skel class name.
+  return this->strategy_->full_skel_name ();
 }
 
-const char*
-be_interface::ami_handler_local_name (void)
+const char *
+be_interface::full_coll_name (int type) const
 {
-  if (this->ami_handler_local_name_ == 0)
-    compute_ami_handler_name (this->local_name()->get_string (),
-                              this->ami_handler_local_name_);
-
-  return this->ami_handler_local_name_;
+  // retrieve the fully qualified collocated class name
+  return this->strategy_->full_coll_name (type);
 }
 
-// Generate collocated local and full names for the arbitrary local
-// name under the scope of this interface. Usefull to generate AMI
-// Handlers.
-int
-be_interface::compute_coll_names (const char *local_name,
-                                  char *&coll_local_name,
-                                  char *&coll_full_name)
-
+const char *
+be_interface::local_coll_name (int type) const
 {
-  const char collocated[] = "_tao_collocated_";
-  const char poa[] = "POA_";
-
-  // Reserve enough room for the "POA_" prefix, the "_tao_collocated_"
-  // prefix and the local name and the (optional) "::"
-  int namelen = sizeof (collocated) + sizeof (poa);
-
-  UTL_IdListActiveIterator *i;
-  ACE_NEW_RETURN (i, UTL_IdListActiveIterator (this->name ()), -1);
-  while (!i->is_done ())
-    {
-      // reserve 2 characters for "::".
-      namelen += ACE_OS::strlen (i->item ()->get_string ()) + 2;
-      i->next ();
-    }
-  delete i;
-
-  ACE_NEW_RETURN (coll_full_name,
-                  char[namelen+1],
-                  -1);
-  coll_full_name[0] = 0; // null terminate the string...
-
-  // Iterate again....
-  ACE_NEW_RETURN (i, UTL_IdListActiveIterator (this->name ()), -1);
-
-  // Only the first component get the "POA_" preffix.
-  int poa_added = 0;
-  while (!i->is_done ())
-    {
-      const char* item = i->item ()->get_string ();
-
-      // Increase right away, so we can test for the final component
-      // in the loop.
-      i->next ();
-
-      // We add the POA_ preffix only if the first component is not
-      // the global scope...
-      if (ACE_OS::strcmp (item, "") != 0)
-        {
-          if (!i->is_done ())
-            {
-              // We only add the POA_ preffix if there are more than
-              // two components in the name, in other words, if the
-              // class is inside some scope.
-              if (!poa_added)
-                {
-                  ACE_OS::strcat (coll_full_name, poa);
-                  poa_added = 1;
-                }
-              ACE_OS::strcat (coll_full_name, item);
-              ACE_OS::strcat (coll_full_name, "::");
-            }
-          else
-            {
-              ACE_OS::strcat (coll_full_name, collocated);
-              ACE_OS::strcat (coll_full_name, item);
-            }
-        }
-    }
-  delete i;
-
-  // Compute the local name for the collocated class.
-  int localen = sizeof (collocated);
-  localen += ACE_OS::strlen (local_name);
-  ACE_NEW_RETURN (coll_local_name, char[localen], -1);
-  ACE_OS::strcpy(coll_local_name, collocated);
-  ACE_OS::strcat(coll_local_name,
-                 local_name);
-
-  return 0;
+  // retrieve the fully qualified collocated class name.
+  return this->strategy_->local_coll_name (type);
 }
 
-// compute stringified fully scoped skel name
-void
-be_interface::compute_fullskelname (void)
+const char *
+be_interface::relative_skel_name (const char *skel_name)
 {
-  this->compute_fullskelname (this->full_skel_name_, "POA_");
+  // relative skeleton name
+  return this->strategy_->relative_skel_name (skel_name);
 }
 
+
 void
-be_interface::compute_fullskelname (char *&skelname, const char *prefix)
+be_interface::compute_full_skel_name (const char *prefix,
+                                                    char *&skelname)
 {
   if (skelname)
     return;
@@ -369,7 +168,7 @@ be_interface::compute_fullskelname (char *&skelname, const char *prefix)
         }
       delete i;
 
-      skelname = new char [namelen+1];
+      ACE_NEW (skelname, char [namelen+1]);
       skelname[0] = '\0';
       first = I_TRUE;
       second = I_FALSE;
@@ -398,24 +197,90 @@ be_interface::compute_fullskelname (char *&skelname, const char *prefix)
   return;
 }
 
-// retrieve the fully scoped skeleton name
 const char*
-be_interface::full_skel_name (void)
+be_interface::relative_name (const char *localname,
+                             const char *othername)
 {
-  if (!this->full_skel_name_)
-    compute_fullskelname ();
+  // some compilers do not like generating a fully scoped name for a
+  // type that was defined in the same enclosing scope in which it was
+  // defined.  We have to emit just the partial name, relative to our
+  // "localname"
 
-  return this->full_skel_name_;
-}
+  // The tricky part here is that it is not enough to check if the
+  // typename we are using was defined in the current scope. But we
+  // need to ensure that it was not defined in any of our ancestor
+  // scopes as well. If that is the case, then we can generate a fully
+  // scoped name for that type, else we use the ACE_NESTED_CLASS macro
 
-const char*
-be_interface::ami_handler_full_skel_name (void)
-{
-  if (this->ami_handler_full_skel_name_ == 0)
-    compute_ami_handler_name (this->full_skel_name(),
-                              this->ami_handler_full_skel_name_);
+  // thus we need some sort of relative name to be generated
+
+  static char macro [NAMEBUFSIZE];
+  // UNUSED: be_decl *def_scope = 0;  // our defining scope
+  char // hold the fully scoped name
+    def_name [NAMEBUFSIZE],
+    use_name [NAMEBUFSIZE];
+  char // these point to the curr and next component in the scope
+    *def_curr = def_name,
+    *def_next,
+    *use_curr = use_name,
+    *use_next;
+
+  ACE_OS::memset (macro, '\0', NAMEBUFSIZE);
+  ACE_OS::memset (def_name, '\0', NAMEBUFSIZE);
+  ACE_OS::memset (use_name, '\0', NAMEBUFSIZE);
+
+  // traverse every component of the def_scope and use_scope beginning at the
+  // root and proceeding towards the leaf trying to see if the components
+  // match. Continue until there is a match and keep accumulating the path
+  // traversed. This forms the first argument to the ACE_NESTED_CLASS
+  // macro. Whenever there is no match, the remaining components of the
+  // def_scope form the second argument
+
+  ACE_OS::strcpy (def_name, localname);
+  ACE_OS::strcpy (use_name, othername);
 
-  return this->ami_handler_full_skel_name_;
+  while (def_curr && use_curr)
+    {
+      // find the first occurrence of a :: and advance the next pointers accordingly
+      def_next = ACE_OS::strstr (def_curr, "::");
+      use_next = ACE_OS::strstr (use_curr, "::");
+
+      if (def_next)
+        *def_next = 0;
+
+      if (use_next)
+        *use_next = 0;
+
+      if (!ACE_OS::strcmp (def_curr, use_curr))
+        {
+          // they have same prefix, append to arg1
+          def_curr = (def_next ? (def_next+2) : 0); // skip the ::
+          use_curr = (use_next ? (use_next+2) : 0); // skip the ::
+        }
+      else
+        {
+          // we had overwritten a ':' by a '\0' for string comparison. We
+          // revert back because we want the rest of the relative name to be
+          // used
+          if (def_next)
+            *def_next = ':';
+
+          if (use_next)
+            *use_next = ':';
+
+          // no match. This is the end of the first argument. Get out
+          // of the loop as no more comparisons are necessary
+          break;
+        }
+    }
+
+  // start the 2nd argument of the macro
+
+  // copy the remaining def_name (if any left)
+  if (def_curr)
+    ACE_OS::strcat (macro, def_curr);
+
+  return macro;
 }
 
 
@@ -461,13 +326,13 @@ be_interface::gen_copy_ctors_helper (be_interface* node, be_interface* base, TAO
     {
       if(first)
         {
-          *os << idl_global->impl_class_prefix () << base->flatname () << idl_global->impl_class_suffix () << " (t)"
+          *os << idl_global->impl_class_prefix () << base->flat_name () << idl_global->impl_class_suffix () << " (t)"
               << ", " << base->full_skel_name () << " (t)";
           first = 0;
         }
       else
         {
-          *os << ", " << idl_global->impl_class_prefix () << base->flatname () << idl_global->impl_class_suffix () << " (t)"
+          *os << ", " << idl_global->impl_class_prefix () << base->flat_name () << idl_global->impl_class_suffix () << " (t)"
               << ", " << base->full_skel_name () << " (t)";   ;
 
         }
@@ -500,12 +365,12 @@ be_interface::gen_def_ctors_helper (be_interface* node, be_interface* base, TAO_
     {
       if(first)
         {
-          *os << idl_global->impl_class_prefix () << base->flatname () << idl_global->impl_class_suffix () << " ()";
+          *os << idl_global->impl_class_prefix () << base->flat_name () << idl_global->impl_class_suffix () << " ()";
           first = 0;
         }
       else
         {
-          *os << ", " << idl_global->impl_class_prefix () << base->flatname () << idl_global->impl_class_suffix () << " ()";
+          *os << ", " << idl_global->impl_class_prefix () << base->flat_name () << idl_global->impl_class_suffix () << " ()";
 
         }
     }
@@ -532,7 +397,7 @@ be_interface::gen_var_defn (char* interface_name)
 
   // Decide which name to use.
   if (interface_name == 0)
-    interface_name = this->local_name ()->get_string ();
+    interface_name = (char *) this->local_name ();
 
   // Buffer with name of the var class.
   ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
@@ -550,7 +415,7 @@ be_interface::gen_var_defn (char* interface_name)
   // for over here.
 
   ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -627,8 +492,8 @@ be_interface::gen_var_impl (char *interface_local_name,
   // arguments. Let us then use the name in this node.
   if (interface_local_name == 0 || interface_full_name == 0)
     {
-      interface_local_name = local_name ()->get_string ();
-      interface_full_name = (char *) this->fullname ();
+      interface_local_name = (char *) local_name ();
+      interface_full_name = (char *) this->full_name ();
     }
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
@@ -816,7 +681,7 @@ be_interface::gen_out_defn (char *interface_name)
 
   // Decide which name to use.
   if (interface_name == 0)
-    interface_name = this->local_name ()->get_string ();
+    interface_name = (char *) this->local_name ();
 
   // Create the buffer with the name of the out class.
   ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
@@ -832,7 +697,7 @@ be_interface::gen_out_defn (char *interface_name)
   // generate the out definition (always in the client header)
   ch->indent (); // start with whatever was our current indent level
 
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -888,8 +753,8 @@ be_interface::gen_out_impl (char *interface_local_name,
   // arguments. Let us then use the name in this node.
   if (interface_local_name == 0 || interface_full_name == 0)
     {
-      interface_local_name = local_name ()->get_string ();
-      interface_full_name = (char *) this->fullname ();
+      interface_local_name = (char *) local_name ();
+      interface_full_name = (char *) this->full_name ();
     }
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
@@ -1018,9 +883,9 @@ be_interface::gen_out_impl (char *interface_local_name,
 
 // helper.
 int
-be_interface::gen_operation_table (void)
+be_interface::gen_operation_table ()
 {
-  TAO_OutStream *ss; // output stream.
+  TAO_OutStream *os; // output stream.
   TAO_NL  nl;        // end line.
 
   // Retrieve the singleton instance of the CodeGen.
@@ -1031,19 +896,21 @@ be_interface::gen_operation_table (void)
   switch (cg->lookup_strategy ())
     {
     case TAO_CodeGen::TAO_DYNAMIC_HASH:
+
       // Init the outstream appropriately.
-      ss = cg->server_skeletons ();
+
+      os = this->strategy_->get_out_stream ();
 
       // start from current indentation level.
-      ss->indent ();
+      os->indent ();
 
       // Start the table generation.
-      *ss << "static const TAO_operation_db_entry " << this->flatname () <<
+      *os << "static const TAO_operation_db_entry " << this->flat_name () <<
         "_operations [] = {\n";
-      ss->incr_indent (0);
+      os->incr_indent (0);
 
       // Traverse the graph.
-      if (this->traverse_inheritance_graph (be_interface::gen_optable_helper, ss) == -1)
+      if (this->traverse_inheritance_graph (be_interface::gen_optable_helper, os) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_interface::gen_operation_table - "
@@ -1051,34 +918,34 @@ be_interface::gen_operation_table (void)
         }
 
       // generate the skeleton for the is_a method.
-      ss->indent ();
-      *ss << "{\"_is_a\", &" << this->full_skel_name () << "::_is_a_skel},\n";
+      os->indent ();
+      *os << "{\"_is_a\", &" << this->full_skel_name () << "::_is_a_skel},\n";
       this->skel_count_++;
 
-      ss->indent ();
-      *ss << "{\"_non_existent\", &" << this->full_skel_name () << "::_non_existent_skel}\n";
+      os->indent ();
+      *os << "{\"_non_existent\", &" << this->full_skel_name () << "::_non_existent_skel}\n";
       this->skel_count_++;
 
-      ss->decr_indent ();
-      *ss << "};" << nl << nl;
+      os->decr_indent ();
+      *os << "};" << nl << nl;
 
       // XXXASG - this code should be based on using different strategies for
       // demux - for next release
-      *ss << "static const CORBA::Long _tao_" << this->flatname ()
+      *os << "static const CORBA::Long _tao_" << this->flat_name ()
           << "_optable_size = sizeof (ACE_Hash_Map_Entry<const char *,"
           << " TAO_Skeleton>) * (" << (3*this->skel_count_)
           << ");" << be_nl;
-      *ss << "static char _tao_" << this->flatname () << "_optable_pool "
-          << "[_tao_" << this->flatname () << "_optable_size];" << be_nl;
-      *ss << "static ACE_Static_Allocator_Base _tao_" << this->flatname ()
-          << "_allocator (_tao_" << this->flatname () << "_optable_pool, "
-          << "_tao_" << this->flatname () << "_optable_size);" << be_nl;
-      *ss << "static TAO_Dynamic_Hash_OpTable tao_"
-          << this->flatname () << "_optable " << "(" << be_idt << be_idt_nl
-          << this->flatname () << "_operations," << be_nl
+      *os << "static char _tao_" << this->flat_name () << "_optable_pool "
+          << "[_tao_" << this->flat_name () << "_optable_size];" << be_nl;
+      *os << "static ACE_Static_Allocator_Base _tao_" << this->flat_name ()
+          << "_allocator (_tao_" << this->flat_name () << "_optable_pool, "
+          << "_tao_" << this->flat_name () << "_optable_size);" << be_nl;
+      *os << "static TAO_Dynamic_Hash_OpTable tao_"
+          << this->flat_name () << "_optable " << "(" << be_idt << be_idt_nl
+          << this->flat_name () << "_operations," << be_nl
           << this->skel_count_ << "," << be_nl
           << 2*this->skel_count_ << "," << be_nl
-          << "&_tao_" << this->flatname () << "_allocator" << be_uidt_nl
+          << "&_tao_" << this->flat_name () << "_allocator" << be_uidt_nl
           << ");" << be_uidt_nl;
 
       break;
@@ -1097,13 +964,13 @@ be_interface::gen_operation_table (void)
         char *temp_file = 0;
         ACE_NEW_RETURN (temp_file,
                         char [ACE_OS::strlen (idl_global->temp_dir ()) +
-                             ACE_OS::strlen (this->flatname ()) +
+                             ACE_OS::strlen (this->flat_name ()) +
                              ACE_OS::strlen (".gperf") + 1],
                         -1);
         ACE_OS::sprintf (temp_file,
                          "%s%s.gperf",
                          idl_global->temp_dir (),
-                         this->flatname ());
+                         this->flat_name ());
 
         // Save this file name with the codegen singleton.
         cg->gperf_input_filename (temp_file);
@@ -1116,8 +983,8 @@ be_interface::gen_operation_table (void)
           TAO_OUTSTREAM_FACTORY::instance ();
 
         // Get a new instance for the temp file.
-        ss = factory->make_outstream ();
-        if (ss == 0)
+        os = factory->make_outstream ();
+        if (os == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "be_visitor_interface_ss",
                              "::",
@@ -1126,10 +993,10 @@ be_interface::gen_operation_table (void)
                             -1);
 
         // Store the outstream with the codegen singleton.
-        cg->gperf_input_stream (ss);
+        cg->gperf_input_stream (os);
 
         // Open the temp file.
-        if (ss->open (temp_file,
+        if (os->open (temp_file,
                       TAO_OutStream::TAO_GPERF_INPUT) == -1)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "be_visitor_interface_ss",
@@ -1139,24 +1006,24 @@ be_interface::gen_operation_table (void)
                             -1);
 
         // Add the gperf input header.
-        this->gen_gperf_input_header (ss);
+        this->gen_gperf_input_header (os);
 
         // Traverse the graph.
-        if (this->traverse_inheritance_graph (be_interface::gen_optable_helper, ss) == -1)
+        if (this->traverse_inheritance_graph (be_interface::gen_optable_helper, os) == -1)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_interface::gen_operation_table - "
                              "inheritance graph traversal failed\n"),
                             -1);
 
         // Generate the skeleton for the is_a method.
-        ss->indent ();
-        *ss << "_is_a" << ", &"
+        os->indent ();
+        *os << "_is_a" << ", &"
             << this->full_skel_name ()
             << "::_is_a_skel\n";
         this->skel_count_++;
 
-        ss->indent ();
-        *ss << "_non_existent, &"
+        os->indent ();
+        *os << "_non_existent, &"
             << this->full_skel_name ()
             << "::_non_existent_skel\n";
         this->skel_count_++;
@@ -1179,12 +1046,14 @@ be_interface::gen_operation_table (void)
   return 0;
 }
 
+
+
 // Output the header (type declaration and %%) to the gperf's input
 // file.
 void
-be_interface::gen_gperf_input_header (TAO_OutStream *ss)
+be_interface::gen_gperf_input_header (TAO_OutStream *os)
 {
-  *ss << "class TAO_operation_db_entry {\n"
+  *os << "class TAO_operation_db_entry {\n"
       << "public:\n"
       << "\tchar *opname_;" << "\n"
       << "\tTAO_Skeleton skel_ptr_;" << "\n"
@@ -1203,7 +1072,7 @@ be_interface::gen_optable_entries (be_interface *derived)
 {
   UTL_ScopeActiveIterator *si;
   AST_Decl *d;
-  TAO_OutStream *ss; // output stream
+  TAO_OutStream *os; // output stream
 
   // retrieve a singleton instance of the code generator
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
@@ -1212,7 +1081,8 @@ be_interface::gen_optable_entries (be_interface *derived)
     {
     case TAO_CodeGen::TAO_DYNAMIC_HASH:
       // Init the outstream.
-      ss = cg->server_skeletons ();
+
+      os = this->strategy_->get_out_stream ();
 
       // The major stuff.
       if (this->nmembers () > 0)
@@ -1231,10 +1101,10 @@ be_interface::gen_optable_entries (be_interface *derived)
               if (d->node_type () == AST_Decl::NT_op)
                 {
                   // Start from current indentation level
-                  ss->indent ();
+                  os->indent ();
 
                   // we are an operation node
-                  *ss << "{\"" << d->original_local_name () << "\", &"
+                  *os << "{\"" << d->original_local_name () << "\", &"
                       << derived->full_skel_name () << "::"
                       << d->local_name () << "_skel},\n";
 
@@ -1245,11 +1115,11 @@ be_interface::gen_optable_entries (be_interface *derived)
                   AST_Attribute *attr;
 
                   // Start from current indentation level.
-                  ss->indent ();
+                  os->indent ();
 
                   // Generate only the "get" entry if we are
                   // readonly.
-                  *ss << "{\"_get_" << d->original_local_name ()
+                  *os << "{\"_get_" << d->original_local_name ()
                       << "\", &" << derived->full_skel_name ()
                       << "::_get_" << d->local_name () << "_skel},\n";
 
@@ -1262,8 +1132,8 @@ be_interface::gen_optable_entries (be_interface *derived)
                   if (!attr->readonly ())
                     {
                       // the set method
-                      ss->indent (); // start from current indentation level
-                      *ss << "{\"_set_" << d->original_local_name ()
+                      os->indent (); // start from current indentation level
+                      *os << "{\"_set_" << d->original_local_name ()
                           << "\", &" << derived->full_skel_name ()
                           << "::_set_" << d->local_name () << "_skel},\n";
                       derived->skel_count_++;
@@ -1280,7 +1150,7 @@ be_interface::gen_optable_entries (be_interface *derived)
     case TAO_CodeGen::TAO_PERFECT_HASH:
       // We call GPERF for all these three strategies.
       // Init the outstream.
-      ss = cg->gperf_input_stream ();
+      os = cg->gperf_input_stream ();
 
       if (this->nmembers () > 0)
         {
@@ -1303,11 +1173,11 @@ be_interface::gen_optable_entries (be_interface *derived)
                   //
 
                   // Start from current indentation level
-                  ss->indent ();
+                  os->indent ();
 
                   // We are an operation node. We use the original
                   // operation name, not the one with _cxx_ in it.
-                  *ss << d->original_local_name () << ",\t&"
+                  *os << d->original_local_name () << ",\t&"
                       << derived->full_skel_name () << "::"
                       << d->local_name () << "_skel" << "\n";
 
@@ -1318,10 +1188,10 @@ be_interface::gen_optable_entries (be_interface *derived)
                   AST_Attribute *attr;
 
                   // Start from current indentation level
-                  ss->indent ();
+                  os->indent ();
 
                   // Generate only the "get" entry if we are readonly
-                  *ss << "_get_" << d->original_local_name () << ",\t&"
+                  *os << "_get_" << d->original_local_name () << ",\t&"
                       << derived->full_skel_name () << "::_get_"
                       << d->local_name () << "_skel\n";
                   derived->skel_count_++;
@@ -1333,8 +1203,8 @@ be_interface::gen_optable_entries (be_interface *derived)
                   if (!attr->readonly ())
                     {
                       // the set method
-                      ss->indent (); // start from current indentation level
-                      *ss << "_set_" << d->original_local_name () << ",\t&"
+                      os->indent (); // start from current indentation level
+                      *os << "_set_" << d->original_local_name () << ",\t&"
                           << derived->full_skel_name () << "::_set_"
                           << d->local_name () << "_skel\n";
                       derived->skel_count_++;
@@ -1357,12 +1227,14 @@ be_interface::gen_optable_entries (be_interface *derived)
   return 0;
 }
 
+
+
 // template method that traverses the inheritance graph in a breadth-first
 // style. The actual work on each element in the inheritance graph is carried
 // out by the function passed as argument
 int
 be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen,
-                                              TAO_OutStream *os)
+                                          TAO_OutStream *os)
 {
   long i;            // loop index
   ACE_Unbounded_Queue <be_interface*> queue; // Queue data structure needed for
@@ -1449,7 +1321,7 @@ be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen,
               be_interface **temp;  // queue element
 
               (void) q_iter.next (temp);
-              if (!ACE_OS::strcmp (parent->fullname (), (*temp)->fullname ()))
+              if (!ACE_OS::strcmp (parent->full_name (), (*temp)->full_name ()))
                 {
                   // we exist in this queue and cannot be inserted
                   found = 1;
@@ -1467,7 +1339,7 @@ be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen,
               be_interface **temp;  // queue element
 
               (void) del_q_iter.next (temp);
-              if (!ACE_OS::strcmp (parent->fullname (), (*temp)->fullname ()))
+              if (!ACE_OS::strcmp (parent->full_name (), (*temp)->full_name ()))
                 {
                   // we exist in this del_queue and cannot be inserted
                   found = 1;
@@ -1492,6 +1364,7 @@ be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen,
   return 0;
 }
 
+
 // helpers passed to the template method
 
 int
@@ -1511,6 +1384,8 @@ be_interface::gen_optable_helper (be_interface *derived,
   return 0;
 }
 
+
+
 // Run GPERF and get the correct lookup and other operations
 // depending on which strategy we are using. Returns 0 on sucess, -1
 // on error.
@@ -1593,9 +1468,9 @@ be_interface::gen_perfect_hash_class_definition (void)
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
 
   // Outstream.
-  TAO_OutStream *ss = cg->server_skeletons ();
+  TAO_OutStream *os = this->strategy_->get_out_stream ();
 
-  *ss << "class " << "TAO_" << this->flatname () << "_Perfect_Hash_OpTable"
+  *os << "class " << "TAO_" << this->flat_name () << "_Perfect_Hash_OpTable"
       << " : public TAO_Perfect_Hash_OpTable"
       << be_nl
       << "{"
@@ -1621,9 +1496,9 @@ be_interface::gen_binary_search_class_definition (void)
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
 
   // Outstream.
-  TAO_OutStream *ss = cg->server_skeletons ();
+  TAO_OutStream *os = this->strategy_->get_out_stream ();
 
-  *ss << "class " << "TAO_" << this->flatname () << "_Binary_Search_OpTable"
+  *os << "class " << "TAO_" << this->flat_name () << "_Binary_Search_OpTable"
       << " : public TAO_Binary_Search_OpTable"
       << be_nl
       << "{"
@@ -1645,9 +1520,9 @@ be_interface::gen_linear_search_class_definition (void)
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
 
   // Outstream.
-  TAO_OutStream *ss = cg->server_skeletons ();
+  TAO_OutStream *ss = this->strategy_->get_out_stream ();
 
-  *ss << "class " << "TAO_" << this->flatname () << "_Linear_Search_OpTable"
+  *ss << "class " << "TAO_" << this->flat_name () << "_Linear_Search_OpTable"
       << " : public TAO_Linear_Search_OpTable"
       << be_nl
       << "{"
@@ -1703,8 +1578,11 @@ be_interface::gen_gperf_lookup_methods (void)
   // again with ACE_OS::open with WRITE + APPEND option.. After this,
   // remember to update the file offset to the correct location.
 
-  ACE_HANDLE output =  ACE_OS::open (idl_global->be_get_server_skeleton_fname (),
+  ACE_HANDLE output =  ACE_OS::open (this->strategy_->get_out_stream_fname (),
                                      O_WRONLY | O_APPEND);
+  
+  //ACE_HANDLE output =  ACE_OS::open (idl_global->be_get_server_skeleton_fname (),
+  //                                   O_WRONLY | O_APPEND);
   if (output == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p:File open failed on server skeleton file\n"),
@@ -1735,7 +1613,7 @@ be_interface::gen_gperf_lookup_methods (void)
                                     " "
                                     "-N lookup",
                                     idl_global->gperf_path (),
-                                    this->flatname ());
+                                    this->flat_name ());
       break;
 
       // Binary search methods from GPERF. Everythis and the -B flag.
@@ -1758,7 +1636,7 @@ be_interface::gen_gperf_lookup_methods (void)
                                     " "
                                     "-N lookup",
                                     idl_global->gperf_path (),
-                                    this->flatname ());
+                                    this->flat_name ());
       break;
 
       // Linear search methods from GPERF. Everything and the -z flag.
@@ -1781,7 +1659,7 @@ be_interface::gen_gperf_lookup_methods (void)
                                     " "
                                     "-N lookup",
                                     idl_global->gperf_path (),
-                                    this->flatname ());
+                                    this->flat_name ());
       break;
 
     default:
@@ -1804,7 +1682,7 @@ be_interface::gen_gperf_lookup_methods (void)
                       -1);
 
   // Adjust the file offset to the EOF for the server skeleton file.
-  ACE_OS::fseek (cg->server_skeletons ()->file (), 0, SEEK_END);
+  ACE_OS::fseek (this->strategy_->get_out_stream()->file (), 0, SEEK_END);
 
   return 0;
 }
@@ -1817,11 +1695,11 @@ be_interface::gen_perfect_hash_instance ()
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
 
   // Outstream.
-  TAO_OutStream *ss = cg->server_skeletons ();
+  TAO_OutStream *os = this->strategy_->get_out_stream ();
 
-  *ss << "static TAO_" << this->flatname () << "_Perfect_Hash_OpTable"
+  *os << "static TAO_" << this->flat_name () << "_Perfect_Hash_OpTable"
       << " "
-      << "tao_" << this->flatname () << "_optable"
+      << "tao_" << this->flat_name () << "_optable"
       << ";\n" << be_nl;
 }
 
@@ -1833,14 +1711,15 @@ be_interface::gen_binary_search_instance ()
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
 
   // Outstream.
-  TAO_OutStream *ss = cg->server_skeletons ();
+  TAO_OutStream *os = this->strategy_->get_out_stream ();
 
-  *ss << "static TAO_" << this->flatname () << "_Binary_Search_OpTable"
+  *os << "static TAO_" << this->flat_name () << "_Binary_Search_OpTable"
       << " "
-      << "tao_" << this->flatname () << "_optable"
+      << "tao_" << this->flat_name () << "_optable"
       << ";\n" << be_nl;
 }
 
+
 // Create an instance of this perfect hash table.
 void
 be_interface::gen_linear_search_instance ()
@@ -1849,14 +1728,15 @@ be_interface::gen_linear_search_instance ()
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
 
   // Outstream.
-  TAO_OutStream *ss = cg->server_skeletons ();
+  TAO_OutStream *os = this->strategy_->get_out_stream ();
 
-  *ss << "static TAO_" << this->flatname () << "_Linear_Search_OpTable"
+  *os << "static TAO_" << this->flat_name () << "_Linear_Search_OpTable"
       << " "
-      << "tao_" << this->flatname () << "_optable"
+      << "tao_" << this->flat_name () << "_optable"
       << ";\n" << be_nl;
 }
 
+
 int
 be_interface::is_a_helper (be_interface * /*derived*/,
                            be_interface *bi,
@@ -1870,6 +1750,8 @@ be_interface::is_a_helper (be_interface * /*derived*/,
   return 0;
 }
 
+
+
 int
 be_interface::downcast_helper (be_interface * /* derived */,
                                be_interface *base,
@@ -1882,6 +1764,7 @@ be_interface::downcast_helper (be_interface * /* derived */,
   return 0;
 }
 
+
 int
 be_interface::gen_skel_helper (be_interface *derived,
                                be_interface *ancestor,
@@ -2115,107 +1998,451 @@ be_interface::in_mult_inheritance_helper (be_interface *derived,
   return 0;
 }
 
-// return the relative skeleton name (needed due to NT compiler insanity)
+
+int
+be_interface::accept (be_visitor *visitor)
+{
+  return visitor->visit_interface (this);
+}
+
+
+
+// Interface Type Strategy Base Class
+
 const char *
-be_interface::relative_skel_name (const char *skelname)
+be_interface_type_strategy::relative_skel_name (const char *skel_name)
+// relative skeleton name
 {
   return be_interface::relative_name (this->full_skel_name (),
-                                      skelname);
+                              skel_name);
 }
 
-const char*
-be_interface::relative_name (const char *localname,
-                             const char *othername)
+
+
+// compute stringified fully qualified collocated class name.
+void
+be_interface_type_strategy::compute_coll_names (int type,
+                                                const char *prefix,
+                                                const char *suffix)
 {
-  // some compilers do not like generating a fully scoped name for a
-  // type that was defined in the same enclosing scope in which it was
-  // defined.  We have to emit just the partial name, relative to our
-  // "localname"
+// @@ not thread safe.
+  static int cached_type = -1;
+  if (type == cached_type && this->full_coll_name_ != 0)
+    return;
+  else
+    {
+      cached_type = type;
+      delete this->full_coll_name_;
+      delete this->local_coll_name_;
+    }
 
-  // The tricky part here is that it is not enough to check if the
-  // typename we are using was defined in the current scope. But we
-  // need to ensure that it was not defined in any of our ancestor
-  // scopes as well. If that is the case, then we can generate a fully
-  // scoped name for that type, else we use the ACE_NESTED_CLASS macro
+  static const char *collocated_names[] = { "_tao_thru_poa_collocated_",
+                                            "_tao_direct_collocated_" };
+  const char poa[] = "POA_";
+  // Reserve enough room for the "POA_" prefix, the "_tao_collocated_"
+  // prefix and the local name and the (optional) "::"
+  const char *collocated = collocated_names[type];
 
-  // thus we need some sort of relative name to be generated
+  int name_len = ACE_OS::strlen (collocated) + 
+                sizeof (poa) +
+                1;
 
-  static char macro [NAMEBUFSIZE];
-  // UNUSED: be_decl *def_scope = 0;  // our defining scope
-  char // hold the fully scoped name
-    def_name [NAMEBUFSIZE],
-    use_name [NAMEBUFSIZE];
-  char // these point to the curr and next component in the scope
-    *def_curr = def_name,
-    *def_next,
-    *use_curr = use_name,
-    *use_next;
+  if (prefix)
+    name_len += ACE_OS::strlen (prefix);
 
-  ACE_OS::memset (macro, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (def_name, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (use_name, '\0', NAMEBUFSIZE);
+  if (suffix)
+    name_len += ACE_OS::strlen (suffix);
 
-  // traverse every component of the def_scope and use_scope beginning at the
-  // root and proceeding towards the leaf trying to see if the components
-  // match. Continue until there is a match and keep accumulating the path
-  // traversed. This forms the first argument to the ACE_NESTED_CLASS
-  // macro. Whenever there is no match, the remaining components of the
-  // def_scope form the second argument
+  {
+    UTL_IdListActiveIterator *i;
+    ACE_NEW (i, UTL_IdListActiveIterator (node_->name ()));
+    while (!i->is_done ())
+      {
+        // reserve 2 characters for "::".
+        name_len += ACE_OS::strlen (i->item ()->get_string ()) + 2;
+        i->next ();
+      }
+    delete i;
+  }
 
-  ACE_OS::strcpy (def_name, localname);
-  ACE_OS::strcpy (use_name, othername);
+  ACE_NEW (this->full_coll_name_,
+           char[name_len+1]);
+  this->full_coll_name_[0] = 0; // null terminate the string...
 
-  while (def_curr && use_curr)
-    {
-      // find the first occurrence of a :: and advance the next pointers accordingly
-      def_next = ACE_OS::strstr (def_curr, "::");
-      use_next = ACE_OS::strstr (use_curr, "::");
+  // Iterate again....
+  UTL_IdListActiveIterator *i;
+  ACE_NEW (i, UTL_IdListActiveIterator (node_->name ()));
 
-      if (def_next)
-        *def_next = 0;
+  // Only the first component get the "POA_" preffix.
+  int poa_added = 0;
+  while (!i->is_done ())
+    {
+      const char* item = i->item ()->get_string ();
 
-      if (use_next)
-        *use_next = 0;
+      // Increase right away, so we can test for the final component
+      // in the loop.
+      i->next ();
 
-      if (!ACE_OS::strcmp (def_curr, use_curr))
+      // We add the POA_ preffix only if the first component is not
+      // the global scope...
+      if (ACE_OS::strcmp (item, "") != 0)
         {
-          // they have same prefix, append to arg1
-          def_curr = (def_next ? (def_next+2) : 0); // skip the ::
-          use_curr = (use_next ? (use_next+2) : 0); // skip the ::
+          if (!i->is_done ())
+            {
+              // We only add the POA_ preffix if there are more than
+              // two components in the name, in other words, if the
+              // class is inside some scope.
+              if (!poa_added)
+                {
+                  ACE_OS::strcat (this->full_coll_name_, poa);
+                  poa_added = 1;
+                }
+              ACE_OS::strcat (this->full_coll_name_, item);
+              ACE_OS::strcat (this->full_coll_name_, "::");
+            }
+          else
+            {
+              ACE_OS::strcat (this->full_coll_name_, collocated);
+
+              if (prefix)
+                ACE_OS::strcat (this->full_coll_name_, prefix);
+
+              ACE_OS::strcat (this->full_coll_name_, item);
+
+              if (suffix)
+                ACE_OS::strcat (this->full_coll_name_, suffix);
+            }
         }
-      else
-        {
-          // we had overwritten a ':' by a '\0' for string comparison. We
-          // revert back because we want the rest of the relative name to be
-          // used
-          if (def_next)
-            *def_next = ':';
+    }
+  delete i;
 
-          if (use_next)
-            *use_next = ':';
+  // Compute the local name for the collocated class.
+  int local_len = ACE_OS::strlen (collocated) +
+                  ACE_OS::strlen (node_->AST_Interface::local_name ()->get_string ()) +
+                  1;
+  if (prefix)
+    local_len += ACE_OS::strlen (prefix);
 
-          // no match. This is the end of the first argument. Get out
-          // of the loop as no more comparisons are necessary
+  if (suffix)
+    local_len += ACE_OS::strlen (suffix);
+
+  ACE_NEW (this->local_coll_name_, char[local_len]);
+
+  ACE_OS::strcpy(this->local_coll_name_, collocated);
+
+  if (prefix)
+    ACE_OS::strcat (this->local_coll_name_, prefix);
+
+  ACE_OS::strcat(this->local_coll_name_,
+                 node_->AST_Interface::local_name ()->get_string ());
+
+  if (suffix)
+    ACE_OS::strcat (this->local_coll_name_, suffix);
+}
+
+
+void
+be_interface_type_strategy::compute_names (const char *name,
+                                           const char *prefix,
+                                           const char *suffix,
+                                           char *&new_name)
+{
+  if (!prefix || !suffix)
+    return;
+
+  int name_length = ACE_OS::strlen (name) +
+                    ACE_OS::strlen (prefix) +
+                    ACE_OS::strlen (suffix);
+
+  ACE_NEW (new_name,
+           char[name_length + 1]);
+
+  // copy it in
+  ACE_OS::strcpy (new_name, name);
+
+  const char *interface_name = 0;
+  int i = ACE_OS::strlen (name);
+  for (;i >= 1; i--)
+    {
+      if (name[i-1] == ':' && name[i] == ':')
+        {
+          interface_name = &name[i+1];
           break;
         }
+      else if (i >= 3)
+        if (name[i-3] == 'P' &&
+            name[i-2] == 'O' &&
+            name[i-1] == 'A' &&
+            name[i] == '_')
+          {
+            interface_name = &name[i+1];
+            break;
+          }
+  }
+
+  if (interface_name == 0)
+    interface_name = name;
+
+  ACE_OS::strcpy(&new_name[name_length -
+                           ACE_OS::strlen(prefix) -
+                           ACE_OS::strlen(interface_name) -
+                           ACE_OS::strlen(suffix)],prefix);
+
+  ACE_OS::strcpy(&new_name[name_length -
+                           ACE_OS::strlen(interface_name) -
+                           ACE_OS::strlen(suffix)],interface_name);
+
+  ACE_OS::strcpy(&new_name[name_length -
+                           ACE_OS::strlen(suffix)],suffix);
+}
+
+
+// AMI Hander Strategy
+
+const char *
+be_interface_ami_handler_strategy::full_name (void)
+{
+  if (!this->full_name_)
+    this->compute_names (node_->be_decl::full_name (),
+                         prefix_,
+                         suffix_,
+                         this->full_name_);
+
+  return this->full_name_;
+}
+
+const char *
+be_interface_ami_handler_strategy::local_name (void)
+{
+  if (!this->local_name_)
+    this->compute_names (node_->AST_Interface::local_name()->get_string (),
+                         prefix_,
+                         suffix_,
+                         this->local_name_);
+
+  return this->local_name_;
+}
+
+const char *
+be_interface_ami_handler_strategy::flat_name (void)
+{
+  if (!this->flat_name_)
+    node_->compute_flat_name (prefix_,
+                             suffix_,
+                             this->flat_name_);
+
+  return this->flat_name_;
+}
+
+const char *
+be_interface_ami_handler_strategy::repoID (void)
+{
+  if (!this->repoID_)
+    node_->compute_repoID (prefix_,
+                           suffix_,
+                           this->repoID_);
+
+  return this->repoID_;
+}
+
+const char *
+be_interface_ami_handler_strategy::full_skel_name (void)
+{
+  if (this->full_skel_name_ == 0)
+  {
+    char *temp = 0;
+
+    // the following method is inherited from the base class
+    node_->compute_full_skel_name ("POA_", temp);
+
+    // we are now responsible for the memory of temp
+
+    this->compute_names (temp,
+                         prefix_,
+                         suffix_,
+                         this->full_skel_name_);
+
+    delete temp;
+  }
+
+  return this->full_skel_name_;
+}
+
+
+const char *
+be_interface_ami_handler_strategy::full_coll_name (int type)
+{
+  if (this->full_coll_name_ == 0)
+    {
+      this->compute_coll_names (type,
+                                prefix_,
+                                suffix_);
     }
 
-  // start the 2nd argument of the macro
+  return this->full_coll_name_;
+}
 
-  // copy the remaining def_name (if any left)
-  if (def_curr)
-    ACE_OS::strcat (macro, def_curr);
+const char *
+be_interface_ami_handler_strategy::local_coll_name (int type)
+{
+  if (this->local_coll_name_ == 0)
+    {
+      compute_coll_names (type,
+                          prefix_,
+                          suffix_);
+    }
 
-  return macro;
+  return this->local_coll_name_;
 }
 
-int
-be_interface::accept (be_visitor *visitor)
+TAO_OutStream *
+be_interface_ami_handler_strategy::get_out_stream ()
 {
-  return visitor->visit_interface (this);
+  // Codegen singleton.
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  // Outstream.
+  return cg->client_stubs ();
+}
+
+const char *
+be_interface_ami_handler_strategy::get_out_stream_fname ()
+{
+  return idl_global->be_get_client_stub_fname ();
+}
+
+
+// Default Strategy
+
+
+const char *
+be_interface_default_strategy::full_name (void)
+{
+  if (!this->full_name_)
+  {
+    int len = ACE_OS::strlen (node_->be_decl::full_name ());
+
+    ACE_NEW_RETURN (this->full_name_, 
+                    char[len],
+                    0);
+
+    ACE_OS::strcpy (this->full_name_,
+                    node_->be_decl::full_name ());
+  }
+
+  return this->full_name_;
+}
+
+const char *
+be_interface_default_strategy::local_name (void)
+{
+  if (!this->local_name_)
+  {
+    int len = ACE_OS::strlen (node_->AST_Interface::local_name()->get_string ());
+
+    ACE_NEW_RETURN (this->local_name_, 
+                    char[len],
+                    0);
+
+    ACE_OS::strcpy (this->local_name_,
+                    node_->AST_Interface::local_name()->get_string ());
+  }
+
+  return this->local_name_;
+}
+
+const char *
+be_interface_default_strategy::flat_name (void)
+{
+  if (!this->flat_name_)
+  {
+    int len = ACE_OS::strlen (node_->be_decl::flat_name ());
+
+    ACE_NEW_RETURN (this->flat_name_, 
+                    char[len],
+                    0);
+
+    ACE_OS::strcpy (this->flat_name_,
+                    node_->be_decl::flat_name ());
+  }
+
+
+  return this->flat_name_;
+}
+
+const char *
+be_interface_default_strategy::repoID (void)
+{
+  if (!this->repoID_)
+  {
+    int len = ACE_OS::strlen (node_->be_decl::repoID ());
+
+    ACE_NEW_RETURN (this->repoID_,
+                    char[len],
+                    0);
+
+    ACE_OS::strcpy (this->repoID_,
+                    node_->be_decl::repoID ());
+  }
+
+  return this->repoID_;
 }
 
+const char *
+be_interface_default_strategy::full_skel_name (void)
+{
+  if (this->full_skel_name_ == 0)
+  {
+    // the following method is inherited from the base class
+    node_->compute_full_skel_name ("POA_",
+                                  this->full_skel_name_);
+  }
 
+  return this->full_skel_name_;
+}
+
+
+const char *
+be_interface_default_strategy::full_coll_name (int type)
+{
+  if (this->full_coll_name_ == 0)
+    {
+      this->compute_coll_names (type,
+                                0,  // prefix
+                                0); // suffix
+    }
+
+  return this->full_coll_name_;
+}
+
+const char *
+be_interface_default_strategy::local_coll_name (int type)
+{
+  if (this->local_coll_name_ == 0)
+    {
+      this->compute_coll_names (type,
+                                0,  // prefix
+                                0); // suffix
+    }
+
+  return this->local_coll_name_;
+}
+
+TAO_OutStream *
+be_interface_default_strategy::get_out_stream ()
+{
+  // Codegen singleton.
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  // Outstream.
+  return cg->server_skeletons ();
+}
+
+const char *
+be_interface_default_strategy::get_out_stream_fname ()
+{
+  return idl_global->be_get_server_skeleton_fname ();
+}
 
 // Narrowing
 IMPL_NARROW_METHODS3 (be_interface, AST_Interface, be_scope, be_type)
diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp
index 94d1d430f60..baf21f5f1e4 100644
--- a/TAO/TAO_IDL/be/be_interface_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_interface_fwd.cpp
@@ -67,7 +67,7 @@ be_interface_fwd::gen_var_defn (char *)
   // for over here.
 
   ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -137,7 +137,7 @@ be_interface_fwd::gen_var_impl (char *, char *)
   char lname [NAMEBUFSIZE];  // local _var names
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_var", this->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
@@ -328,7 +328,7 @@ be_interface_fwd::gen_out_defn (char *)
   // generate the out definition (always in the client header)
   ch->indent (); // start with whatever was our current indent level
 
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -377,7 +377,7 @@ be_interface_fwd::gen_out_impl (char *, char *)
   char lname [NAMEBUFSIZE];  // local _out names
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_out", this->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp
index b7232df5407..ca2b12b9053 100644
--- a/TAO/TAO_IDL/be/be_predefined_type.cpp
+++ b/TAO/TAO_IDL/be/be_predefined_type.cpp
@@ -151,13 +151,13 @@ be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t,
   compute_repoID ();
 
   // computes the fully scoped name
-  compute_fullname ();
+  compute_full_name ();
 
   // computes the fully scoped typecode name
   compute_tc_name ();
 
   // compute the flattened fully scoped name
-  compute_flatname ();
+  compute_flat_name ();
 
  
 }
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 29c9979a175..94c67d91daa 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -34,7 +34,6 @@ be_sequence::be_sequence (void)
   : mt_ (be_sequence::MNG_UNKNOWN)
 {
   this->size_type (be_decl::VARIABLE); // always the case
-  this->has_constructor (I_TRUE);      // always the case
 }
 
 be_sequence::be_sequence (AST_Expression *v, AST_Type *t)
@@ -57,7 +56,6 @@ be_sequence::be_sequence (AST_Expression *v, AST_Type *t)
 
   this->size_type (be_decl::VARIABLE); // a sequence data type is always
                                        // VARIABLE
-  this->has_constructor (I_TRUE);      // always the case
 }
 
 idl_bool
@@ -108,10 +106,8 @@ be_sequence::gen_name (void)
   // append the size (if any)
   if (!this->unbounded_)
     {
-      ACE_OS::sprintf (namebuf, 
-                       "%s_%lu", 
-                       namebuf, 
-                       this->max_size ()->ev ()->u.ulval);
+      ACE_OS::sprintf (namebuf, "%s_%d", namebuf, this->max_size ()->ev
+                       ()->u.ulval);
     }
   return ACE_OS::strdup (namebuf);
 }
@@ -280,11 +276,11 @@ be_sequence::instance_name ()
       if (this->unbounded ())
         ACE_OS::sprintf (namebuf,
                          "_TAO_Unbounded_Object_Sequence_%s",
-                         this->flatname());
+                         this->flat_name());
       else
         ACE_OS::sprintf (namebuf,
-                         "_TAO_Bounded_Object_Sequence_%s_%lu",
-                         this->flatname(),
+                         "_TAO_Bounded_Object_Sequence_%s_%d",
+                         this->flat_name(),
                          this->max_size ()->ev()->u.ulval);
       break;
     case be_sequence::MNG_STRING: // sequence of strings
@@ -294,7 +290,7 @@ be_sequence::instance_name ()
       else
         ACE_OS::sprintf (namebuf,
                          "_TAO_Bounded_String_Sequence_%s",
-                         this->flatname());
+                         this->flat_name());
       break;
     default: // not a managed type
       if (this->unbounded ())
@@ -310,16 +306,16 @@ be_sequence::instance_name ()
 	  else
             ACE_OS::sprintf (namebuf,
                              "_TAO_Unbounded_Sequence_%s",
-                             this->flatname());
-                             // or prim_type->flatname ());
+                             this->flat_name());
+                             // or prim_type->flat_name ());
 	  // ACE_DEBUG ((LM_DEBUG, "testing.... %d, %d = <%s>\n",
 	  // predef, predef->pt (), namebuf));
 	}
       else
         ACE_OS::sprintf (namebuf,
-                         "_TAO_Bounded_Sequence_%s_%lu",
-                          this->flatname(),
-                          //prim_type->flatname (),
+                         "_TAO_Bounded_Sequence_%s_%d",
+                          this->flat_name(),
+                          //prim_type->flat_name (),
                           this->max_size()->ev()->u.ulval);
       break;
     }
@@ -350,7 +346,7 @@ be_sequence::in_recursion (be_type *node)
                         0);
     }
 
-  if (!ACE_OS::strcmp (node->fullname (), type->fullname ()))
+  if (!ACE_OS::strcmp (node->full_name (), type->full_name ()))
     // they match
     return 1;
   else
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
index bf21e4b9dd9..3dea9bb9018 100644
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ b/TAO/TAO_IDL/be/be_structure.cpp
@@ -95,7 +95,7 @@ be_structure::gen_var_defn (char *)
   // for over here.
 
   ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -169,7 +169,7 @@ be_structure::gen_var_impl (char *, char *)
   char lname [NAMEBUFSIZE];  // local _var names
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_var", this->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
@@ -403,7 +403,7 @@ be_structure::gen_out_defn (char *)
   // generate the out definition (always in the client header)
   ch->indent (); // start with whatever was our current indent level
 
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -452,7 +452,7 @@ be_structure::gen_out_impl (char *, char *)
   char lname [NAMEBUFSIZE];  // local _out names
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_out", this->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
@@ -591,9 +591,6 @@ be_structure::compute_size_type (void)
               // guaranteed by the "size_type" call that once the value reached
               // be_decl::VARIABLE, nothing else can overwrite it.
               this->size_type (bd->size_type ());
-
-              // While we're iterating, we might as well do this one too.
-              this->has_constructor (bd->has_constructor ());
             }
           else
             {
diff --git a/TAO/TAO_IDL/be/be_sunsoft.cpp b/TAO/TAO_IDL/be/be_sunsoft.cpp
index f08a3eeb4c2..1724402c556 100644
--- a/TAO/TAO_IDL/be/be_sunsoft.cpp
+++ b/TAO/TAO_IDL/be/be_sunsoft.cpp
@@ -65,13 +65,13 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
           this->TAO_OutStream::print ("%hd", ev->u.sval);
           break;
         case AST_Expression::EV_ushort:
-          this->TAO_OutStream::print ("%hu%c", ev->u.usval, 'U');
+          this->TAO_OutStream::print ("%hu", ev->u.usval);
           break;
         case AST_Expression::EV_long:
           this->TAO_OutStream::print ("%ld", ev->u.lval);
           break;
         case AST_Expression::EV_ulong:
-          this->TAO_OutStream::print ("%u%c", ev->u.ulval, 'U');
+          this->TAO_OutStream::print ("%u", ev->u.ulval);
           break;
         case AST_Expression::EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
@@ -80,14 +80,14 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
           break;
         case AST_Expression::EV_ulonglong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-          this->TAO_OutStream::print ("%u%c", ev->u.ullval, 'U');
+          this->TAO_OutStream::print ("%u", ev->u.ullval);
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
           break;
         case AST_Expression::EV_float:
-          this->TAO_OutStream::print ("%f%c", ev->u.fval, 'F');
+          this->TAO_OutStream::print ("%f", ev->u.fval);
           break;
         case AST_Expression::EV_double:
-          this->TAO_OutStream::print ("%24.16G", ev->u.dval);
+          this->TAO_OutStream::print ("%f", ev->u.dval);
           break;
         case AST_Expression::EV_longdouble:
           break;
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
index 4e1199c3210..19cdb46c995 100644
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ b/TAO/TAO_IDL/be/be_type.cpp
@@ -219,8 +219,8 @@ be_type::nested_type_name (be_decl *use_scope, const char *suffix, const char *p
   if (def_scope && def_scope->node_type () != AST_Decl::NT_root && use_scope)
     // if both scopes exist and that we are not in the root scope
     {
-      ACE_OS::strcpy (def_name, def_scope->fullname ());
-      ACE_OS::strcpy (use_name, use_scope->fullname ());
+      ACE_OS::strcpy (def_name, def_scope->full_name ());
+      ACE_OS::strcpy (use_name, use_scope->full_name ());
 
       // find the first occurrence of a :: and advance the next pointers accordingly
       def_next = ACE_OS::strstr (def_curr, "::");
@@ -241,7 +241,7 @@ be_type::nested_type_name (be_decl *use_scope, const char *suffix, const char *p
         }
       else
         {
-          int len = ACE_OS::strlen (use_curr);
+          int len = ACE_OS::strlen (def_curr);
           if (len > len_to_match)
             len_to_match = len;
         }
@@ -280,7 +280,7 @@ be_type::nested_type_name (be_decl *use_scope, const char *suffix, const char *p
                 }
               else
                 {
-                  int len = ACE_OS::strlen (use_curr);
+                  int len = ACE_OS::strlen (def_curr);
                   if (len > len_to_match)
                     len_to_match = len;
                 }
@@ -323,10 +323,10 @@ be_type::nested_type_name (be_decl *use_scope, const char *suffix, const char *p
         } // end of if the root prefixes match
     }
 
-  // otherwise just emit our fullname
+  // otherwise just emit our full_name
   if (prefix)
     ACE_OS::strcat (this->nested_type_name_, prefix);
-  ACE_OS::strcat (this->nested_type_name_, this->fullname ());
+  ACE_OS::strcat (this->nested_type_name_, this->full_name ());
   if (suffix)
     ACE_OS::strcat (this->nested_type_name_, suffix);
 
diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp
index 7a936fdc752..5fa56ef674b 100644
--- a/TAO/TAO_IDL/be/be_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_typedef.cpp
@@ -68,10 +68,6 @@ be_typedef::compute_size_type (void)
 
   // our size type is the same as our type
   this->size_type (type->size_type ());
-
-  // and while we're here, take care of has_constructor
-  this->has_constructor (type->has_constructor ());
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index 7f015666adf..1c2f97fc4b7 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -32,7 +32,6 @@ ACE_RCSID(be, be_union, "$Id$")
 
 be_union::be_union (void)
 {
-  this->has_constructor (I_TRUE);  // always the case
 }
 
 be_union::be_union (AST_ConcreteType *dt, UTL_ScopedName *n, UTL_StrList *p)
@@ -44,7 +43,6 @@ be_union::be_union (AST_ConcreteType *dt, UTL_ScopedName *n, UTL_StrList *p)
     default_index_ (-2)
 {
   this->default_value_.computed_ = -2;
-  this->has_constructor (I_TRUE);  // always the case
 }
 
 // compute total number of members
@@ -102,7 +100,7 @@ be_union::compute_default_index (void)
                    ++j)
                 {
                   // check if we are printing the default case
-                  if (bub->label (j)->label_kind ()
+                  if (bub->label (j)->label_kind () 
                       == AST_UnionLabel::UL_default)
                     this->default_index_ = i; // zero based indexing
                   i++;
@@ -156,7 +154,7 @@ be_union::gen_var_defn (char *)
   // for over here.
 
   ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -230,7 +228,7 @@ be_union::gen_var_impl (char *, char *)
   char lname [NAMEBUFSIZE];  // local _var names
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_var", this->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
@@ -464,7 +462,7 @@ be_union::gen_out_defn (char *)
   // generate the out definition (always in the client header)
   ch->indent (); // start with whatever was our current indent level
 
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -513,7 +511,7 @@ be_union::gen_out_impl (char *, char *)
   char lname [NAMEBUFSIZE];  // local _out names
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_out", this->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
@@ -783,7 +781,7 @@ be_union::compute_default_value (void)
   // default case is provided, it must be flagged off as an error. Our
   // front-end is not able to handle such a case since it is a semantic error
   // and not a syntax error. Such an error is caught here.
-
+  
   switch (this->udisc_type ())
     {
     case AST_Expression::EV_short:
@@ -810,10 +808,6 @@ be_union::compute_default_value (void)
       if (total_case_members == ACE_OCTET_MAX+1)
         this->default_value_.computed_ = 0;
       break;
-    case AST_Expression::EV_wchar:
-      if (total_case_members == ACE_WCHAR_MAX+1)
-        this->default_value_.computed_ = 0;
-      break;
     case AST_Expression::EV_bool:
       if (total_case_members == 2)
         this->default_value_.computed_ = 0;
@@ -854,7 +848,7 @@ be_union::compute_default_value (void)
                         -1);
       ACE_NOTREACHED (break;)
     } // end of switch
-
+  
   // if we have determined that we don't need a default case and even then a
   // default case was provided, flag this off as error
   if ((this->default_value_.computed_ == 0) &&
@@ -867,13 +861,13 @@ be_union::compute_default_value (void)
                          ASYS_TEXT ("- default clause is invalid here\n")),
                         -1);
     }
-
+  
   // proceed only if necessary
   switch (this->default_value_.computed_)
     {
     case -1:
       // error. We should never be here because errors have already been caught
-      // above
+      // above 
       return -1;
     case 0:
       // nothing more to do
@@ -901,9 +895,6 @@ be_union::compute_default_value (void)
     case AST_Expression::EV_char:
       this->default_value_.u.char_val = 0;
       break;
-    case AST_Expression::EV_wchar:
-      this->default_value_.u.wchar_val = 0;
-      break;
     case AST_Expression::EV_bool:
       this->default_value_.u.bool_val = 0;
       break;
@@ -923,9 +914,9 @@ be_union::compute_default_value (void)
     {
       si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
       // instantiate a scope iterator.
-
+      
       int break_loop = 0;
-
+      
       while (!(si->is_done ()) && !break_loop)
         {
           // get the next AST decl node
@@ -944,14 +935,14 @@ be_union::compute_default_value (void)
                         {
                           // error
                           this->default_value_.computed_ = -1;
-                          ACE_ERROR_RETURN
+                          ACE_ERROR_RETURN 
                             ((LM_ERROR,
                               ASYS_TEXT ("(%N:%l) be_union::")
                               ASYS_TEXT ("compute_default_value - ")
                               ASYS_TEXT ("Bad case label value\n")),
                              -1);
                         }
-
+                      
                       switch (expr->ev ()->et)
                         {
                           // check if they match in which case this
@@ -959,7 +950,7 @@ be_union::compute_default_value (void)
                           // start with a new value and try the whole loop
                           // again because our case labels may not be sorted
                         case AST_Expression::EV_short:
-                          if (this->default_value_.u.short_val
+                          if (this->default_value_.u.short_val 
                               == expr->ev ()->u.sval)
                             {
                               this->default_value_.u.short_val++;
@@ -967,7 +958,7 @@ be_union::compute_default_value (void)
                             }
                           break;
                         case AST_Expression::EV_ushort:
-                          if (this->default_value_.u.ushort_val
+                          if (this->default_value_.u.ushort_val 
                               == expr->ev ()->u.usval)
                             {
                               this->default_value_.u.ushort_val++;
@@ -975,7 +966,7 @@ be_union::compute_default_value (void)
                             }
                           break;
                         case AST_Expression::EV_long:
-                          if (this->default_value_.u.long_val
+                          if (this->default_value_.u.long_val 
                               == expr->ev ()->u.lval)
                             {
                               this->default_value_.u.long_val++;
@@ -983,7 +974,7 @@ be_union::compute_default_value (void)
                             }
                           break;
                         case AST_Expression::EV_ulong:
-                          if (this->default_value_.u.ulong_val
+                          if (this->default_value_.u.ulong_val 
                               == expr->ev ()->u.ulval)
                             {
                               this->default_value_.u.ulong_val++;
@@ -991,7 +982,7 @@ be_union::compute_default_value (void)
                             }
                           break;
                         case AST_Expression::EV_char:
-                          if (this->default_value_.u.char_val
+                          if (this->default_value_.u.char_val 
                               == expr->ev ()->u.cval)
                             {
                               this->default_value_.u.char_val++;
@@ -999,7 +990,7 @@ be_union::compute_default_value (void)
                             }
                           break;
                         case AST_Expression::EV_bool:
-                          if (this->default_value_.u.bool_val
+                          if (this->default_value_.u.bool_val 
                               == expr->ev ()->u.bval)
                             {
                               this->default_value_.u.bool_val++;
@@ -1009,7 +1000,7 @@ be_union::compute_default_value (void)
                         case AST_Expression::EV_any:
                           // this is the case of enums. We maintain
                           // evaluated values which always start with 0
-                          if (this->default_value_.u.enum_val
+                          if (this->default_value_.u.enum_val 
                               == expr->ev ()->u.eval)
                             {
                               this->default_value_.u.enum_val++;
@@ -1029,14 +1020,14 @@ be_union::compute_default_value (void)
           si->next ();
         } // end of while scope iterator loop
       delete si; // free the iterator object
-
+      
       // we have not aborted the inner loops which means we have found the
       // default value
       if (!break_loop)
         this->default_value_.computed_ = 1;
-
+      
     } // end of outer while
-
+  
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp
index 0d185d6164e..316df27920a 100644
--- a/TAO/TAO_IDL/be/be_union_branch.cpp
+++ b/TAO/TAO_IDL/be/be_union_branch.cpp
@@ -95,70 +95,7 @@ be_union_branch::gen_label_value (TAO_OutStream *os, unsigned long index)
   // we must prefix the enum value with something...
   be_decl* decl =
     scope->decl ();
-  *os << decl->fullname () << "::" << e->n ();
-  return 0;
-}
-
-int
-be_union_branch::gen_default_label_value (TAO_OutStream *os,
-                                          be_union *bu)
-{
-  be_union::DefaultValue dv;
-
-  if (bu->default_value (dv) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch::"
-                         "gen_default_label_value - "
-                         "computing default value failed\n"),
-                        -1);
-    }
-  
-  switch (bu->udisc_type ())
-    {
-      case AST_Expression::EV_short:
-        *os << dv.u.short_val;
-        break;
-      case AST_Expression::EV_ushort:
-        *os << dv.u.ushort_val;
-        break;
-      case AST_Expression::EV_long:
-        *os << dv.u.long_val;
-        break;
-      case AST_Expression::EV_ulong:
-        *os << dv.u.ulong_val;
-        break;
-      case AST_Expression::EV_char:
-        os->print ("%d", dv.u.char_val);
-        break;
-      case AST_Expression::EV_bool:
-        *os << dv.u.bool_val;
-        break;
-      case AST_Expression::EV_any:
-        // The discriminant is an enum. Some compilers will
-        // not accept a numeric value assigned to this
-        // discriminant, so we must generate the string name.
-        {
-          AST_ConcreteType *act = bu->disc_type ();
-          be_enum *be = be_enum::narrow_from_decl (act);
-
-          // The function value_to_name() takes care of adding
-          // any necessary scoping to the output.
-          *os << be->value_to_name (dv.u.enum_val);
-          break;
-        }
-      case AST_Expression::EV_longlong:
-      case AST_Expression::EV_ulonglong:
-        // unimplemented
-      default:
-        // error caught earlier.
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_union_branch::"
-                           "gen_default_label_value - "
-                           "bad or unimplemented discriminant type\n"),
-                          -1);
-    }
-
+  *os << decl->full_name () << "::" << e->n ();
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index 3917f91400f..00cdbb71161 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -39,7 +39,6 @@ be_valuetype::be_valuetype (void)
 {
   this->size_type (be_decl::VARIABLE); // always the case
   (AST_Module::narrow_from_scope (this->defined_in ()))->set_has_nested_valuetype ();
-  this->has_constructor (I_TRUE);  // always the case
 }
 
 // constructor used to build the AST
@@ -56,7 +55,6 @@ be_valuetype::be_valuetype (UTL_ScopedName *n, AST_Interface **ih, long nih,
   // ---
   this->size_type (be_decl::VARIABLE); // always the case
   (AST_Module::narrow_from_scope (this->defined_in ()))->set_has_nested_valuetype ();
-  this->has_constructor (I_TRUE);  // always the case
 }
 
 be_valuetype::~be_valuetype (void)
@@ -101,7 +99,7 @@ be_valuetype::set_abstract_valuetype ()
 void
 be_valuetype::compute_fullobvskelname (void)
 {
-  this->compute_fullskelname (this->full_obv_skel_name_, "OBV_");
+  this->compute_full_skel_name ("OBV_", this->full_obv_skel_name_);
 }
 
 
@@ -126,7 +124,7 @@ be_valuetype::gen_var_defn (char *)
   char namebuf [NAMEBUFSIZE];  // names
 
   ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
+  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ());
 
   // retrieve a singleton instance of the code generator
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
@@ -138,7 +136,7 @@ be_valuetype::gen_var_defn (char *)
   // for over here.
 
   ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -213,10 +211,10 @@ be_valuetype::gen_var_impl (char *, char *)
   char lname [NAMEBUFSIZE];  // local _var names
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_var", this->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
+  ACE_OS::sprintf (lname, "%s_var", local_name ());
 
   // retrieve a singleton instance of the code generator
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
@@ -407,7 +405,7 @@ be_valuetype::gen_out_defn (char *)
   char namebuf [NAMEBUFSIZE];  // to hold the _out name
 
   ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
+  ACE_OS::sprintf (namebuf, "%s_out", local_name ());
 
   // retrieve a singleton instance of the code generator
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
@@ -417,7 +415,7 @@ be_valuetype::gen_out_defn (char *)
   // generate the out definition (always in the client header)
   ch->indent (); // start with whatever was our current indent level
 
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -465,10 +463,10 @@ be_valuetype::gen_out_impl (char *, char *)
   char lname [NAMEBUFSIZE];  // local _out names
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_out", this->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
+  ACE_OS::sprintf (lname, "%s_out", local_name ());
 
   // retrieve a singleton instance of the code generator
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
diff --git a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
index a6edfb1f3f5..44638e2ad6d 100644
--- a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
@@ -79,7 +79,7 @@ be_valuetype_fwd::gen_var_defn (char *)
   // for over here.
 
   ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -150,7 +150,7 @@ be_valuetype_fwd::gen_var_impl (char *, char *)
   char lname [NAMEBUFSIZE];  // local _var names
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_var", this->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
@@ -342,7 +342,7 @@ be_valuetype_fwd::gen_out_defn (char *)
   // generate the out definition (always in the client header)
   ch->indent (); // start with whatever was our current indent level
 
-  *ch << "class " << idl_global->stub_export_macro ()
+  *ch << "class " << idl_global->export_macro ()
       << " " << namebuf << nl;
   *ch << "{" << nl;
   *ch << "public:\n";
@@ -392,7 +392,7 @@ be_valuetype_fwd::gen_out_impl (char *, char *)
   char lname [NAMEBUFSIZE];  // local _out names
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_out", this->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
index 22e77c1924a..bf19a07a4d6 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
@@ -64,7 +64,7 @@ be_visitor_args::type_name (be_type *node, const char *suffix)
                        (this->ctx_->scope (), suffix));
       break;
     default: // fullname for all other cases
-      ACE_OS::sprintf (namebuf, "%s", bt->fullname ());
+      ACE_OS::sprintf (namebuf, "%s", bt->full_name ());
       if (suffix)
         ACE_OS::strcat (namebuf, suffix);
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_array.cpp b/TAO/TAO_IDL/be/be_visitor_array.cpp
index 3e09618fa28..395a98fb319 100644
--- a/TAO/TAO_IDL/be/be_visitor_array.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array.cpp
@@ -33,6 +33,5 @@
 #include "be_visitor_array/any_op_cs.cpp"
 #include "be_visitor_array/cdr_op_ch.cpp"
 #include "be_visitor_array/cdr_op_ci.cpp"
-#include "be_visitor_array/cdr_op_cs.cpp"
 
 ACE_RCSID(be, be_visitor_array, "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
index 5751c090d2e..15237b1baf9 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
@@ -52,10 +52,10 @@ be_visitor_array_any_op_ch::visit_array (be_array *node)
 
   // generate the Any <<= and >>= operator declarations
   os->indent ();
-  *os << "void " << idl_global->stub_export_macro ()
+  *os << "void " << idl_global->export_macro ()
       << " operator<<= (CORBA::Any &, const " << node->name ()
       << "_forany &);" << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>>= (const CORBA::Any &, "
       << node->name () << "_forany &);\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index da56bc26e3a..d28b1dbee33 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -64,14 +64,14 @@ int be_visitor_array_ch::visit_array (be_array *node)
     }
 
   // generate the ifdefined macro
-  os->gen_ifdef_macro (node->flatname ());
+  os->gen_ifdef_macro (node->flat_name ());
 
-  // If we contain an anonymous sequence,
+  // If we contain an anonymous sequence, 
   // generate code for the sequence here.
   if (bt->node_type () == AST_Decl::NT_sequence)
     {
-      if (this->gen_anonymous_base_type (bt,
-                                         TAO_CodeGen::TAO_SEQUENCE_CH)
+      if (this->gen_anonymous_base_type (bt, 
+                                         TAO_CodeGen::TAO_SEQUENCE_CH) 
           == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,7 +79,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
                              "visit_array - "
                              "gen_anonymous_base_type failed\n"),
                             -1);
-        }
+        }              
     }
 
   os->indent ();
@@ -312,7 +312,7 @@ be_visitor_array_ch::gen_var_defn (be_array *node)
   // for over here.
 
   os->indent (); // start with whatever was our current indent level
-  *os << "class " << idl_global->stub_export_macro ()
+  *os << "class " << idl_global->export_macro ()
       << " " << varnamebuf << be_nl;
   *os << "{" << be_nl;
   *os << "public:" << be_idt_nl;
@@ -391,7 +391,7 @@ be_visitor_array_ch::gen_out_defn (be_array *node)
   // generate the out definition (always in the client header)
   os->indent (); // start with whatever was our current indent level
 
-  *os << "class " << idl_global->stub_export_macro ()
+  *os << "class " << idl_global->export_macro ()
       << " " << outnamebuf << be_nl;
   *os << "{" << be_nl;
   *os << "public:" << be_idt_nl;
@@ -455,7 +455,7 @@ be_visitor_array_ch::gen_forany_defn (be_array *node)
   // for over here.
 
   os->indent (); // start with whatever was our current indent level
-  *os << "class " << idl_global->stub_export_macro ()
+  *os << "class " << idl_global->export_macro ()
       << " " << foranyname << be_nl;
   *os << "{" << be_nl;
   *os << "public:" << be_idt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index f44a117f706..07d211ac5ee 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -54,7 +54,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_ci::"
+                         "(%N:%l) be_visitor_field_cdr_op_ch::"
                          "visit_array - "
                          "bad base type\n"),
                         -1);
@@ -126,8 +126,8 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
   if (this->ctx_->tdef ())
     {
       // typedefed node
-      ACE_OS::sprintf (nodename, "%s", node->fullname ());
-      ACE_OS::sprintf (fname, "%s_var", node->fullname ());
+      ACE_OS::sprintf (nodename, "%s", node->full_name ());
+      ACE_OS::sprintf (fname, "%s_var", node->full_name ());
       ACE_OS::sprintf (lname, "%s_var",
                        node->local_name ()->get_string ());
     }
@@ -139,17 +139,17 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (nodename, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (nodename, "%s::_%s", parent->full_name (),
                            node->local_name ()->get_string ());
-          ACE_OS::sprintf (fname, "%s::_%s_var", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s_var", parent->full_name (),
                            node->local_name ()->get_string ());
           ACE_OS::sprintf (lname, "_%s_var",
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (nodename, "_%s", node->fullname ());
-          ACE_OS::sprintf (fname, "_%s_var", node->fullname ());
+          ACE_OS::sprintf (nodename, "_%s", node->full_name ());
+          ACE_OS::sprintf (fname, "_%s_var", node->full_name ());
           ACE_OS::sprintf (lname, "_%s_var",
                            node->local_name ()->get_string ());
         }
@@ -184,8 +184,7 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
   *os << fname << "::" << lname << " (const " << fname
       << " &p) // copy constructor" << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "this->ptr_ = " << nodename << "_dup " << "(ACE_const_cast (const " 
-      << nodename << "_slice *, p.ptr_));" << be_uidt_nl;
+  *os << "this->ptr_ = " << nodename << "_dup (p.ptr_);" << be_uidt_nl;
   *os << "}\n\n";
 
   // destructor
@@ -223,9 +222,8 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
   *os << "{" << be_idt_nl;
   *os << "// not assigning to ourselves" << be_nl;
   *os << nodename << "_free (this->ptr_); // free old stuff" << be_nl;
-  *os << "// deep copy" << be_nl;
-  *os << "this->ptr_ = " << nodename << "_dup (ACE_const_cast (const " 
-      << nodename << "_slice *, p.ptr_));" << be_uidt_nl;
+  *os << "this->ptr_ = " << nodename
+      << "_dup (p.ptr_);// deep copy" << be_uidt_nl;
   *os << "}" << be_nl;
   *os << "return *this;" << be_uidt_nl;
   *os << "}\n\n";
@@ -251,8 +249,7 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
   *os << "ACE_INLINE const " << nodename << "_slice &" << be_nl;
   *os << fname << "::operator[] (CORBA::ULong index) const" << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "return ACE_const_cast (const " << nodename 
-      << "_slice &, this->ptr_[index]);" << be_uidt_nl;
+  *os << "return this->ptr_[index];" << be_uidt_nl;
   *os << "}\n\n";
 
   os->indent ();
@@ -267,8 +264,7 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
   *os << "ACE_INLINE const " << nodename << "_slice *" << be_nl;
   *os << fname << "::in (void) const" << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "return ACE_const_cast (const " << nodename 
-      << "_slice *, this->ptr_);" << be_uidt_nl;
+  *os << "return this->ptr_;" << be_uidt_nl;
   *os << "}\n\n";
 
   os->indent ();
@@ -323,8 +319,8 @@ be_visitor_array_ci::gen_out_impl (be_array *node)
   if (this->ctx_->tdef ())
     {
       // typedefed node
-      ACE_OS::sprintf (nodename, "%s", node->fullname ());
-      ACE_OS::sprintf (fname, "%s_out", node->fullname ());
+      ACE_OS::sprintf (nodename, "%s", node->full_name ());
+      ACE_OS::sprintf (fname, "%s_out", node->full_name ());
       ACE_OS::sprintf (lname, "%s_out",
                        node->local_name ()->get_string ());
     }
@@ -336,17 +332,17 @@ be_visitor_array_ci::gen_out_impl (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (nodename, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (nodename, "%s::_%s", parent->full_name (),
                            node->local_name ()->get_string ());
-          ACE_OS::sprintf (fname, "%s::_%s_out", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s_out", parent->full_name (),
                            node->local_name ()->get_string ());
           ACE_OS::sprintf (lname, "_%s_out",
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (nodename, "_%s", node->fullname ());
-          ACE_OS::sprintf (fname, "_%s_out", node->fullname ());
+          ACE_OS::sprintf (nodename, "_%s", node->full_name ());
+          ACE_OS::sprintf (fname, "_%s_out", node->full_name ());
           ACE_OS::sprintf (lname, "_%s_out",
                            node->local_name ()->get_string ());
         }
@@ -457,8 +453,8 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
   if (this->ctx_->tdef ())
     {
       // typedefed node
-      ACE_OS::sprintf (nodename, "%s", node->fullname ());
-      ACE_OS::sprintf (fname, "%s_forany", node->fullname ());
+      ACE_OS::sprintf (nodename, "%s", node->full_name ());
+      ACE_OS::sprintf (fname, "%s_forany", node->full_name ());
       ACE_OS::sprintf (lname, "%s_forany",
                        node->local_name ()->get_string ());
     }
@@ -470,17 +466,17 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (nodename, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (nodename, "%s::_%s", parent->full_name (),
                            node->local_name ()->get_string ());
-          ACE_OS::sprintf (fname, "%s::_%s_forany", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s_forany", parent->full_name (),
                            node->local_name ()->get_string ());
           ACE_OS::sprintf (lname, "_%s_forany",
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (nodename, "_%s", node->fullname ());
-          ACE_OS::sprintf (fname, "_%s_forany", node->fullname ());
+          ACE_OS::sprintf (nodename, "_%s", node->full_name ());
+          ACE_OS::sprintf (fname, "_%s_forany", node->full_name ());
           ACE_OS::sprintf (lname, "_%s_forany",
                            node->local_name ()->get_string ());
         }
@@ -518,8 +514,7 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
   *os << fname << "::" << lname << " (const " << fname
       << " &p) // copy constructor" << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "this->ptr_ = " << nodename << "_dup (ACE_const_cast (const "
-      << nodename << "_slice *, p.ptr_));" << be_nl;
+  *os << "this->ptr_ = " << nodename << "_dup (p.ptr_);" << be_nl;
   *os << "this->nocopy_ = p.nocopy_;" << be_uidt_nl;
   *os << "}\n\n";
 
@@ -537,8 +532,8 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
   *os << fname << "::operator= (" << nodename
       << "_slice *p)" << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "// is what we own the same that is being assigned to us?" 
-      << be_nl;
+  *os << "// is what we own the same that is being assigned to us?" <<
+    be_nl;
   *os << "if (this->ptr_ != p)" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "// delete our stuff and assume ownership of p" << be_nl;
@@ -558,9 +553,8 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
   *os << "{" << be_idt_nl;
   *os << "// not assigning to ourselves" << be_nl;
   *os << nodename << "_free (this->ptr_); // free old stuff" << be_nl;
-  *os << "// deep copy" << be_nl;
-  *os << "this->ptr_ = " << nodename << "_dup (ACE_const_cast (const " 
-      << nodename << "_slice *, p.ptr_));" << be_nl;
+  *os << "this->ptr_ = " << nodename
+      << "_dup (p.ptr_);// deep copy" << be_nl;
   *os << "this->nocopy_ = p.nocopy_;" << be_uidt_nl;
   *os << "}" << be_nl;
   *os << "return *this;" << be_uidt_nl;
@@ -588,8 +582,7 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
   *os << "ACE_INLINE " << nodename << "_slice const &" << be_nl;
   *os << fname << "::operator[] (CORBA::ULong index) const" << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "return ACE_const_cast (" << nodename 
-      << "_slice const &, this->ptr_[index]);" << be_uidt_nl;
+  *os << "return this->ptr_[index];" << be_uidt_nl;
   *os << "}\n\n";
 
   os->indent ();
@@ -604,8 +597,7 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
   *os << "ACE_INLINE const " << nodename << "_slice *" << be_nl;
   *os << fname << "::in (void) const" << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "return ACE_const_cast (const " << nodename 
-      << "_slice *, this->ptr_);" << be_uidt_nl;
+  *os << "return this->ptr_;" << be_uidt_nl;
   *os << "}\n\n";
 
   os->indent ();
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
index 981355135c5..da5090b7e16 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -72,7 +72,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
   if (this->ctx_->tdef ())
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
+      ACE_OS::sprintf (fname, "%s", node->full_name ());
       ACE_OS::sprintf (lname, "%s",
                        node->local_name ()->get_string ());
     }
@@ -84,14 +84,14 @@ int be_visitor_array_cs::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            node->local_name ()->get_string ());
           ACE_OS::sprintf (lname, "_%s",
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
+          ACE_OS::sprintf (fname, "_%s", node->full_name ());
           ACE_OS::sprintf (lname, "_%s",
                            node->local_name ()->get_string ());
         }
@@ -153,7 +153,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
   *os << fname << "_copy (" << fname << "_slice * _tao_to, "
       << "const " << fname << "_slice *_tao_from)" << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "// copy each individual element" << be_nl;
+  *os << "// copy each individual elements" << be_nl;
 
   // generate nested loops for as many dimensions as there are
   for (i = 0; i < node->n_dims (); i++)
@@ -188,32 +188,22 @@ int be_visitor_array_cs::visit_array (be_array *node)
   // now generate code such that every element of the array gets assigned
   // inside the innermost level of the  nested loops generated above
   be_array *primitive_type = 0;
-
   if (bt->node_type () == AST_Decl::NT_typedef)
     {
-      // Base type of the array node is a typedef. We need to make sure that
+      // base type of the array node is a typedef. We need to make sure that
       // this typedef is not to another array type. If it is, then we cannot
       // assign an array to another. We will have to invoke the underlying
       // array type's copy method for every array dimension.
-
-      // There may be more than one level of typedef.
-      be_type *tmp = bt;
-
-      while (tmp->node_type () == AST_Decl::NT_typedef)
-        {
-          be_typedef *tdef = be_typedef::narrow_from_decl (tmp);
-          tmp = be_type::narrow_from_decl (tdef->base_type ());
-        }
-
-      primitive_type = be_array::narrow_from_decl (tmp);
+      be_typedef *tdef = be_typedef::narrow_from_decl (bt);
+      // check if the base type of the typedef node is an Array node
+      primitive_type = be_array::narrow_from_decl (tdef->base_type ());
     }
-
   if (primitive_type)
     {
-      // The base type is a typedef to another array type, so
-      // we use the base type's copy method.
-      *os << "// call the underlying _copy" << be_nl;
+      // the base type is not a typedef to a possibly another array type. In
+      // such a case, assign each element.
 
+      *os << "// call the underlying _copy" << be_nl;
       if (bt->accept (this) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -238,7 +228,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
     }
   else
     {
-      // the base type is not a typedef to possibly another array type. In
+      // the base type is not a typedef to a possibly another array type. In
       // such a case, assign each element.
 
       *os << "_tao_to"; // generate the lvalue
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
index 29fdc73c3a7..58f70f8f79d 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
@@ -51,15 +51,15 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // generate the CDR << and >> operator declarations
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
-      << " operator<< (TAO_OutputCDR &, const ";
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
+      << " operator<< (TAO_OutputCDR &, const "; 
   // @@ TODO: this should be done in the node, it is absurd to repeat
   // this code all over the visitors!!!!
   if (!this->ctx_->tdef ())
     {
       be_scope* scope = be_scope::narrow_from_scope (node->defined_in ());
       be_decl* parent = scope->decl ();
-      *os << parent->fullname ()
+      *os << parent->full_name ()
           << "::_" << node->local_name ()
           << "_forany &);" << be_nl;
     }
@@ -67,13 +67,13 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
     {
       *os << node->name () << "_forany &);" << be_nl;
     }
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>> (TAO_InputCDR &, ";
   if (!this->ctx_->tdef ())
     {
       be_scope* scope = be_scope::narrow_from_scope (node->defined_in ());
       be_decl* parent = scope->decl ();
-      *os << parent->fullname ()
+      *os << parent->full_name ()
           << "::_" << node->local_name ()
           << "_forany &);" << be_nl;
     }
@@ -82,6 +82,34 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
       *os << node->name () << "_forany &);" << be_nl;
     }
 
+      // If we contain an anonymous sequence, 
+      // generate code for the sequence here.
+
+      // retrieve the type
+      be_type *bt = be_type::narrow_from_decl (node->base_type ());
+      if (!bt)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_array_cdr_op_ch::"
+                             "visit_array - "
+                             "bad base type\n"),
+                            -1);
+        }
+
+      if (bt->node_type () == AST_Decl::NT_sequence)
+        {
+          if (this->gen_anonymous_base_type (bt, 
+                                             TAO_CodeGen::TAO_SEQUENCE_CDR_OP_CH) 
+              == -1)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_array_cdr_op_ch::"
+                                 "visit_array - "
+                                 "gen_anonymous_base_type failed\n"),
+                                -1);
+            }              
+        }
+
   node->cli_hdr_cdr_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp
index 16ffac1a7a1..c6e7bf91dce 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp
@@ -66,7 +66,7 @@ be_visitor_array_cdr_op_ci::visit_array (be_array *node)
       if (!bt)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_cdr_op_ci::"
+                             "be_visitor_array_cdr_op_ci::"
                              "visit_array - "
                              "Bad base type\n"),
                             -1);
@@ -77,14 +77,14 @@ be_visitor_array_cdr_op_ci::visit_array (be_array *node)
 
       if (bt->node_type () == AST_Decl::NT_sequence)
         {
-          // CDR operators for sequences are now declared in the .i file,
-          // so we pass this state to the function.
+          // @@ (JP) TODO - change state arg to _CI when the rest of
+          // the cdr_op files get unhacked.
           if (this->gen_anonymous_base_type (bt, 
-                                             TAO_CodeGen::TAO_SEQUENCE_CDR_OP_CH) 
+                                             TAO_CodeGen::TAO_SEQUENCE_CDR_OP_CS) 
               == -1)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_array_cdr_op_ci::"
+                                 "(%N:%l) be_visitor_field_cdr_op_ch::"
                                  "visit_array - "
                                  "gen_anonymous_base_type failed\n"),
                                 -1);
@@ -92,7 +92,7 @@ be_visitor_array_cdr_op_ci::visit_array (be_array *node)
         }
 
       // for anonymous arrays, the type name has a _ prepended. We compute the
-      // fullname with or without the underscore and use it later on.
+      // full_name with or without the underscore and use it later on.
       char fname [NAMEBUFSIZE];  // to hold the full and
 
       // save the node's local name and full name in a buffer for quick use later
@@ -101,7 +101,7 @@ be_visitor_array_cdr_op_ci::visit_array (be_array *node)
       if (this->ctx_->tdef ())
         {
           // typedefed node
-          ACE_OS::sprintf (fname, "%s", node->fullname ());
+          ACE_OS::sprintf (fname, "%s", node->full_name ());
         }
       else
         {
@@ -112,12 +112,12 @@ be_visitor_array_cdr_op_ci::visit_array (be_array *node)
           if (node->is_nested ())
             {
               be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-              ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+              ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                                node->local_name ()->get_string ());
             }
           else
             {
-              ACE_OS::sprintf (fname, "_%s", node->fullname ());
+              ACE_OS::sprintf (fname, "_%s", node->full_name ());
             }
         }
 
@@ -509,7 +509,7 @@ be_visitor_array_cdr_op_ci::visit_node (be_type *bt)
       if (expr->ev ()->et == AST_Expression::EV_ulong)
         {
           // generate a loop for each dimension
-          *os << be_nl << "for (CORBA::ULong i" << i << " = 0; i" << i << " < "
+          *os << "for (CORBA::ULong i" << i << " = 0; i" << i << " < "
               << expr->ev ()->u.ulval << " && _tao_marshal_flag; i" << i
               << "++)" << be_idt_nl;
         }
@@ -528,104 +528,55 @@ be_visitor_array_cdr_op_ci::visit_node (be_type *bt)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "{" << be_idt_nl;
-
+      *os << "_tao_marshal_flag = (strm >> ";
       // handle the array of array case in which case, we need to pass the
       // forany type
       if (bt->node_type () == AST_Decl::NT_array)
         {
-          *os << bt->name () << "_forany tmp (ACE_const_cast (" << bt->name ()
-              << "_slice *, _tao_array ";
-          for (i = 0; i < node->n_dims (); i++)
-            {
-              *os << "[i" << i << "]";
-            }
-
-          switch (bt->node_type ())
-            {
-              // the following have a _var type and must be 
-              // handled in a special way
-              case AST_Decl::NT_string:
-              case AST_Decl::NT_interface:
-              case AST_Decl::NT_interface_fwd:
-                *os << ".out ()";
-                break;
-              case AST_Decl::NT_pre_defined:
-                {
-                  // we need to separately handle this case of pseudo
-                  // objects because they have a _var type
-                  be_predefined_type *pt = 
-                    be_predefined_type::narrow_from_decl (bt);
-                  if (!pt)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_visitor_array_cdr_op_ci::"
-                                         "visit_node - "
-                                         "bad predefined type node\n"),
-                                        -1);
-                    }
-                  if (pt->pt () == AST_PredefinedType::PT_pseudo)
-                    {
-                      *os << ".out ()";
-                    }
-                }
-              default:
-                break;
-            }
-
-          *os << "));" << be_nl;
-          *os << "_tao_marshal_flag = (strm >> tmp);" << be_uidt_nl;
+          *os << bt->name () << "_forany ((" << bt->name ()
+              << "_slice *) ";
         }
-      else
+      *os << "_tao_array ";
+      for (i = 0; i < node->n_dims (); i++)
         {
-          *os << "_tao_marshal_flag = (strm >> ";
-          *os << "_tao_array ";
-          for (i = 0; i < node->n_dims (); i++)
-            {
-              *os << "[i" << i << "]";
-            }
-
-          switch (bt->node_type ())
-            {
-              // the following have a _var type and must be 
-              // handled in a special way
-              case AST_Decl::NT_string:
-              case AST_Decl::NT_interface:
-              case AST_Decl::NT_interface_fwd:
+          *os << "[i" << i << "]";
+        }
+      switch (bt->node_type ())
+        {
+          // the following have a _var type and must be handled in a special way
+        case AST_Decl::NT_string:
+        case AST_Decl::NT_interface:
+        case AST_Decl::NT_interface_fwd:
+          *os << ".out ()";
+          break;
+        case AST_Decl::NT_pre_defined:
+          {
+            // we need to separately handle this case of pseudo objects because
+            // they have a _var type
+            be_predefined_type *pt = be_predefined_type::narrow_from_decl (bt);
+            if (!pt)
+              {
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   "(%N:%l) be_visitor_array_cdr_op_ci::"
+                                   "visit_node - "
+                                   "bad predefined type node\n"),
+                                  -1);
+              }
+            if (pt->pt () == AST_PredefinedType::PT_pseudo)
+              {
                 *os << ".out ()";
-                break;
-              case AST_Decl::NT_pre_defined:
-                {
-                  // we need to separately handle this case of pseudo
-                  // objects because they have a _var type
-                  be_predefined_type *pt = 
-                    be_predefined_type::narrow_from_decl (bt);
-                  if (!pt)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_visitor_array_cdr_op_ci::"
-                                         "visit_node - "
-                                         "bad predefined type node\n"),
-                                        -1);
-                    }
-                  if (pt->pt () == AST_PredefinedType::PT_pseudo)
-                    {
-                      *os << ".out ()";
-                    }
-                }
-              default:
-                break;
-            }
-
-          *os << ");" << be_uidt_nl;
+              }
+          }
+        default:
+          break;
         }
-
-      *os << "}" << be_nl;
-
+      if (bt->node_type () == AST_Decl::NT_array)
+        {
+          *os << ")";
+        }
+      *os << ");";
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "{" << be_idt_nl;
-
       *os << "_tao_marshal_flag = (strm << ";
       // handle the array of array case in which case, we need to pass the
       // forany type
@@ -673,9 +624,7 @@ be_visitor_array_cdr_op_ci::visit_node (be_type *bt)
           // array of array case
           *os << ")";
         }
-      *os << ");" << be_uidt_nl
-          << "}" << be_nl;
-
+      *os << ");";
       break;
     default:
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -690,7 +639,6 @@ be_visitor_array_cdr_op_ci::visit_node (be_type *bt)
       // decrement indentation as many times as the number of dimensions
       *os << be_uidt;
     }
-
   *os << be_nl;
   *os << "return _tao_marshal_flag;" << be_uidt_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
deleted file mode 100644
index 2fc2afadd82..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor for code generation of Arrays for the CDR operators in the client
-//    stubs.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_array.h"
-
-// ***************************************************************************
-// Array visitor for generating CDR operator declarations in the client
-// stubs file
-// ***************************************************************************
-
-be_visitor_array_cdr_op_cs::be_visitor_array_cdr_op_cs (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_array_cdr_op_cs::~be_visitor_array_cdr_op_cs (void)
-{
-}
-
-int
-be_visitor_array_cdr_op_cs::visit_array (be_array *node)
-{
-  // retrieve the base type
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_cdr_op_cs::"
-                         "visit_array - "
-                         "Bad base type\n"),
-                        -1);
-    }
-
-  // If we contain an anonymous sequence, 
-  // generate code for the sequence here.
-
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      if (this->gen_anonymous_base_type (bt, 
-                                         TAO_CodeGen::TAO_SEQUENCE_CDR_OP_CS) 
-          == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_cdr_op_cs::"
-                             "visit_array - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }              
-    }
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
index a206fcf721b..46b3c3013ed 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
@@ -51,10 +51,10 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
 
   // generate the Any <<= and >>= operators
   os->indent ();
-  *os << "void " << idl_global->stub_export_macro ()
+  *os << "void " << idl_global->export_macro ()
       << " operator<<= (CORBA::Any &, " << node->name ()
       << ");" << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>>= (const CORBA::Any &, "
       << node->name () << " &);\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
index b9f1ff8cb99..7c35d00c706 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
@@ -52,10 +52,10 @@ be_visitor_enum_cdr_op_ch::visit_enum (be_enum *node)
 
   // generate the CDR << and >> operators
   os->indent ();
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator<< (TAO_OutputCDR &, const " << node->name ()
       << " &); // " << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>> (TAO_InputCDR &, "
       << node->name () << " &);\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
index af7554472a6..d0c16445b30 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
@@ -51,13 +51,13 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
 
   // generate the Any <<= and >>= operator declarations
   os->indent ();
-  *os << "void " << idl_global->stub_export_macro ()
+  *os << "void " << idl_global->export_macro ()
       << " operator<<= (CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
-  *os << "void " << idl_global->stub_export_macro ()
+  *os << "void " << idl_global->export_macro ()
       << " operator<<= (CORBA::Any &, " << node->name ()
       << "*); // noncopying version" << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>>= (const CORBA::Any &, "
       << node->name () << " *&);\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
index ca4afa88e48..1910de4e68e 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
@@ -51,10 +51,10 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node)
 
   // generate the Cdr <<= and >>= operator declarations
   os->indent ();
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator<< (TAO_OutputCDR &, const " << node->name ()
       << " &); // " << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>> (TAO_InputCDR &, "
       << node->name () << " &);\n";
 
@@ -74,3 +74,4 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node)
   node->cli_hdr_cdr_op_gen (1);
   return 0;
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
index 5c3bff6388f..78a6dcbff64 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
@@ -94,7 +94,7 @@ int be_visitor_exception_ctor_assign::visit_array (be_array *node)
 
   os->indent ();
 
-  if (ACE_OS::strcmp (bd->flatname (), node->flatname ()))
+  if (ACE_OS::strcmp (bd->flat_name (), node->flat_name ()))
     {
       // We are typedef'd.
       *os << node->name ();
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
index 34bc5134cc1..3d47c0ef614 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -50,7 +50,7 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
     {
       os = this->ctx_->stream ();
 
-      os->gen_ifdef_macro (node->flatname (), "_ptr");
+      os->gen_ifdef_macro (node->flat_name (), "_ptr");
 
       os->indent ();
       *os << "class " << node->local_name () << ";" << be_nl;
@@ -59,10 +59,10 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
 	  << node->local_name () << "_ptr;" << be_nl;
       os->gen_endif ();
 
-      os->gen_ifdef_macro (node->flatname ());
+      os->gen_ifdef_macro (node->flat_name ());
 
       os->indent ();
-      *os << "class " << idl_global->stub_export_macro ()
+      *os << "class " << idl_global->export_macro ()
 	  << " " << node->local_name ()
 	  << " : public CORBA::UserException" << be_nl;
       *os << "{" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
index 6b3e59fdae6..f5647a4e9b1 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
@@ -126,7 +126,7 @@ int be_visitor_exception_ctor::visit_array (be_array *node)
 
   if (this->ctx_->state () != TAO_CodeGen::TAO_EXCEPTION_CTOR_CH
       && !tdef)
-    *os << this->ctx_->scope ()->fullname () << "::";
+    *os << this->ctx_->scope ()->full_name () << "::";
 
   if (!tdef)
     *os << "_";
diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp
index e0ff7f482cf..1f66014a5f6 100644
--- a/TAO/TAO_IDL/be/be_visitor_factory.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp
@@ -125,19 +125,24 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
 
     case TAO_CodeGen::TAO_MODULE_CH:
       return new be_visitor_module_ch (new_ctx);
+
     case TAO_CodeGen::TAO_MODULE_SH:
       return new be_visitor_module_sh (new_ctx);
+
     case TAO_CodeGen::TAO_MODULE_IH:
       return new be_visitor_module_ih (new_ctx);
+
     case TAO_CodeGen::TAO_MODULE_CI:
     case TAO_CodeGen::TAO_MODULE_CS:
     case TAO_CodeGen::TAO_MODULE_SI:
     case TAO_CodeGen::TAO_MODULE_SS:
     case TAO_CodeGen::TAO_MODULE_IS:
       return new be_visitor_module (new_ctx);
+
     case TAO_CodeGen::TAO_MODULE_ANY_OP_CH:
     case TAO_CodeGen::TAO_MODULE_ANY_OP_CS:
       return new be_visitor_module_any_op (new_ctx);
+
     case TAO_CodeGen::TAO_MODULE_CDR_OP_CH:
     case TAO_CodeGen::TAO_MODULE_CDR_OP_CI:
     case TAO_CodeGen::TAO_MODULE_CDR_OP_CS:
@@ -145,6 +150,7 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
 
     case TAO_CodeGen::TAO_INTERFACE_CH:
       return new be_visitor_interface_ch (new_ctx);
+
     case TAO_CodeGen::TAO_INTERFACE_CI:
       return new be_visitor_interface_ci (new_ctx);
 
@@ -152,27 +158,38 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_interface_cs (new_ctx);
 
     case TAO_CodeGen::TAO_INTERFACE_SH:
+    case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CH:
       return new be_visitor_interface_sh (new_ctx);
+
     case TAO_CodeGen::TAO_INTERFACE_IH:
       return new be_visitor_interface_ih (new_ctx);
+
     case TAO_CodeGen::TAO_INTERFACE_SI:
       return new be_visitor_interface_si (new_ctx);
+
     case TAO_CodeGen::TAO_INTERFACE_SS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CS:
       return new be_visitor_interface_ss (new_ctx);
+
     case TAO_CodeGen::TAO_INTERFACE_IS:
       return new be_visitor_interface_is (new_ctx);
+
     case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH:
+    case TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_THRU_POA_COLLOCATED_CH:
       return new be_visitor_interface_thru_poa_collocated_sh (new_ctx);
+
     case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_THRU_POA_COLLOCATED_CS:
       return new be_visitor_interface_thru_poa_collocated_ss (new_ctx);
+
     case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH:
+    case TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_DIRECT_COLLOCATED_CH:
       return new be_visitor_interface_direct_collocated_sh (new_ctx);
+
     case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_DIRECT_COLLOCATED_CS:
       return new be_visitor_interface_direct_collocated_ss (new_ctx);
 
-    case TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_CH:
-      return new be_visitor_interface_collocated_ami_handler_ch (new_ctx);
-
     case TAO_CodeGen::TAO_INTERFACE_ANY_OP_CH:
       return new be_visitor_interface_any_op_ch (new_ctx);
     case TAO_CodeGen::TAO_INTERFACE_ANY_OP_CS:
@@ -189,7 +206,9 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_interface_cdr_op_cs (new_ctx);
 
     case TAO_CodeGen::TAO_INTERFACE_FWD_CH:
+    //case TAO_CodeGen::TAO_AMI_HANDLER_FWD_CH:
       return new be_visitor_interface_fwd_ch (new_ctx);
+
     case TAO_CodeGen::TAO_INTERFACE_FWD_CI:
       return new be_visitor_interface_fwd_ci (new_ctx);
     case TAO_CodeGen::TAO_INTERFACE_FWD_CDR_OP_CI:
@@ -448,24 +467,29 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_ARRAY_CDR_OP_CI:
       return new be_visitor_array_cdr_op_ci (new_ctx);
     case TAO_CodeGen::TAO_ARRAY_CDR_OP_CS:
-      return new be_visitor_array_cdr_op_cs (new_ctx);
+      return new be_visitor_decl (new_ctx);
 
     case TAO_CodeGen::TAO_ARGUMENT_AMI:
       // @@ Alex: I am not sure about this case, yet (Alex).
       //    noop.
       return new be_visitor_decl (new_ctx);
 
+    // @@ Michael: With the strategy we can use the default one.
     case TAO_CodeGen::TAO_AMI_HANDLER_FWD_CH:
-      return new be_visitor_interface_ami_handler_fwd_ch (new_ctx);
+          return new be_visitor_interface_ami_handler_fwd_ch (new_ctx);
 
     case TAO_CodeGen::TAO_AMI_HANDLER_FWD_CI:
       return new be_visitor_interface_ami_handler_fwd_ci (new_ctx);
 
+    // @@ Michael: We use 1:1 the server servant code, but
+    // use different operations.
+#if 0
     case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CH:
       return new be_visitor_interface_ami_handler_servant_ch (new_ctx);
 
     case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CS:
       return new be_visitor_interface_ami_handler_servant_cs (new_ctx);
+#endif /* 0 */
 
     case TAO_CodeGen::TAO_AMI_HANDLER_STUB_CH:
       return new be_visitor_interface_ami_handler_stub_ch (new_ctx);
@@ -476,6 +500,12 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RESULT_ARG:
       return new be_visitor_args_ami_handler_result_arg (new_ctx);
 
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_THRU_POA_COLLOCATED_CH:
+      return new be_visitor_operation_ami_handler_thru_poa_collocated_ch(new_ctx);
+ 
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_THRU_POA_COLLOCATED_CS:
+      return new be_visitor_operation_ami_handler_thru_poa_collocated_cs(new_ctx);
+
     default:
       // an error
       delete new_ctx;
@@ -530,10 +560,6 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_operation_direct_collocated_sh (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SS:
       return new be_visitor_operation_direct_collocated_ss (new_ctx);
-
-    case TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_OPERATION_CH:
-      return new be_visitor_operation_ami_handler_operation_ch (new_ctx);
-
     case TAO_CodeGen::TAO_OPERATION_RETTYPE_CH:
     case TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS:
       return new be_visitor_operation_rettype (new_ctx);
@@ -582,7 +608,6 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_OPERATION_ARG_PRE_INVOKE_CS:
     case TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS:
     case TAO_CodeGen::TAO_AMI_OPERATION_ARG_INVOKE_CS:
-    // @@ Michael case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_INVOKE_CS:
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_CS:
     case TAO_CodeGen::TAO_OPERATION_ARG_PRE_UPCALL_SS:
     case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
@@ -609,7 +634,6 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
 
     case TAO_CodeGen::TAO_ARGUMENT_INVOKE_CS:
     case TAO_CodeGen::TAO_AMI_ARGUMENT_INVOKE_CS:
-    // @@ Michael case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_INVOKE_CS:
       return new be_visitor_args_docall_cs (new_ctx);
 
     case TAO_CodeGen::TAO_ARGUMENT_POST_INVOKE_CS:
@@ -720,9 +744,6 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SS:
       return new be_visitor_operation_direct_collocated_ss (new_ctx);
 
-    case TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_OPERATION_CH:
-      return new be_visitor_operation_ami_handler_operation_ch (new_ctx);
-
     case TAO_CodeGen::TAO_OPERATION_RETTYPE_CH:
     case TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS:
       return new be_visitor_operation_rettype (new_ctx);
@@ -784,27 +805,23 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_MARSHAL_SS:
     case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DECL_CS:
     case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_COLLOCATED_ARG_UPCALL_CS:
       return new be_visitor_operation_argument (new_ctx);
 
     case TAO_CodeGen::TAO_OPERATION_ARG_DEMARSHAL_SS:
     case TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS:
       return new be_compiled_visitor_operation_argument_marshal (new_ctx);
 
-    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_MARSHAL_CS:
-    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DEMARSHAL_CS:
-      return new be_compiled_visitor_operation_ami_handler_argument_marshal (new_ctx);
-
-    case TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS:
-    case TAO_CodeGen::TAO_AMI_OPERATION_ARG_INVOKE_CS:
-    // @@ Michael case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_INVOKE_CS:
-      return new be_compiled_visitor_operation_argument_invoke (new_ctx);
-
     case TAO_CodeGen::TAO_OPERATION_TIE_SH:
       return new be_visitor_operation_tie_sh (new_ctx);
 
     case TAO_CodeGen::TAO_OPERATION_TIE_SI:
       return new be_visitor_operation_tie_si (new_ctx);
 
+    case TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS:
+    case TAO_CodeGen::TAO_AMI_OPERATION_ARG_INVOKE_CS:
+      return new be_compiled_visitor_operation_argument_invoke (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_CH:
     case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_OTHERS:
       return new be_visitor_args_arglist (new_ctx);
@@ -814,7 +831,6 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
 
     case TAO_CodeGen::TAO_ARGUMENT_INVOKE_CS:
     case TAO_CodeGen::TAO_AMI_ARGUMENT_INVOKE_CS:
-    // @@ Michael case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_INVOKE_CS:
       return new be_visitor_args_compiled_marshal_cs (new_ctx);
 
     case TAO_CodeGen::TAO_ARGUMENT_POST_INVOKE_CS:
@@ -823,9 +839,6 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
       return new be_compiled_visitor_args_vardecl_ss (new_ctx);
 
-    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_VARDECL_CS:
-      return new be_compiled_visitor_args_ami_handler_vardecl_cs (new_ctx);
-
     case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
       // this is a NO-OP
       return new be_visitor_decl (new_ctx);
@@ -834,9 +847,6 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS:
       return new be_visitor_args_upcall_ss (new_ctx);
 
-    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_UPCALL_CS:
-      return new be_visitor_args_ami_handler_upcall_cs (new_ctx);
-
     case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
       // this is a NO-OP
       return new be_visitor_decl (new_ctx);
@@ -845,10 +855,6 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_ARGUMENT_MARSHAL_SS:
       return new be_visitor_args_compiled_marshal_ss (new_ctx);
 
-    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_DEMARSHAL_CS:
-    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_MARSHAL_CS:
-      return new be_visitor_args_ami_handler_compiled_marshal_cs (new_ctx);
-
     case TAO_CodeGen::TAO_ARGUMENT_POST_MARSHAL_SS:
       // this is a NO-OP
       return new be_visitor_decl (new_ctx);
@@ -872,6 +878,17 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST_CS:
       return new be_visitor_args_ami_arglist (new_ctx);
 
+    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_VARDECL_CS:
+      return new be_compiled_visitor_args_ami_handler_vardecl_cs (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_UPCALL_CS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_COLLOCATED_UPCALL_CS:
+      return new be_visitor_args_ami_handler_upcall_cs (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_DEMARSHAL_CS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_MARSHAL_CS:
+      return new be_visitor_args_ami_handler_compiled_marshal_cs (new_ctx);
+
     case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_OPERATION_CH:
     case TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CH:
       return new be_visitor_operation_ami_handler_operation_ch (new_ctx);
@@ -879,6 +896,9 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CS:
       return new be_compiled_visitor_operation_ami_handler_operation_cs (new_ctx);
 
+    case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_OPERATION_CS:
+      return new be_compiled_visitor_operation_ami_handler_servant_operation_cs (new_ctx);
+
     case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CH:
     case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CS:
       return new be_visitor_operation_ami_handler_arglist (new_ctx);
@@ -893,6 +913,10 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_AMI_HANDLER_SKELETON_CS:
       return new be_compiled_visitor_operation_ami_handler_skeleton_cs (new_ctx);
 
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_MARSHAL_CS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DEMARSHAL_CS:
+      return new be_compiled_visitor_operation_ami_handler_argument_marshal (new_ctx);
+
     default:
       // cannot handle it; delegate it to the common visitor factory
       delete new_ctx;
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp
index 78aa5dbb7e0..21272a2a32b 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp
@@ -87,7 +87,7 @@ be_visitor_field_cdr_op_ci::visit_array (be_array *node)
     }
 
   // for anonymous arrays, the type name has a _ prepended. We compute
-  // the fullname with or without the underscore and use it later on.
+  // the full_name with or without the underscore and use it later on.
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   // save the node's local name and full name in a buffer for quick
@@ -105,18 +105,18 @@ be_visitor_field_cdr_op_ci::visit_array (be_array *node)
         {
           be_decl *parent =
             be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
+          ACE_OS::sprintf (fname, "_%s", node->full_name ());
         }
     }
   else
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
+      ACE_OS::sprintf (fname, "%s", node->full_name ());
     }
 
   // check what is the code generation substate. Are we generating
@@ -766,7 +766,7 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node)
     }
 
   // for anonymous arrays, the type name has a _ prepended. We compute
-  // the fullname with or without the underscore and use it later on.
+  // the full_name with or without the underscore and use it later on.
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
@@ -781,18 +781,18 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
+          ACE_OS::sprintf (fname, "_%s", node->full_name ());
         }
     }
   else
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
+      ACE_OS::sprintf (fname, "%s", node->full_name ());
     }
 
   // check what is the code generation substate. Are we generating code for
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 1ac9ed473ea..836a757e6e2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -45,10 +45,13 @@
 #include "be_visitor_interface/cdr_op_cs.cpp"
 #include "be_visitor_interface/ami_handler_fwd_ch.cpp"
 #include "be_visitor_interface/ami_handler_fwd_ci.cpp"
-#include "be_visitor_interface/ami_handler_servant_ch.cpp"
-#include "be_visitor_interface/ami_handler_servant_cs.cpp"
 #include "be_visitor_interface/ami_handler_stub_ch.cpp"
 #include "be_visitor_interface/ami_handler_stub_cs.cpp"
+
+#if 0 /* We are using normal servant code */
 #include "be_visitor_interface/collocated_ami_handler_ch.cpp"
+#include "be_visitor_interface/ami_handler_servant_ch.cpp"
+#include "be_visitor_interface/ami_handler_servant_cs.cpp"
+#endif /* 0 */
 
 ACE_RCSID(be, be_visitor_interface, "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp
index 8a47537176f..678314b2855 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp
@@ -12,11 +12,11 @@
 //
 // = DESCRIPTION
 //    Visitor generating AMI Reply Handler code for Interfaces in the
-//    client header.
+//    client header. 
 //
 // = AUTHOR
 //    Aniruddha Gokhale and Alexander Babu Arulanthu
-//    <alex@cs.wustl.edu>
+//    <alex@cs.wustl.edu>  
 //
 // ============================================================================
 
@@ -54,13 +54,13 @@ be_visitor_interface_ami_handler_ch::visit_interface (be_interface *node)
   ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
 
   os = this->ctx_->stream ();
-
+  
   // Generate the skeleton class name.
 
   // Start with whatever indentation level we are at.
   os->indent ();
 
-  // We shall have a POA_ prefix only if we are at the topmost level.
+  // We shall have a POA_ prefix only if we are at the topmost level. 
   if (!node->is_nested ())
     {
       // we are outermost
@@ -82,8 +82,8 @@ be_visitor_interface_ami_handler_ch::visit_interface (be_interface *node)
       << "_ptr;" << be_nl;
 
   // Now generate the class definition.
-  // This class will inherit from the Messaging::ReplyHandler class.
-  *os << "class " << idl_global->stub_export_macro ()
+  // This class will inherit from the Messaging::ReplyHandler class. 
+  *os << "class " << idl_global->export_macro ()
       << " " << namebuf
       << " : public POA_Messaging::ReplyHandler"
       << be_nl;
@@ -95,20 +95,20 @@ be_visitor_interface_ami_handler_ch::visit_interface (be_interface *node)
   // Default constructor.
   *os << "protected:" << be_idt_nl
       << namebuf << " (void);\n" << be_uidt_nl;
-
-  // Public portion starts.
+  
+  // Public portion starts. 
   *os << "public:" << be_idt_nl
-
+    
     // Copy constructor.
       << namebuf << " (const " << namebuf << "& rhs);" << be_nl
-
+    
     // Destructor.
       << "virtual ~" << namebuf << " (void);\n\n"
-
+      
       << be_nl;
-
+    
     // Methods.
-
+  
   // _is_a.
   *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
       << "const char* logical_type_id," << be_nl
@@ -116,12 +116,12 @@ be_visitor_interface_ami_handler_ch::visit_interface (be_interface *node)
       << "TAO_default_environment ()"
       << be_uidt << be_uidt_nl
       << ");\n" << be_uidt_nl;
-
+  
   // _down_cast.
   *os << "virtual void* _downcast (" << be_idt << be_idt_nl
       << "const char* logical_type_id" << be_uidt_nl
       << ");\n" << be_uidt_nl;
-
+  
   // add a skeleton for our _is_a method
   *os << "static void _is_a_skel (" << be_idt << be_idt_nl
       << "CORBA::ServerRequest &req," << be_nl
@@ -193,7 +193,7 @@ be_visitor_interface_ami_handler_ch::visit_interface (be_interface *node)
 #if 0
   //
   // @@ Alex: Do this:
-  //
+  // 
   // Generate the collocated class
   be_visitor_context ctx (*this->ctx_);
   ctx.state (TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_cs.cpp
index 62eae6c6da5..dd167168c8c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_cs.cpp
@@ -67,9 +67,9 @@ be_visitor_ ami_handler_cs::visit_interface (be_interface *node)
   be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
   
   if (parent != 0 &&
-      parent->fullname () != 0 &&
-      ACE_OS::strlen (parent->fullname ()))
-    scope_len = ACE_OS::strlen (parent->fullname ()) + ACE_OS::strlen ("::");
+      parent->full_name () != 0 &&
+      ACE_OS::strlen (parent->full_name ()))
+    scope_len = ACE_OS::strlen (parent->full_name ()) + ACE_OS::strlen ("::");
   
   ACE_NEW_RETURN (full_name,
                   char [scope_len +
@@ -80,11 +80,11 @@ be_visitor_ ami_handler_cs::visit_interface (be_interface *node)
                   -1);
   
   if (parent != 0 &&
-      parent->fullname () != 0 &&
-      ACE_OS::strlen (parent->fullname ()))
+      parent->full_name () != 0 &&
+      ACE_OS::strlen (parent->full_name ()))
     ACE_OS::sprintf (full_name,
                      "%s::AMI_%s_Handler",
-                     parent->fullname (),
+                     parent->full_name (),
                      node->local_name ()->get_string ());
   else
     ACE_OS::sprintf (full_name,
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp
index edd92eb656f..30ae6b541b2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp
@@ -57,32 +57,15 @@ be_visitor_interface_ami_handler_fwd_ch::visit_interface (be_interface *node)
       os->indent ();
 
       // Generate forward declaration class.
-      *os << "class "
-          << "AMI_" << node->local_name () << "_Handler" << ";"
+      *os << "class " << node->local_name ()  << ";"
           << be_nl;
       
-      // Create a string "AMI_<interface name>_Handler". We can use
-      // this for defining all _Var, _out,etc.
-      char *interface_name = 0;
-      ACE_NEW_RETURN (interface_name,
-                      char [ACE_OS::strlen ("AMI_") +
-                           ACE_OS::strlen (node->flatname ()) + 
-                           ACE_OS::strlen ("_Handler") +
-                           // end of string
-                           1],
-                      0);
-      ACE_OS::sprintf (interface_name,
-                       "AMI_%s_Handler",
-                       node->flatname ());
-
       // Generate the ifdefined macro for the _ptr type.
-      os->gen_ifdef_macro (interface_name, "_ptr");
+      os->gen_ifdef_macro (node->flat_name (), "_ptr");
 
       // Generate the _ptr declaration
-      *os << "typedef "
-          << "AMI_" << node->local_name () << "_Handler"
-          << " *"
-          << "AMI_" << node->local_name () << "_Handler" << "_ptr;"
+      *os << "typedef " << node->local_name () 
+          << " *" <<  node->local_name () << "_ptr;"
           << be_nl;
 
       // Generate the endif.
@@ -91,10 +74,10 @@ be_visitor_interface_ami_handler_fwd_ch::visit_interface (be_interface *node)
       // Generate the var class.
       
       // Enclose under an ifdef macro
-      os->gen_ifdef_macro (interface_name, "_var");
+      os->gen_ifdef_macro (node->local_name (), "_var");
       
       // Generate the _var declaration.
-      if (node->gen_var_defn (interface_name) == -1)
+      if (node->gen_var_defn ((char *) node->local_name ()) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_ami_handler_fwd_ch::"
@@ -108,11 +91,11 @@ be_visitor_interface_ami_handler_fwd_ch::visit_interface (be_interface *node)
       // Generate the our class.
 
       // Enclose under an ifdef macro.
-      os->gen_ifdef_macro (interface_name, "_out");
+      os->gen_ifdef_macro (node->local_name (), "_out");
 
       // Generate the _out declaration - ORBOS/97-05-15 pg 16-20
       // spec. 
-      if (node->gen_out_defn (interface_name) == -1)
+      if (node->gen_out_defn ( (char *) node->local_name ()) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_ami_handler_fwd_ch::"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp
index d4f94f6198a..21402995ebb 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp
@@ -57,91 +57,29 @@ be_visitor_interface_ami_handler_fwd_ci::visit_interface (be_interface *node)
   os = this->ctx_->stream ();
   
   // Start from the current indentation level.
-  os->indent ();
-
-  // Create the full name and local name for the AMI_<Interface
-  // name>_Handler interface.
-  char *full_name = 0;
-  char *local_name = 0;
-
-  // Full name. 
-  // If there exists a scope name for this, then generate
-  // "Scope::AMI_<Local Name>_Handler". 
-
-  size_t scope_len = 0;
-
-  be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-  
-  if (parent != 0 &&
-      parent->fullname () != 0 &&
-      ACE_OS::strlen (parent->fullname ()))
-    scope_len = ACE_OS::strlen (parent->fullname ()) + ACE_OS::strlen ("::");
-  
-  ACE_NEW_RETURN (full_name,
-                  char [scope_len +
-                       ACE_OS::strlen ("AMI_") +
-                       ACE_OS::strlen (node->local_name ()->get_string ()) +
-                       ACE_OS::strlen ("_Handler") +
-                       1],
-                  -1);
-  
-  if (parent != 0 &&
-      parent->fullname () != 0 &&
-      ACE_OS::strlen (parent->fullname ()))
-    ACE_OS::sprintf (full_name,
-                     "%s::AMI_%s_Handler",
-                     parent->fullname (),
-                     node->local_name ()->get_string ());
-  else
-    ACE_OS::sprintf (full_name,
-                     "AMI_%s_Handler",
-                     node->local_name ()->get_string ());
-
-  // Local name.
-
-  ACE_NEW_RETURN (local_name,
-                  char [ACE_OS::strlen ("AMI_") +
-                       ACE_OS::strlen (node->local_name ()->get_string ()) +
-                       ACE_OS::strlen ("_Handler") +
-                       1],
-                  -1);
-  
-  ACE_OS::sprintf (local_name,
-                   "AMI_%s_Handler",
-                   node->local_name ()->get_string ());
-
-  // Generate the constructors and destructor.
+  os->indent (); // start from the current indentation level
 
+  // generate the constructors and destructor
   *os << "ACE_INLINE" << be_nl;
-  *os << full_name << "::" << local_name 
-      << " (void) // default constructor" << be_nl;
+  *os << node->full_name () << "::" << node->local_name () <<
+    " (void) // default constructor" << be_nl;
   *os << "{}" << be_nl << be_nl;
 
   *os << "ACE_INLINE" << be_nl;
-  *os << full_name << "::" << local_name
-      << " (TAO_Stub *objref, TAO_ServantBase *_tao_servant, "
-      << "CORBA::Boolean _tao_collocated) // constructor"
-      << be_nl
-      << "  : CORBA_Object (objref, _tao_servant, _tao_collocated)"
-      << be_nl
-      << "{}" << be_nl << be_nl;
+  *os << node->full_name () << "::" << node->local_name () <<
+    " (TAO_Stub *objref, TAO_ServantBase *_tao_servant, "
+      << "CORBA::Boolean _tao_collocated) // constructor" << be_nl;
+  *os << "  : CORBA_Object (objref, _tao_servant, _tao_collocated)" << be_nl;
+  *os << "{}" << be_nl << be_nl;
 
   *os << "ACE_INLINE" << be_nl;
-  *os << full_name << "::~" << local_name
-      << " (void) // destructor" << be_nl
-      << "{}\n\n";
-
-  // _nil method.
-  *os << "ACE_INLINE "
-      << full_name << "_ptr" << be_nl
-      << full_name << "::_nil (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return (" << full_name << "_ptr)0;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Generate the ifdefined macro for  the _var type.
-  os->gen_ifdef_macro (full_name, "_var");
-  if (node->gen_var_impl (full_name, local_name) == -1)
+  *os << node->full_name () << "::~" << node->local_name () <<
+    " (void) // destructor" << be_nl;
+  *os << "{}\n\n";
+
+  // generate the ifdefined macro for  the _var type
+  os->gen_ifdef_macro (node->flat_name (), "_var");
+  if (node->gen_var_impl () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_ci::"
@@ -150,10 +88,9 @@ be_visitor_interface_ami_handler_fwd_ci::visit_interface (be_interface *node)
     }
   os->gen_endif ();
 
-  // Generate the ifdefined macro for  the _out type.
-  os->gen_ifdef_macro (full_name, "_out");
-  if (node->gen_out_impl (full_name,
-                          local_name) == -1)
+  // generate the ifdefined macro for  the _out type
+  os->gen_ifdef_macro (node->flat_name (), "_out");
+  if (node->gen_out_impl () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_ci::"
@@ -162,5 +99,6 @@ be_visitor_interface_ami_handler_fwd_ci::visit_interface (be_interface *node)
     }
   os->gen_endif ();
 
+
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp
index 4b378825cff..35b65481bc6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp
@@ -12,11 +12,11 @@
 //
 // = DESCRIPTION
 //    Visitor generating AMI Reply Handler code for Interfaces in the
-//    client header.
+//    client header. 
 //
 // = AUTHOR
 //    Aniruddha Gokhale and Alexander Babu Arulanthu
-//    <alex@cs.wustl.edu>
+//    <alex@cs.wustl.edu>  
 //
 // ============================================================================
 
@@ -45,6 +45,9 @@ be_visitor_interface_ami_handler_servant_ch::~be_visitor_interface_ami_handler_s
 int
 be_visitor_interface_ami_handler_servant_ch::visit_interface (be_interface *node)
 {
+  be_interface_type_strategy *old_strategy =  
+    node->set_strategy (new be_interface_ami_handler_strategy (node));
+
    // Output stream.
   TAO_OutStream *os;
 
@@ -52,7 +55,7 @@ be_visitor_interface_ami_handler_servant_ch::visit_interface (be_interface *node
   static char namebuf [NAMEBUFSIZE];
 
   // AMI_<Interface_Name>_Handler string.
-  static char ami_handler [NAMEBUFSIZE];
+  static char ami_handler [NAMEBUFSIZE]; 
 
   if (node->srv_hdr_gen () || node->imported ())
     return 0;
@@ -61,32 +64,32 @@ be_visitor_interface_ami_handler_servant_ch::visit_interface (be_interface *node
   ACE_OS::memset (ami_handler, '\0', NAMEBUFSIZE);
 
   os = this->ctx_->stream ();
-
+  
   // Generate the skeleton class name.
 
   // Start with whatever indentation level we are at.
   os->indent ();
 
-  // We shall have a POA_ prefix only if we are at the topmost level.
+  // We shall have a POA_ prefix only if we are at the topmost level. 
   if (!node->is_nested ())
     {
       // we are outermost
       ACE_OS::sprintf (namebuf,
-                       "POA_AMI_%s_Handler",
-                       node->local_name ()->get_string ());
+                       "POA_%s",
+                       node->local_name ());
     }
   else
     {
       ACE_OS::sprintf (namebuf,
-                       "AMI_%s_Handler",
-                       node->local_name ()->get_string ());
+                       "%s",
+                       node->local_name ());
     }
 
   // AMI Handler object's name.
   ACE_OS::sprintf (ami_handler,
-                   "AMI_%s_Handler",
-                   node->local_name ()->get_string ());
-
+                   "%s",
+                   node->local_name ());
+  
   *os << "class " << namebuf << ";" << be_nl;
 
   // generate the _ptr declaration
@@ -94,8 +97,8 @@ be_visitor_interface_ami_handler_servant_ch::visit_interface (be_interface *node
       << "_ptr;" << be_nl;
 
   // Now generate the class definition.
-  // This class will inherit from the Messaging::ReplyHandler class.
-  *os << "class " << idl_global->stub_export_macro ()
+  // This class will inherit from the Messaging::ReplyHandler class. 
+  *os << "class " << idl_global->export_macro ()
       << " " << namebuf
       << " : public virtual POA_Messaging::ReplyHandler"
       << be_nl;
@@ -107,20 +110,20 @@ be_visitor_interface_ami_handler_servant_ch::visit_interface (be_interface *node
   // Default constructor.
   *os << "protected:" << be_idt_nl
       << namebuf << " (void);\n" << be_uidt_nl;
-
-  // Public portion starts.
+  
+  // Public portion starts. 
   *os << "public:" << be_idt_nl
-
+    
     // Copy constructor.
       << namebuf << " (const " << namebuf << "& rhs);" << be_nl
-
+    
     // Destructor.
       << "virtual ~" << namebuf << " (void);\n\n"
-
+      
       << be_nl;
-
+    
     // Methods.
-
+  
   // _is_a.
   *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
       << "const char* logical_type_id," << be_nl
@@ -128,12 +131,12 @@ be_visitor_interface_ami_handler_servant_ch::visit_interface (be_interface *node
       << "TAO_default_environment ()"
       << be_uidt << be_uidt_nl
       << ");\n" << be_uidt_nl;
-
+  
   // _down_cast.
   *os << "virtual void* _downcast (" << be_idt << be_idt_nl
       << "const char* logical_type_id" << be_uidt_nl
       << ");\n" << be_uidt_nl;
-
+  
   // add a skeleton for our _is_a method
   *os << "static void _is_a_skel (" << be_idt << be_idt_nl
       << "CORBA::ServerRequest &req," << be_nl
@@ -164,7 +167,7 @@ be_visitor_interface_ami_handler_servant_ch::visit_interface (be_interface *node
       << ");\n" << be_uidt_nl;
 
   // Print out the _this() method.
-  *os << ami_handler << " *_this (" << be_idt << be_idt_nl
+  *os << node->local_name () << " *_this (" << be_idt << be_idt_nl
       << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
       << "TAO_default_environment ()"
       << be_uidt << be_uidt_nl
@@ -202,20 +205,42 @@ be_visitor_interface_ami_handler_servant_ch::visit_interface (be_interface *node
 
   *os << be_uidt_nl << "};\n\n";
 
-  // Generate the collocated class
   be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_CH);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
+  be_visitor *visitor = 0;
+
+  // generate the collocated class
+  if (idl_global->gen_thru_poa_collocation ())
     {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_ami_handler_servant_ch::"
-                         "visit_interface - "
-                         "codegen for collocated class failed\n"),
-                        -1);
+      ctx.state (TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_ami_handler_servant_ch::"
+                             "visit_interface - "
+                             "codegen for thru_poa_collocated class failed\n"),
+                            -1);
+        }
     }
 
+  if (idl_global->gen_direct_collocation ())
+    {
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_ami_handler_servant_ch::"
+                             "visit_interface - "
+                             "codegen for direct_collocated class failed\n"),
+                            -1);
+        }
+    }
+
+
 #if 0
   // @@ Do this (Alex).
   // generate the TIE class.
@@ -239,5 +264,7 @@ be_visitor_interface_ami_handler_servant_ch::visit_interface (be_interface *node
   ctx.stream (tao_cg->server_template_header ());
 #endif /* 0 */
 
+  delete node->set_strategy (old_strategy);
+
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp
index 6c3be5f1597..e0e82be331a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp
@@ -12,6 +12,7 @@
 //
 // = DESCRIPTION
 //    Visitor generating code for Interfaces in the server skeletons file.
+//  !!!!!!!!!!!!!!! NOT USED ANY MORE !!!!!!!!!!!!!!!!!!!!
 //
 // = AUTHOR
 //    Aniruddha Gokhale
@@ -43,18 +44,18 @@ be_visitor_interface_ami_handler_servant_cs::~be_visitor_interface_ami_handler_s
 int
 be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node)
 {
-  TAO_OutStream *os; // output stream
+  be_interface_type_strategy *old_strategy =  
+    node->set_strategy (new be_interface_ami_handler_strategy (node));
+
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
 
   if (node->srv_skel_gen () || node->imported ())
     return 0;
 
-  os = this->ctx_->stream ();
-
   // generate the skeleton class name
 
   os->indent (); // start with whatever indentation level we are at
 
-  /* @@ Michael
   if (node->gen_operation_table () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -64,25 +65,23 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
                         -1);
     }
 
-  */
   // constructor
   *os << "// skeleton constructor" << be_nl;
   // find if we are at the top scope or inside some module
   if (!node->is_nested ())
     {
       // we are outermost. So the POA_ prefix is prepended to our name
-      *os << node->ami_handler_full_skel_name () << "::POA_" << node->ami_handler_local_name () <<
+      *os << node->full_skel_name () << "::POA_" << node->local_name () <<
         " (void)" << be_nl;
     }
   else
     {
       // the POA_ prefix is prepended to our outermost module name
-      *os << node->ami_handler_full_skel_name () << "::" << node->ami_handler_local_name () <<
+      *os << node->full_skel_name () << "::" << node->local_name () <<
         " (void)" << be_nl;
     }
-
   *os << "{" << be_idt_nl
-      << "this->optable_ = &tao_" << node->flatname ()
+      << "this->optable_ = &tao_" << node->flat_name ()
       << "_optable;" << be_uidt_nl
       << "}\n\n";
 
@@ -91,19 +90,18 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
   if (!node->is_nested ())
     {
       // we are outermost. So the POA_ prefix is prepended to our name
-      *os << node->ami_handler_full_skel_name () << "::POA_"
-          << node->ami_handler_local_name () << " ("
-          << "const POA_" << node->ami_handler_local_name () << "& rhs)";
+      *os << node->full_skel_name () << "::POA_"
+          << node->local_name () << " ("
+          << "const POA_" << node->local_name () << "& rhs)";
     }
   else
     {
       // the POA_ prefix is prepended to our outermost module name
-      *os << node->ami_handler_full_skel_name () << "::"
-          << node->ami_handler_local_name () << " (const "
-          << node->ami_handler_local_name () << "& rhs)";
+      *os << node->full_skel_name () << "::"
+          << node->local_name () << " (const "
+          << node->local_name () << "& rhs)";
     }
-  *os << be_idt_nl
-      << ": ";
+  *os << be_idt_nl << ": ";
   if (node->traverse_inheritance_graph
       (be_interface::copy_ctor_helper, os) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -111,20 +109,18 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
                        " copy ctor generation failed\n"), -1);
   *os << "  TAO_ServantBase (rhs)" << be_uidt_nl
       << "{}\n" << be_nl;
-
   *os << "// skeleton destructor" << be_nl;
-
   if (!node->is_nested ())
     {
       // we are outermost. So the POA_ prefix is prepended to our name
-      *os << node->ami_handler_full_skel_name () << "::~POA_" << node->ami_handler_local_name () <<
-        " (void)" << be_nl;
+      *os << node->full_skel_name () << "::~POA_" << node->local_name () 
+          << " (void)" << be_nl;
     }
   else
     {
       // the POA_ prefix is prepended to our outermost module name
-      *os << node->ami_handler_full_skel_name () << "::~" << node->ami_handler_local_name () <<
-        " (void)" << be_nl;
+      *os << node->full_skel_name () << "::~" << node->local_name () 
+          << " (void)" << be_nl;
     }
   *os << "{\n";
   *os << "}\n\n";
@@ -145,7 +141,7 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
 
   // generate code for the _is_a skeleton
   os->indent ();
-  *os << "void " << node->ami_handler_full_skel_name ()
+  *os << "void " << node->full_skel_name ()
       << "::_is_a_skel (" << be_idt << be_idt_nl
       << "CORBA::ServerRequest &_tao_server_request, " << be_nl
       << "void * _tao_object_reference," << be_nl
@@ -154,8 +150,8 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "TAO_InputCDR &_tao_in = _tao_server_request.incoming ();" << be_nl;
-  *os << node->ami_handler_full_skel_name () << " *_tao_impl = ("
-      << node->ami_handler_full_skel_name () << " *) _tao_object_reference;" << be_nl;
+  *os << node->full_skel_name () << " *_tao_impl = ("
+      << node->full_skel_name () << " *) _tao_object_reference;" << be_nl;
   *os << "CORBA::Boolean _tao_retval = 0;" << be_nl;
   *os << "CORBA::String_var value;" << be_nl;
   *os << "if (!((_tao_in >> value.out ())))" << be_idt_nl;
@@ -172,7 +168,7 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
 
   // generate code for the _non_existent skeleton
   os->indent ();
-  *os << "void " << node->ami_handler_full_skel_name ()
+  *os << "void " << node->full_skel_name ()
       << "::_non_existent_skel (" << be_idt << be_idt_nl
       << "CORBA::ServerRequest &_tao_server_request, " << be_nl
       << "void * _tao_object_reference," << be_nl
@@ -180,8 +176,8 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
       << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
-  *os << node->ami_handler_full_skel_name () << " *_tao_impl = ("
-      << node->ami_handler_full_skel_name () << " *) _tao_object_reference;" << be_nl;
+  *os << node->full_skel_name () << " *_tao_impl = ("
+      << node->full_skel_name () << " *) _tao_object_reference;" << be_nl;
   *os << "CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);" << be_nl;
   *os << "ACE_CHECK;" << be_nl << be_nl;
   *os << "_tao_server_request.init_reply (ACE_TRY_ENV);" << be_nl;
@@ -193,7 +189,7 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
 
 
   os->indent ();
-  *os << "CORBA::Boolean " << node->ami_handler_full_skel_name ()
+  *os << "CORBA::Boolean " << node->full_skel_name ()
       << "::_is_a (" << be_idt << be_idt_nl
       << "const char* value," << be_nl
       << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
@@ -208,7 +204,6 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
                          "traversal of inhertance graph failed\n"),
                         -1);
     }
-
   os->indent ();
   *os << "(!ACE_OS::strcmp ((char *)value, "
       << "CORBA::_tc_Object->id (ACE_TRY_ENV))))"
@@ -217,14 +212,14 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
       << "return 0;" << be_uidt << be_uidt << be_uidt_nl
       << "}\n\n";
 
+
   // the downcast method.
   os->indent ();
-  *os << "void* " << node->ami_handler_full_skel_name ()
+  *os << "void* " << node->full_skel_name ()
       << "::_downcast (" << be_idt << be_idt_nl
       << "const char* logical_type_id" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
-
   if (node->traverse_inheritance_graph (be_interface::downcast_helper, os) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -233,19 +228,17 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
                          "traversal of inhertance graph failed\n"),
                         -1);
     }
-
   *os << "if (ACE_OS::strcmp (logical_type_id, "
       << "\"IDL:omg.org/CORBA/Object:1.0\") == 0)" << be_idt_nl
       << "return ACE_static_cast(PortableServer::Servant, this);"
       << be_uidt_nl;
-
   *os << "return 0;" << be_uidt_nl
       << "}\n\n";
 
 
   // now the dispatch method
   os->indent ();
-  *os << "void " << node->ami_handler_full_skel_name () <<
+  *os << "void " << node->full_skel_name () <<
     "::_dispatch (CORBA::ServerRequest &req, " <<
     "void *context, CORBA::Environment &ACE_TRY_ENV)" << be_nl;
   *os << "{\n";
@@ -265,83 +258,113 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node
   *os << "else" << be_idt_nl;
   *os << "skel (req, this, context, ACE_TRY_ENV);" << be_uidt << be_uidt_nl;
   *os << "}\n\n";
-
   os->indent ();
-  *os << "const char* " << node->ami_handler_full_skel_name ()
+  *os << "const char* " << node->full_skel_name ()
       << "::_interface_repository_id (void) const"
       << be_nl;
   *os << "{\n";
   os->incr_indent ();
   *os << "return \"" << node->repoID () << "\";\n";
   os->decr_indent ();
-  *os << "}\n\n";
-
-  *os << "\n";
+  *os << "}\n\n\n";
 
   // the _this () operation
-  *os << node->name () << "*" << be_nl
-      << node->ami_handler_full_skel_name ()
+
+  *os << node->full_name () << "*" << be_nl
+      << node->full_skel_name ()
       << "::_this (CORBA_Environment &ACE_TRY_ENV)" << be_nl
       << "{" << be_idt_nl
       << "TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);" << be_nl
-      << "ACE_CHECK_RETURN (0);" << be_nl
-    //      << "if (ACE_TRY_ENV.exception () != 0)" << be_idt_nl
-    //      << "return 0;" << be_uidt_nl
-    
-    // @@ Michael: We need to check this value being passed. I am
-    //    passing 1 right now. (Alex).
-      << "return new " << node->full_coll_name (1)
-      << " (this, stub);" << be_uidt_nl;
-
-  *os << "}\n\n";
+      << "ACE_CHECK_RETURN (0);" << be_nl 
+      << "return new " ;
+  if (idl_global->gen_direct_collocation ())
+     *os << node->full_coll_name (be_interface::DIRECT);
+  else if (idl_global->gen_thru_poa_collocation ())
+     *os << node->full_coll_name (be_interface::THRU_POA);
+  *os << " (this, stub);" << be_uidt_nl
+      << "}\n\n";
 
   // the _create_collocated_objref method
   *os << "void*" << be_nl
-      << node->ami_handler_full_skel_name ()
+      << node->full_skel_name ()
       << "::_create_collocated_objref (const char* repository_id, "
       << "CORBA::ULong type, TAO_Stub *stub)" << be_nl
       << "{" << be_idt_nl
       << "if (!ACE_OS::strcmp (\"" << node->repoID ()
       << "\", repository_id))" << be_idt_nl
       << "return ACE_static_cast (" << be_idt << be_idt_nl
-      << node->name () << "_ptr," << be_nl
+      // @@ Michael: I changed the following line from node->name 
+      // to "node->local_name". This might be wrong, but right 
+      // now I think it is right ..
+      << node->local_name () << "_ptr," << be_nl
+      << "new ";
     
-    // @@ Michael: We need to check this value being passed. I am
-    //    passing 1 right now. (Alex).  
-      << "new " << node->full_coll_name (1)
-      << " (this, stub)" << be_uidt_nl
+  if (idl_global->gen_direct_collocation ())
+     *os << node->full_coll_name (be_interface::DIRECT);
+  else if (idl_global->gen_thru_poa_collocation ())
+     *os << node->full_coll_name (be_interface::THRU_POA);
+
+  *os << " (this, stub)" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  // @@ Michael
-  /*
+
+
   // generate the collocated class impl
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
+  if (idl_global->gen_thru_poa_collocation ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_ami_handler_servant_cs::"
-                         "visit_interface - "
-                         "Bad visitor for collocated class\n"),
-                        -1);
+      be_visitor_context ctx (*this->ctx_);
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_THRU_POA_COLLOCATED_CS);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface::"
+                             "ami_handler_servant_cs- "
+                             "Bad visitor for thru_poa collocated class\n"),
+                            -1);
+        }
+
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface::"
+                             "ami_handler_servant_cs - "
+                             "codegen for thru_poa collocated class failed\n"),
+                            -1);
+        }
+      delete visitor;
     }
 
-  if (node->accept (visitor) == -1)
+  if (idl_global->gen_direct_collocation ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_ami_handler_servant_cs::"
-                         "visit_interface - "
-                         "codegen for collocated class failed\n"),
-                        -1);
+      be_visitor_context ctx (*this->ctx_);
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_DIRECT_COLLOCATED_CS);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface::"
+                             "ami_handler_servant_cs - "
+                             "Bad visitor for direct collocated class\n"),
+                            -1);
+        }
+
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface::"
+                             "ami_handler_servant_cs - "
+                             "codegen for direct collocated class failed\n"),
+                            -1);
+        }
+      delete visitor;
     }
-  delete visitor;
 
   *os << "\n\n";
 
-  */
+  delete node->set_strategy (old_strategy);
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp
index f9e6bb9cc80..d399206d20f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp
@@ -16,13 +16,13 @@
 //
 // = AUTHOR
 //    Aniruddha Gokhale and Alexander Babu Arulanthu
-//    <alex@cs.wustl.edu>
+//    <alex@cs.wustl.edu>  
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_interface.h"
 
@@ -50,83 +50,61 @@ be_visitor_interface_ami_handler_stub_ch::visit_interface (be_interface *node)
     {
       // Grab the stream.
       os = this->ctx_->stream ();
-
+      
       // Ifdef guard.
-
-      // Generate AMI_...name..._Handler string.
-      char *ifdef_string = 0;
-      ACE_NEW_RETURN (ifdef_string,
-                      char [ACE_OS::strlen ("AMI_") +
-                           ACE_OS::strlen (node->flatname ()) +
-                           ACE_OS::strlen ("_Handler") +
-                           // end of string
-                           1],
-                      0);
-      ACE_OS::sprintf (ifdef_string,
-                       "AMI_%s_Handler",
-                       node->flatname ());
-
-      os->gen_ifdef_macro (ifdef_string);
-
-      // Prepare the local name for the class.
-      char *local_name = 0;
-      ACE_NEW_RETURN (local_name,
-                      char [ACE_OS::strlen ("AMI_") +
-                           ACE_OS::strlen (node->local_name ()->get_string ()) +
-                           ACE_OS::strlen ("_Handler") +
-                           // end of string
-                           1],
-                      0);
-      ACE_OS::sprintf (local_name,
-                       "AMI_%s_Handler",
-                       node->local_name ()->get_string ());
+      
+      os->gen_ifdef_macro (node->flat_name ());
 
       // Now generate the class definition.
-
+      
       os->indent ();
 
-      *os << "class " << idl_global->stub_export_macro () << " "
-          << local_name;
-
+      *os << "class " << idl_global->export_macro () << " "
+          << node->local_name ();
+      
       // Node interface inherits from the Messaging::ReplyHandler
-      // interface.
-      *os << " : public virtual Messaging::ReplyHandler"  << be_nl;
-
+      // interface. 
+      *os << " : public virtual Messaging::ReplyHandler"  << be_nl; 
+      
       // Generate the body.
-
+  
       *os << "{" << be_nl
           << "public:" << be_nl
-
+    
         // generate the _ptr_type and _var_type typedefs
         // but we must protect against certain versions of g++
-          << "#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)"
+          << "#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8"
           << be_idt_nl
-          << "typedef " << local_name << "_ptr _ptr_type;" << be_nl
-          << "typedef " << local_name << "_var _var_type;" << be_uidt_nl
-          << "#endif /* ! __GNUC__ || g++ >= 2.8 */\n" << be_idt_nl
-
+          << "typedef " << node->local_name () << "_ptr _ptr_type;" << be_nl
+          << "typedef " << node->local_name () << "_var _var_type;" << be_uidt_nl
+          << "#endif /* __GNUC__ */\n" << be_idt_nl
+    
         // generate the static _duplicate, _narrow, and _nil operations
           << "// the static operations" << be_nl
-          << "static " << local_name << "_ptr " << "_duplicate ("
-          << local_name << "_ptr obj);" << be_nl
-          << "static " << local_name << "_ptr "
+          << "static " << node->local_name () << "_ptr " << "_duplicate ("
+          << node->local_name () << "_ptr obj);" << be_nl
+          << "static " << node->local_name () << "_ptr "
           << "_narrow (" << be_idt << be_idt_nl
           << "CORBA::Object_ptr obj," << be_nl
           << "CORBA::Environment &env = " << be_idt_nl
           << "TAO_default_environment ()"
           << be_uidt << be_uidt_nl
           << ");" << be_uidt_nl
-          << "static " << local_name << "_ptr "
+          << "static " << node->local_name () << "_ptr "
           << "_unchecked_narrow (" << be_idt << be_idt_nl
           << "CORBA::Object_ptr obj," << be_nl
           << "CORBA::Environment &env = " << be_idt_nl
           << "TAO_default_environment ()"
           << be_uidt << be_uidt_nl
           << ");" << be_uidt_nl
-          << "static " << local_name << "_ptr " << "_nil (void);\n\n";
+          << "static " << node->local_name ()
+          << "_ptr _nil (void)" << be_nl
+          << "{" << be_idt_nl
+          << "return (" << node->local_name () << "_ptr)0;" << be_uidt_nl
+          << "}\n\n";
 
       // Visit the scope to generate the stubs for the call back
-      // methods.
+      // methods.   
       if (this->visit_scope (node) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -136,7 +114,7 @@ be_visitor_interface_ami_handler_stub_ch::visit_interface (be_interface *node)
                             -1);
         }
 
-
+      
       // the _is_a method
       os->indent ();
       *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
@@ -147,30 +125,30 @@ be_visitor_interface_ami_handler_stub_ch::visit_interface (be_interface *node)
           << ");" << be_uidt_nl
           << "virtual const char* "
           << "_interface_repository_id (void) const;\n" << be_uidt_nl;
-
+  
       // generate the "protected" constructor so that users cannot instantiate
       // us
       *os << "protected:" << be_idt_nl
-          << local_name << " (void);" << be_nl
-          << local_name
+          << node->local_name () << " (void);" << be_nl
+          << node->local_name ()
           << " (TAO_Stub *objref, " << be_idt << be_idt_nl
           << "TAO_ServantBase *_tao_servant = 0, " << be_nl
           << "CORBA::Boolean _tao_collocated = 0" << be_uidt_nl
           << ");" << be_uidt_nl
-          << "virtual ~" << local_name << " (void);" << be_uidt_nl;
-
+          << "virtual ~" << node->local_name () << " (void);" << be_uidt_nl;
+      
       // private copy constructor and assignment operator. These are not
       // allowed, hence they are private.
       *os << "private:\n";
       os->incr_indent ();
-      *os << local_name << " (const " << local_name << " &);"
+      *os << node->local_name () << " (const " << node->local_name () << " &);"
           << be_nl
-          << "void operator= (const " << local_name << " &);\n";
-
+          << "void operator= (const " << node->local_name () << " &);\n";
+  
       os->decr_indent ();
       *os << "};\n\n";
       os->gen_endif ();
-
+  
       // by using a visitor to declare and define the TypeCode, we have the
       // added advantage to conditionally not generate any code. This will be
       // based on the command line options. This is still TO-DO
@@ -186,13 +164,6 @@ be_visitor_interface_ami_handler_stub_ch::visit_interface (be_interface *node)
                              "TypeCode declaration failed\n"),
                             -1);
         }
-
-
-      // Delete the heap allocated vars.
-      delete ifdef_string;
-      ifdef_string = 0;
-      delete local_name;
-      local_name = 0;
     }
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
index e75034bd185..d0918b18262 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
@@ -43,6 +43,9 @@ be_visitor_interface_ami_handler_stub_cs::~be_visitor_interface_ami_handler_stub
 int
 be_visitor_interface_ami_handler_stub_cs::visit_interface (be_interface *node)
 {
+  be_interface_type_strategy *old_strategy =  
+    node->set_strategy (new be_interface_ami_handler_strategy (node));
+
   // output stream.
   TAO_OutStream *os;
 
@@ -67,29 +70,27 @@ be_visitor_interface_ami_handler_stub_cs::visit_interface (be_interface *node)
   be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
   
   if (parent != 0 &&
-      parent->fullname () != 0 &&
-      ACE_OS::strlen (parent->fullname ()))
-    scope_len = ACE_OS::strlen (parent->fullname ()) + ACE_OS::strlen ("::");
+      parent->full_name () != 0 &&
+      ACE_OS::strlen (parent->full_name ()))
+    scope_len = ACE_OS::strlen (parent->full_name ()) + ACE_OS::strlen ("::");
   
   ACE_NEW_RETURN (full_name,
                   char [scope_len +
-                       ACE_OS::strlen ("AMI_") +
-                       ACE_OS::strlen (node->local_name ()->get_string ()) +
-                       ACE_OS::strlen ("_Handler") +
+                       ACE_OS::strlen (node->local_name ()) +
                        1],
                   -1);
   
   if (parent != 0 &&
-      parent->fullname () != 0 &&
-      ACE_OS::strlen (parent->fullname ()))
+      parent->full_name () != 0 &&
+      ACE_OS::strlen (parent->full_name ()))
     ACE_OS::sprintf (full_name,
-                     "%s::AMI_%s_Handler",
-                     parent->fullname (),
-                     node->local_name ()->get_string ());
+                     "%s::%s",
+                     parent->full_name (),
+                     node->local_name ());
   else
     ACE_OS::sprintf (full_name,
-                     "AMI_%s_Handler",
-                     node->local_name ()->get_string ());
+                     "%s",
+                     node->local_name ());
 
   // First generate the code for the static methods.
   
@@ -103,7 +104,7 @@ be_visitor_interface_ami_handler_stub_cs::visit_interface (be_interface *node)
       << "if (CORBA::is_nil (obj))" << be_idt_nl
       << "return " << full_name << "::_nil ();" << be_uidt_nl
       << "if (!obj->_is_a (\""
-      << node->compute_repoID ("AMI_", "_Handler") << "\", env))" 
+      << node->repoID () << "\", env))" 
       << be_idt_nl
       << "return " << full_name << "::_nil ();" << be_uidt_nl;
 
@@ -114,48 +115,28 @@ be_visitor_interface_ami_handler_stub_cs::visit_interface (be_interface *node)
   // This may be necessary to work around a GCC compiler bug!
   //  const char *skel_name = node->full_skel_name (); // unused at this time
 
-  // @@ Michael: We need to check this value being passed. I am
-  //    passing 1 right now. (Alex).
-  const char *coll_name = node->full_coll_name (1);
-  assert (coll_name != 0);
-
+  // the following full_name usage was node->name
   // The _unchecked_narrow method
   *os << full_name << "_ptr " << full_name
       << "::_unchecked_narrow (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "CORBA::Environment &" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "ACE_UNUSED_ARG (ACE_TRY_ENV);" << be_nl
       << "if (CORBA::is_nil (obj))" << be_idt_nl
       << "return " << full_name << "::_nil ();" << be_uidt_nl;
 
   *os << "TAO_Stub* stub = obj->_stubobj ();" << be_nl
       << "stub->_incr_refcnt ();" << be_nl;
-  *os << "void* servant = 0;" << be_nl;
-  *os << "if (obj->_is_collocated () "
-      << "&& obj->_servant() != 0)" << be_idt_nl
-      << "servant = obj->_servant()->_downcast (\""
-      << "IDL:omg.org/CORBA/Object:1.0\");" << be_uidt_nl;
-
-  *os << "if (servant != 0)" << be_idt_nl << "{" << be_idt_nl
-    // The collocated object reference factory is not working right (yet)
-      << full_name << "_ptr retv = ACE_reinterpret_cast (" << be_idt << be_idt_nl
-      << full_name << "_ptr," << be_nl
-      << "ACE_reinterpret_cast (" << be_idt << be_idt_nl
-      << "PortableServer::Servant," << be_nl
-      << "servant" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "->_create_collocated_objref (" << be_idt << be_idt_nl
-      << "\"" << node->compute_repoID ("AMI_", "_Handler") << "\"," << be_nl
-      << "TAO_ORB_Core::ORB_CONTROL," << be_nl
-      << "stub" << be_uidt_nl
-      << ")" << be_uidt << be_uidt_nl
-      << ");" << be_uidt_nl
+
+  *os << "if (obj->_is_collocated () && _TAO_collocation_" << node->flat_name ()
+      << "_Stub_Factory_function_pointer != 0)" << be_idt_nl
+      << "{" << be_idt_nl
+      << node->local_name () << "_ptr retv = _TAO_collocation_"
+      << node->flat_name ()
+      << "_Stub_Factory_function_pointer (obj);" << be_nl
       << "if (retv != 0)" << be_idt_nl
-      << "return retv;" << be_uidt
-    // So we are still using the old way to create collocated objref.
-      << be_uidt_nl
+      << "return retv;" << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl;
 
   *os << "return new " << full_name << "(stub);" << be_uidt_nl
@@ -194,7 +175,7 @@ be_visitor_interface_ami_handler_stub_cs::visit_interface (be_interface *node)
   // Current interface.
   *os << "(!ACE_OS::strcmp ((char *)value, "
       << "\""
-      << node->compute_repoID ("AMI_", "_Handler")
+      << node->repoID ()
       << "\""
       << ")) ||"
       << be_nl;
@@ -223,7 +204,7 @@ be_visitor_interface_ami_handler_stub_cs::visit_interface (be_interface *node)
       << "::_interface_repository_id (void) const"
       << be_nl
       << "{" << be_idt_nl
-      << "return \"" << node->compute_repoID ("AMI_", "_Handler") << "\";" << be_uidt_nl
+      << "return \"" << node->repoID () << "\";" << be_uidt_nl
       << "}\n\n";
 
   // By using a visitor to declare and define the TypeCode, we have the
@@ -246,5 +227,7 @@ be_visitor_interface_ami_handler_stub_cs::visit_interface (be_interface *node)
   delete full_name;
   full_name = 0;
 
+  delete node->set_strategy (old_strategy);
+
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
index 637cea63343..9913c49a288 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
@@ -53,19 +53,36 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
   os->indent ();
 
   // Generate the stub factory function pointer declaration
-  *os << "extern " << idl_global->stub_export_macro () << " " << node->name ()
-      << "_ptr (*_TAO_collocation_" << node->flatname ()
-      << "_Stub_Factory_function_pointer) (" << be_idt << be_idt_nl
+  *os << "extern " << node->full_name () << "_ptr (*_TAO_collocation_"
+      << node->flat_name () << "_Stub_Factory_function_pointer) ("
+      << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj" << be_uidt_nl
       << ");" << be_uidt_nl;
 
+  // @@ Michael: This might not be the right place .. 
+  if (idl_global->ami_call_back () == I_TRUE)
+  {
+    // AMI Handler stuff
+    be_interface_type_strategy *old_strategy =  
+      node->set_strategy (new be_interface_ami_handler_strategy (node));
+
+    // Generate the stub factory function pointer declaration
+    *os << "extern " << node->full_name () << "_ptr (*_TAO_collocation_"
+        << node->flat_name () << "_Stub_Factory_function_pointer) ("
+        << be_idt << be_idt_nl
+        << "CORBA::Object_ptr obj" << be_uidt_nl
+        << ");" << be_uidt_nl;
+
+    delete node->set_strategy (old_strategy);
+  }
+
   // generate the Any <<= and >>= operator declarations
   os->indent ();
   *os << "// Any operators for interface " << node->name () << be_nl;
-  *os << "void " << idl_global->stub_export_macro ()
+  *os << "void " << idl_global->export_macro ()
       << " operator<<= (CORBA::Any &, " << node->name ()
       << "_ptr);" << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>>= (const CORBA::Any &, "
       << node->name () << " *&);\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index f3c758081c7..705f8a9c3a0 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -53,26 +53,45 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   os->indent ();
   // Generate the stub factory function pointer definition.
-  *os << node->name () << "_ptr (*";
+  *os << node->full_name () << "_ptr (*";
 
   *os << "_TAO_collocation_"
-      << node->flatname () << "_Stub_Factory_function_pointer) ("
+      << node->flat_name () << "_Stub_Factory_function_pointer) ("
       << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj" << be_uidt_nl
       << ") = 0;" << be_uidt_nl;
 
+  // @@ Michael: This might not be the right place .. 
+  if (idl_global->ami_call_back () == I_TRUE)
+  {
+    // AMI Handler stuff
+    be_interface_type_strategy *old_strategy =  
+      node->set_strategy (new be_interface_ami_handler_strategy (node));
+
+    os->indent ();
+    // Generate the stub factory function pointer definition.
+    *os << node->full_name () << "_ptr (*";
+
+    *os << "_TAO_collocation_"
+        << node->flat_name () << "_Stub_Factory_function_pointer) ("
+        << be_idt << be_idt_nl
+        << "CORBA::Object_ptr obj" << be_uidt_nl
+        << ") = 0;" << be_uidt_nl;
+
+    delete node->set_strategy (old_strategy);
+  }
 
   // generate the Any <<= and >>= operator declarations
   // Any <<= and >>= operators
   os->indent ();
   *os << "void operator<<= (CORBA::Any &_tao_any, "
-      << node->name () << "_ptr _tao_elem)" << be_nl
+      << node->full_name () << "_ptr _tao_elem)" << be_nl
       << "{" << be_idt_nl
       << "CORBA::Object_ptr *_tao_obj_ptr = 0;" << be_nl
       << "ACE_TRY_NEW_ENV" << be_nl
       << "{" << be_idt_nl
       << "ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);" << be_nl
-      << "*_tao_obj_ptr = " << node->name ()
+      << "*_tao_obj_ptr = " << node->full_name ()
       << "::_duplicate (_tao_elem);" << be_nl
       << "_tao_any.replace (" << node->tc_name () << ", "
       << "_tao_obj_ptr, 1, ACE_TRY_ENV);" << be_nl
@@ -86,12 +105,12 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << "}\n" << be_nl;
 
   *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, "
-      << node->name () << "_ptr &_tao_elem)" << be_nl
+      << node->full_name () << "_ptr &_tao_elem)" << be_nl
       << "{" << be_idt_nl
       << "CORBA::Object_ptr *tmp = 0;" << be_nl
       << "ACE_TRY_NEW_ENV" << be_nl
       << "{" << be_idt_nl
-      << "_tao_elem = " << node->name () << "::_nil ();" << be_nl
+      << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl
       << "if (!type->equal (" << node->tc_name ()
       << ", ACE_TRY_ENV)) return 0; // not equal" << be_nl
@@ -104,7 +123,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << ", &_tao_obj_var.out (), 0, ACE_TRY_ENV)" << be_nl
       << "   == CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_nl
       << "{" << be_idt_nl
-      << "_tao_elem = " << node->name ()
+      << "_tao_elem = " << node->full_name ()
       << "::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl
       << "*tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object"
@@ -127,18 +146,18 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   *os << "#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)" << be_idt_nl
       << "template class TAO_Object_Field_T<"
-      << node->name () << ","
-      << node->name () << "_var>;" << be_uidt_nl
+      << node->full_name () << ","
+      << node->full_name () << "_var>;" << be_uidt_nl
       << "template class TAO_Object_Manager<"
-      << node->name () << ","
-      << node->name () << "_var>;" << be_uidt_nl
+      << node->full_name () << ","
+      << node->full_name () << "_var>;" << be_uidt_nl
       << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl
       << "#  pragma instantiate TAO_Object_Field_T<"
-      << node->name () << ","
-      << node->name () << "_var>" << be_uidt_nl
+      << node->full_name () << ","
+      << node->full_name () << "_var>" << be_uidt_nl
       << "#  pragma instantiate TAO_Object_Manager<"
-      << node->name () << ","
-      << node->name () << "_var>" << be_uidt_nl
+      << node->full_name () << ","
+      << node->full_name () << "_var>" << be_uidt_nl
       << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */\n\n";
 
   // all we have to do is to visit the scope and generate code
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
index b4b4d6817b9..0874e4517d1 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
@@ -51,10 +51,10 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
 
   // generate the CDR << and >> operator declarations
   os->indent ();
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro () << be_nl
+  *os << "CORBA::Boolean " << idl_global->export_macro () << be_nl
       << "operator<< (TAO_OutputCDR &, const " << node->name ()
       << "_ptr );" << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro () << be_nl
+  *os << "CORBA::Boolean " << idl_global->export_macro () << be_nl
       << "operator>> (TAO_InputCDR &, "
       << node->name () << "_ptr &);\n";
 
@@ -74,3 +74,4 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
   node->cli_hdr_cdr_op_gen (1);
   return 0;
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp
index 301472a8a1c..05aa4eb1f6c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp
@@ -25,7 +25,7 @@
 
 #include "be_visitor_interface.h"
 
-ACE_RCSID(be_visitor_interface, collocated_ami_handler_ch, "$Id$")
+ACE_RCSID(be_visitor_interface, collocated_ami_handler_ch, "$Id$") 
 
 
 // ************************************************************
@@ -47,44 +47,19 @@ be_visitor_interface_collocated_ami_handler_ch::visit_interface (be_interface *n
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // Generate AMI_...name..._Handler string.
-  char *ifdef_string = 0;
-  ACE_NEW_RETURN (ifdef_string,
-                  char [ACE_OS::strlen ("AMI_") +
-                       ACE_OS::strlen (node->flatname ()) +
-                       ACE_OS::strlen ("_Handler") +
-                       // end of string
-                       1],
-                  0);
-  ACE_OS::sprintf (ifdef_string,
-                   "AMI_%s_Handler",
-                   node->flatname ());
-
-  os->gen_ifdef_macro (ifdef_string, "_collocated");
-
-  // Prepare the local name for the class.
-  char *local_name = 0;
-  ACE_NEW_RETURN (local_name,
-                  char [ACE_OS::strlen ("AMI_") +
-                       ACE_OS::strlen (node->local_name ()->get_string ()) +
-                       ACE_OS::strlen ("_Handler") +
-                       // end of string
-                       1],
-                  0);
-  ACE_OS::sprintf (local_name,
-                   "AMI_%s_Handler",
-                   node->local_name ()->get_string ());
-
-  // Get the coll names.
-  char *coll_local_name, *coll_full_name;
-  node->compute_coll_names (local_name, coll_local_name, coll_full_name);
-
+  os->gen_ifdef_macro (node->flat_name (), "_collocated");
+  
   // Output the class defn.
   os->indent ();
-  *os << "class " << idl_global->stub_export_macro ()
-      << " " << coll_local_name;
+  *os << "class " << idl_global->export_macro () << " ";
+
+  if (idl_global->gen_direct_collocation ())
+     *os << node->local_coll_name (be_interface::DIRECT);
+  else if (idl_global->gen_thru_poa_collocation ())
+     *os << node->local_coll_name (be_interface::THRU_POA);
+
   os->incr_indent ();
-  *os << " : public virtual " << local_name;
+  *os << " : public virtual " << node->local_name ();
 
   *os << "\n";
   os->decr_indent ();
@@ -92,7 +67,11 @@ be_visitor_interface_collocated_ami_handler_ch::visit_interface (be_interface *n
   *os << "public:\n";
   os->incr_indent ();
 
-  *os << coll_local_name << " (\n";
+ if (idl_global->gen_direct_collocation ())
+     *os << node->local_coll_name (be_interface::DIRECT) << " (\n";
+ else if (idl_global->gen_thru_poa_collocation ())
+     *os << node->local_coll_name (be_interface::THRU_POA) << " (\n";
+
 
   os->incr_indent (0);
   os->incr_indent ();
@@ -105,9 +84,9 @@ be_visitor_interface_collocated_ami_handler_ch::visit_interface (be_interface *n
       *os << "POA_";
     }
 
-  *os << local_name << "_ptr "
+  *os << node->local_name () << "_ptr "
       << " servant," << be_nl;
-
+  
   *os << "TAO_Stub *stub\n";
   os->decr_indent ();
   *os << ");\n";
@@ -121,7 +100,7 @@ be_visitor_interface_collocated_ami_handler_ch::visit_interface (be_interface *n
       << "const CORBA::Char *logical_type_id," << be_nl
       << "CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
-
+  
   // _get_servant method.
 
   if (!node->is_nested ())
@@ -131,7 +110,7 @@ be_visitor_interface_collocated_ami_handler_ch::visit_interface (be_interface *n
       *os << "POA_";
     }
 
-  *os << local_name
+  *os << node->local_name ()
       << "_ptr _get_servant (void) const;" << be_nl << be_nl;
 
   // _non_existent method.
@@ -151,7 +130,7 @@ be_visitor_interface_collocated_ami_handler_ch::visit_interface (be_interface *n
     }
 
   os->decr_indent ();
-
+  
   *os << be_nl << "private:\n";
   os->incr_indent ();
   if (!node->is_nested ())
@@ -160,15 +139,11 @@ be_visitor_interface_collocated_ami_handler_ch::visit_interface (be_interface *n
       // POA_ prefix that goes with it.
       *os << "POA_";
     }
-  *os << local_name << "_ptr servant_;\n";
+  *os << node->local_name () << "_ptr servant_;\n";
   os->decr_indent ();
   *os << "};\n\n";
 
   os->gen_endif ();
 
-  delete ifdef_string;
-  delete local_name;
-  delete coll_local_name;
-  delete coll_full_name;
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
index 6f23f294d9b..aa9bc2ee0c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
@@ -46,11 +46,11 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  os->gen_ifdef_macro (node->flatname (), "_direct_collocated");
+  os->gen_ifdef_macro (node->flat_name (), "_direct_collocated");
 
   // output the class defn
   os->indent ();
-  *os << "class " << idl_global->skel_export_macro ()
+  *os << "class " << idl_global->export_macro ()
       << " " << node->local_coll_name (be_interface::DIRECT);
   os->incr_indent ();
   *os << " : public virtual " << node->name ();
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
index 46e690ae815..153e94e3dd6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
@@ -44,10 +44,11 @@ be_visitor_interface_direct_collocated_ss::~be_visitor_interface_direct_collocat
 
 int be_visitor_interface_direct_collocated_ss::visit_interface (be_interface *node)
 {
-  TAO_OutStream *os = tao_cg->server_skeletons ();
+  TAO_OutStream *os = this->ctx_->stream ();
 
   this->ctx_->node (node);
 
+  os->indent ();
   *os << node->full_coll_name (be_interface::DIRECT) << "::"
       << node->local_coll_name (be_interface::DIRECT) << " (\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
index b9b7d3ba804..f73d03f9417 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -430,23 +430,24 @@ be_visitor_interface::visit_operation (be_operation *node)
     case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS:
       ctx.state (TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SS);
       break;
-      
     case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CH:
       ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_OPERATION_CH);
       break;
-
+    case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CS:
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_OPERATION_CS);
+      break;
     case TAO_CodeGen::TAO_AMI_HANDLER_STUB_CH:
       ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CH);
       break;
-
-    case TAO_CodeGen::TAO_AMI_HANDLER_STUB_CS:
+   case TAO_CodeGen::TAO_AMI_HANDLER_STUB_CS:
       ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CS);
       break;
-
-    case TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_CH:
-      ctx.state (TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_OPERATION_CH);
+    case TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_THRU_POA_COLLOCATED_CS:
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_THRU_POA_COLLOCATED_CS);
+      break;
+    case TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_THRU_POA_COLLOCATED_CH:
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_THRU_POA_COLLOCATED_CH);
       break;
-
     case TAO_CodeGen::TAO_INTERFACE_ANY_OP_CH:
     case TAO_CodeGen::TAO_INTERFACE_ANY_OP_CS:
     case TAO_CodeGen::TAO_INTERFACE_CDR_OP_CH:
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 7c2a402838b..c7b6dfc0e45 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -54,6 +54,9 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
       if (idl_global->ami_call_back () == I_TRUE)
         {
+          be_interface_type_strategy *old_strategy =  
+            node->set_strategy (new be_interface_ami_handler_strategy (node));
+
           // Set the context.
           be_visitor_context ctx (*this->ctx_);
 
@@ -82,6 +85,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                                 -1);
             }
           delete visitor;
+
+          delete node->set_strategy (old_strategy);
         }
 
       // Grab the stream.
@@ -90,7 +95,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // == STEP 1:  generate the class name and class names we inherit ==
 
       // generate the ifdefined macro for  the _ptr type
-      os->gen_ifdef_macro (node->flatname (), "_ptr");
+      os->gen_ifdef_macro (node->flat_name (), "_ptr");
 
 
       // the following two are required to be under the ifdef macro to avoid
@@ -106,7 +111,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       os->gen_endif ();
 
       // generate the ifdefined macro for the var type
-      os->gen_ifdef_macro (node->flatname (), "_var");
+      os->gen_ifdef_macro (node->flat_name (), "_var");
 
       // generate the _var declaration
       if (node->gen_var_defn () == -1)
@@ -119,7 +124,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       os->gen_endif ();
 
       // generate the ifdef macro for the _out class
-      os->gen_ifdef_macro (node->flatname (), "_out");
+      os->gen_ifdef_macro (node->flat_name (), "_out");
 
       // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
       if (node->gen_out_defn () == -1)
@@ -133,10 +138,10 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       os->gen_endif ();
 
       // now the interface definition itself
-      os->gen_ifdef_macro (node->flatname ());
+      os->gen_ifdef_macro (node->flat_name ());
 
       // now generate the class definition
-      *os << "class " << idl_global->stub_export_macro ()
+      *os << "class " << idl_global->export_macro ()
                 << " " << node->local_name ();
 
       if (node->n_inherits () > 0)  // node interface inherits from other
@@ -181,11 +186,11 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
           // generate the _ptr_type and _var_type typedefs
           // but we must protect against certain versions of g++
-          << "#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)"
+          << "#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8"
           << be_idt_nl
           << "typedef " << node->local_name () << "_ptr _ptr_type;" << be_nl
           << "typedef " << node->local_name () << "_var _var_type;" << be_uidt_nl
-          << "#endif /* ! __GNUC__ || g++ >= 2.8 */\n" << be_idt_nl
+          << "#endif /* __GNUC__ */\n" << be_idt_nl
 
           // generate the static _duplicate, _narrow, and _nil operations
           << "// the static operations" << be_nl
@@ -247,14 +252,12 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
       // private copy constructor and assignment operator. These are not
       // allowed, hence they are private.
-      *os << "private:\n";
-      os->incr_indent ();
+      *os << "private:" << be_idt_nl;
       *os << node->local_name () << " (const " << node->local_name () << " &);"
           << be_nl
-          << "void operator= (const " << node->local_name () << " &);\n";
-
-      os->decr_indent ();
+          << "void operator= (const " << node->local_name () << " &);" << be_uidt_nl;
       *os << "};\n\n";
+
       os->gen_endif ();
 
       // by using a visitor to declare and define the TypeCode, we have the
@@ -272,15 +275,19 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                              "TypeCode declaration failed\n"
                              ), -1);
         }
-
+      
       // AMI
 
-      // Generate code for the AMI Reply Handler.
+      // Generate code for the AMI Reply Handler. 
 
       if (idl_global->ami_call_back () == I_TRUE)
         {
           // = Generate the default stub code for Handler.
 
+          be_interface_type_strategy *old_strategy =  
+            node->set_strategy (new be_interface_ami_handler_strategy (node));
+
+
           // Set the context.
           be_visitor_context ctx (*this->ctx_);
 
@@ -297,7 +304,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                                  "Bad visitor\n"),
                                 -1);
             }
-
+          
           // Call the visitor on this interface.
           if (node->accept (visitor) == -1)
             {
@@ -309,15 +316,15 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                                 -1);
             }
           delete visitor;
-
+          
           //  = Generate the Servant Skeleton code.
 
           // Set the context.
           ctx = *this->ctx_;
-
+          
           // Set the state.
           ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CH);
-
+          
           // Create the visitor.
           visitor = tao_cg->make_visitor (&ctx);
           if (!visitor)
@@ -328,7 +335,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                                  "Bad visitor\n"),
                                 -1);
             }
-
+          
           // call the visitor on this interface.
           if (node->accept (visitor) == -1)
             {
@@ -340,6 +347,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                                 -1);
             }
           delete visitor;
+
+          delete node->set_strategy (old_strategy);
         }
 
       node->cli_hdr_gen (I_TRUE);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index c3f77bab5fc..2030f023947 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -70,7 +70,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
   *os << "{}\n\n";
 
   // generate the ifdefined macro for  the _var type
-  os->gen_ifdef_macro (node->flatname (), "_var");
+  os->gen_ifdef_macro (node->flat_name (), "_var");
   if (node->gen_var_impl () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -81,7 +81,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
   os->gen_endif ();
 
   // generate the ifdefined macro for  the _out type
-  os->gen_ifdef_macro (node->flatname (), "_out");
+  os->gen_ifdef_macro (node->flat_name (), "_out");
   if (node->gen_out_impl () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -105,6 +105,9 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
 
   if (idl_global->ami_call_back () == I_TRUE)
     {
+       be_interface_type_strategy *old_strategy =  
+         node->set_strategy (new be_interface_ami_handler_strategy (node));
+
       // Set the context.
       be_visitor_context ctx (*this->ctx_);
 
@@ -133,6 +136,8 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
                             -1);
         }
       delete visitor;
+
+      delete node->set_strategy (old_strategy);
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index ba5f7a2ba07..9539f64869a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -55,21 +55,21 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   // first generate the code for the static methods
 
   // The _narrow method
-  *os << node->name () << "_ptr " << node->name ()
+  *os << node->full_name () << "_ptr " << node->full_name ()
       << "::_narrow (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj," << be_nl
       << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "if (CORBA::is_nil (obj))" << be_idt_nl
-      << "return " << node->name () << "::_nil ();" << be_uidt_nl
+      << "return " << node->full_name () << "::_nil ();" << be_uidt_nl
       << "CORBA::Boolean is_a = obj->_is_a (\""
       << node->repoID () << "\", ACE_TRY_ENV);" << be_nl
-      << "ACE_CHECK_RETURN (" << node->name () << "::_nil ());" << be_nl
+      << "ACE_CHECK_RETURN (" << node->full_name () << "::_nil ());" << be_nl
       << "if (is_a == 0)" << be_idt_nl
-      << "return " << node->name () << "::_nil ();" << be_uidt_nl;
+      << "return " << node->full_name () << "::_nil ();" << be_uidt_nl;
 
-  *os << "return " << node->name ()
+  *os << "return " << node->full_name ()
       << "::_unchecked_narrow (obj, ACE_TRY_ENV);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -79,35 +79,35 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 //    assert (coll_name != 0);
 
   // The _unchecked_narrow method
-  *os << node->name () << "_ptr " << node->name ()
+  *os << node->full_name () << "_ptr " << node->full_name ()
       << "::_unchecked_narrow (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj," << be_nl
       << "CORBA::Environment &" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "if (CORBA::is_nil (obj))" << be_idt_nl
-      << "return " << node->name () << "::_nil ();" << be_uidt_nl;
+      << "return " << node->full_name () << "::_nil ();" << be_uidt_nl;
 
   *os << "TAO_Stub* stub = obj->_stubobj ();" << be_nl
       << "stub->_incr_refcnt ();" << be_nl;
 
-  *os << "if (obj->_is_collocated () && _TAO_collocation_" << node->flatname ()
+  *os << "if (obj->_is_collocated () && _TAO_collocation_" << node->flat_name ()
       << "_Stub_Factory_function_pointer != 0)" << be_idt_nl
       << "{" << be_idt_nl
       << node->local_name () << "_ptr retv = _TAO_collocation_"
-      << node->flatname ()
+      << node->flat_name ()
       << "_Stub_Factory_function_pointer (obj);" << be_nl
       << "if (retv != 0)" << be_idt_nl
       << "return retv;" << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl;
 
-  *os << "return new " << node->name () << "(stub);" << be_uidt_nl
+  *os << "return new " << node->full_name () << "(stub);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // The _duplicate method
-  *os << node->name () << "_ptr " << be_nl
-      << node->name () << "::_duplicate ("
-      << node->name () << "_ptr obj)" << be_nl
+  *os << node->full_name () << "_ptr " << be_nl
+      << node->full_name () << "::_duplicate ("
+      << node->full_name () << "_ptr obj)" << be_nl
       << "{" << be_idt_nl
       << "if (!CORBA::is_nil (obj))" << be_idt_nl
       << "obj->_incr_refcnt ();" << be_uidt_nl
@@ -125,7 +125,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   // generate the is_a method
   os->indent ();
-  *os << "CORBA::Boolean " << node->name () << "::_is_a (" <<
+  *os << "CORBA::Boolean " << node->full_name () << "::_is_a (" <<
     "const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -149,7 +149,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   *os << "}\n\n";
 
   os->indent ();
-  *os << "const char* " << node->name ()
+  *os << "const char* " << node->full_name ()
       << "::_interface_repository_id (void) const"
       << be_nl
       << "{" << be_idt_nl
@@ -178,6 +178,10 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   // Generate code for the AMI Reply Handler.
   if (idl_global->ami_call_back () == I_TRUE)
     {
+
+      be_interface_type_strategy *old_strategy =  
+        node->set_strategy (new be_interface_ami_handler_strategy (node));
+
       // = Generate the default stub code for Handler.
 
       // Set the context.
@@ -238,6 +242,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
                             -1);
         }
       delete visitor;
+
+      delete node->set_strategy (old_strategy);
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
index 91d48ef2a02..e6f6867af52 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
@@ -56,14 +56,14 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
 
   os->indent (); // start with whatever indentation level we are at
 
-
-  ACE_OS::sprintf (namebuf, "%s", node->flatname ());
-
+  
+  ACE_OS::sprintf (namebuf, "%s", node->flat_name ());
+  
   *os << "//Class " << idl_global->impl_class_prefix ()<<namebuf << idl_global->impl_class_suffix ()<< be_nl;
   // now generate the class definition
-  *os << "class " << idl_global->stub_export_macro ()
+  *os << "class " << idl_global->export_macro ()
       << " " <<idl_global->impl_class_prefix () << namebuf << idl_global->impl_class_suffix () << " : ";
-  /*
+  
   if (node->n_inherits () > 0)
     {
       // this interface inherits from other interfaces
@@ -71,28 +71,27 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
 
 
       *os << "public virtual ";
-
+     
       intf = be_interface::narrow_from_decl (node->inherits ()[0]);
-      *os << idl_global->impl_class_prefix () << intf->flatname () << idl_global->impl_class_suffix ();//intf->relative_skel_name (node->full_skel_name ());
+      *os << idl_global->impl_class_prefix () << intf->flat_name () << idl_global->impl_class_suffix ();//intf->relative_skel_name (node->full_skel_name ());
       for (i = 1; i < node->n_inherits (); i++)
         {
           *os << ", public virtual ";
           intf = be_interface::narrow_from_decl (node->inherits ()[i]);
-          *os << idl_global->impl_class_prefix () <<intf->flatname () << idl_global->impl_class_suffix ();//intf->relative_skel_name (node->full_skel_name ());
+          *os << idl_global->impl_class_prefix () <<intf->flat_name () << idl_global->impl_class_suffix ();//intf->relative_skel_name (node->full_skel_name ());
         }  // end of for loop
 
       //inherit from the base skeleton file
       *os<<", public virtual "<<node->full_skel_name ();
     }
-
+  
   else
     {
-  */
       //inherit from the base skeleton file
       *os<<"public virtual "<<node->full_skel_name ();
-      //  }
-
-
+      }
+  
+    
   *os << be_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
@@ -102,22 +101,22 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
   if (idl_global->gen_copy_ctor ())
     {
       *os << "//Copy Constructor"<<be_nl
-          << idl_global->impl_class_prefix () << namebuf << idl_global->impl_class_suffix () << " (const "
+          << idl_global->impl_class_prefix () << namebuf << idl_global->impl_class_suffix () << " (const " 
           << idl_global->impl_class_prefix () << namebuf << idl_global->impl_class_suffix () << "&);" <<be_nl <<be_nl;
     }
 
-  if (idl_global->gen_assign_op ())
+  if (idl_global->gen_assign_op ()) 
     {
       *os << "//Copy Assignment" << be_nl
           << idl_global->impl_class_prefix () << namebuf << idl_global->impl_class_suffix () << "& "
           << "operator=(const " << idl_global->impl_class_prefix () << namebuf << idl_global->impl_class_suffix () << "&);"<<be_nl << be_nl;
 
     }
-
+  
   *os << "//Destructor " << be_nl
       << "virtual " << "~" << idl_global->impl_class_prefix () << namebuf << idl_global->impl_class_suffix () << " (void);" << be_nl << be_uidt_nl;
 
-
+   
   // generate code for elements in the scope (e.g., operations)
   if (this->visit_scope (node) ==  -1)
     {
@@ -127,28 +126,11 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
                          "codegen for scope failed\n"),
                         -1);
     }
-
- if (node->n_inherits () > 0)
-    {
-      // this interface inherits from other interfaces
-      be_interface *intf; // inherited interface
-
-      for (i = 0; i < node->n_inherits (); i++)
-	{
-	  intf = be_interface::narrow_from_decl (node->inherits ()[i]);
-	  // generate code for elements in the scope (e.g., operations)
-	  if (this->visit_scope (intf) ==  -1)
-	    {
-	      ACE_ERROR_RETURN ((LM_ERROR,
-				 "be_visitor_interface_ih::"
-				 "visit_interface - "
-			     "codegen for scope failed\n"),
-				-1);
-	    }
-	}
-
-    }
-
+  
+  
   *os << "};" << be_nl <<be_nl;
   return 0;
 }
+
+
+
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
index 6cb7079661e..466396420f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
@@ -56,7 +56,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
   // constructor
   *os << "// Implementation skeleton constructor" << be_nl;
   // find if we are at the top scope or inside some module
-  *os << idl_global->impl_class_prefix () << node->flatname () << idl_global->impl_class_suffix () <<"::" << idl_global->impl_class_prefix () << node->flatname () << idl_global->impl_class_suffix () <<
+  *os << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () <<"::" << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () <<
         " (void)" << be_idt_nl;
   
 
@@ -72,7 +72,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
   os->indent ();
   *os << "// Implementation skeleton destructor" << be_nl;
   
-  *os << idl_global->impl_class_prefix () << node->flatname () << idl_global->impl_class_suffix () <<"::~" << idl_global->impl_class_prefix () << node->flatname () << idl_global->impl_class_suffix () <<
+  *os << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () <<"::~" << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () <<
     " (void)" << be_idt_nl;
   
   *os << "{" <<be_nl;
@@ -82,9 +82,9 @@ be_visitor_interface_is::visit_interface (be_interface *node)
     {
       *os << "//Implementation Skeleton Copy Constructor" << be_nl;
       
-      *os <<idl_global->impl_class_prefix () << node->flatname () << idl_global->impl_class_suffix () <<"::"
-          << idl_global->impl_class_prefix () << node->flatname () << idl_global->impl_class_suffix () << " (const " 
-          << idl_global->impl_class_prefix () << node->flatname () << idl_global->impl_class_suffix () << "& t)"<< be_idt_nl;
+      *os <<idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () <<"::"
+          << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << " (const " 
+          << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << "& t)"<< be_idt_nl;
       if(node->n_inherits () >0)
         {
           node->gen_copy_ctors(os);
@@ -98,9 +98,9 @@ be_visitor_interface_is::visit_interface (be_interface *node)
     {
       *os << "//Implementation Skeleton Copy Assignment" << be_nl;
 
-      *os << idl_global->impl_class_prefix () << node->flatname () << idl_global->impl_class_suffix () << "& "
-          << idl_global->impl_class_prefix () << node->flatname () << idl_global->impl_class_suffix () << "::operator=(const " 
-          << idl_global->impl_class_prefix () << node->flatname () << idl_global->impl_class_suffix () << "& t)" <<be_idt_nl
+      *os << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << "& "
+          << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << "::operator=(const " 
+          << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << "& t)" <<be_idt_nl
           << "{" << be_idt_nl
           << "return *this;" << be_uidt_nl
           << "}" << be_nl << be_uidt_nl;
@@ -117,27 +117,6 @@ be_visitor_interface_is::visit_interface (be_interface *node)
                         -1);
     }
   
-   if (node->n_inherits () > 0)
-    {
-      // this interface inherits from other interfaces
-      be_interface *intf; // inherited interface
-
-      for (int i = 0; i < node->n_inherits (); i++)
-	{
-	  intf = be_interface::narrow_from_decl (node->inherits ()[i]);
-	  // generate code for elements in the scope (e.g., operations)
-	  if (this->visit_scope (intf) ==  -1)
-	    {
-	      ACE_ERROR_RETURN ((LM_ERROR,
-				 "be_visitor_interface_ih::"
-				 "visit_interface - "
-			     "codegen for scope failed\n"),
-				-1);
-	    }
-	}
-      
-    }
- 
 
    return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index 437ca6e9dac..b9816e9233c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -62,11 +62,11 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
   if (!node->is_nested ())
     {
       // we are outermost
-      ACE_OS::sprintf (namebuf, "POA_%s", node->local_name ()->get_string ());
+      ACE_OS::sprintf (namebuf, "POA_%s", node->local_name ());
     }
   else
     {
-      ACE_OS::sprintf (namebuf, "%s", node->local_name ()->get_string ());
+      ACE_OS::sprintf (namebuf, "%s", node->local_name ());
     }
 
   *os << "class " << namebuf << ";" << be_nl;
@@ -76,7 +76,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "_ptr;" << be_nl;
 
   // now generate the class definition
-  *os << "class " << idl_global->skel_export_macro ()
+  *os << "class " << idl_global->export_macro ()
       << " " << namebuf << " : ";
   if (node->n_inherits () > 0)
     {
@@ -149,7 +149,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << ");\n" << be_uidt_nl;
 
   // Print out the _this() method.
-  *os << node->name () << " *_this (" << be_idt << be_idt_nl
+  *os << node->full_name () << " *_this (" << be_idt << be_idt_nl
       << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
       << "TAO_default_environment ()"
       << be_uidt << be_uidt_nl
@@ -180,16 +180,19 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                         -1);
     }
 
-
   *os << be_uidt_nl << "};\n\n";
 
+
   be_visitor_context ctx (*this->ctx_);
   be_visitor *visitor = 0;
-
+  
   // generate the collocated class
   if (idl_global->gen_thru_poa_collocation ())
     {
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH);
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CH)
+        ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_THRU_POA_COLLOCATED_CH);
+      else
+        ctx.state (TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH);
       visitor = tao_cg->make_visitor (&ctx);
       if (!visitor || (node->accept (visitor) == -1))
         {
@@ -200,12 +203,17 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                              "codegen for thru_poa_collocated class failed\n"),
                             -1);
         }
+      delete visitor;
+      visitor = 0;
     }
 
   if (idl_global->gen_direct_collocation ())
     {
       ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH);
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CH)
+        ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_DIRECT_COLLOCATED_CH);
+      else
+        ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH);
       visitor = tao_cg->make_visitor (&ctx);
       if (!visitor || (node->accept (visitor) == -1))
         {
@@ -216,6 +224,8 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                              "codegen for direct_collocated class failed\n"),
                             -1);
         }
+      delete visitor;
+      visitor = 0;
     }
 
   // generate the TIE class.
@@ -231,6 +241,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                          "codegen for TIE class failed\n"),
                         -1);
     }
+  delete visitor;
 
   *os << "\n";
   ctx.stream (tao_cg->server_template_header ());
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index bbfef82c16f..e0dc12e0d26 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -64,12 +64,11 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     }
 
   // Collocation function pointer initializer.
-  *os << node->name () << "_ptr _TAO_collocation_POA_"
-      << node->flatname () << "_Stub_Factory (" << be_idt << be_idt_nl
+  *os << node->full_name () << "_ptr _TAO_collocation_POA_"
+      << node->flat_name () << "_Stub_Factory (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj" << be_uidt_nl
-      << ")\n";
+      << ")" << be_uidt_nl;
 
-  os->incr_indent (0);
   *os << "{" << be_idt_nl
       << "TAO_Stub *stub = obj->_stubobj ();" << be_nl << be_nl
       << "switch (stub->servant_orb_var ()->orb_core"
@@ -100,26 +99,22 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "return 0;" << be_uidt_nl
       << "}\n\n";
 
-  *os << "int _TAO_collocation_POA_" << node->flatname ()
+  *os << "int _TAO_collocation_POA_" << node->flat_name ()
       << "_Stub_Factory_Initializer"
       << " (long dummy)" << be_nl
       << "{" << be_idt_nl
       << "ACE_UNUSED_ARG (dummy);" << be_nl << be_nl
-      << "_TAO_collocation_" << node->flatname ()
+      << "_TAO_collocation_" << node->flat_name ()
       << "_Stub_Factory_function_pointer = " << be_idt_nl
-      << "_TAO_collocation_POA_" << node->flatname ()
+      << "_TAO_collocation_POA_" << node->flat_name ()
       << "_Stub_Factory;" << be_uidt_nl << be_nl
-      << "return 0;" << be_uidt_nl << "}\n\n";
+      << "return 0;" << be_uidt_nl << "}" << be_nl << be_nl;
 
-  *os << "static int _TAO_collocation_POA_" << node->flatname ()
+  *os << "static int _TAO_collocation_POA_" << node->flat_name ()
       << "_Stub_Factory_Initializer_Scarecrow = " << be_idt_nl
-      << "_TAO_collocation_POA_" << node->flatname ()
-      << "_Stub_Factory_Initializer (ACE_reinterpret_cast "
-      << "(long, _TAO_collocation_POA_"
-      << node->flatname () << "_Stub_Factory_Initializer));"
-      << be_uidt_nl;
-
-  os->incr_indent (0);
+      << "_TAO_collocation_POA_" << node->flat_name ()
+      << "_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_"
+      << node->flat_name () << "_Stub_Factory_Initializer));" << be_uidt_nl << be_nl;
 
   // constructor
   *os << "// skeleton constructor" << be_nl;
@@ -138,9 +133,9 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     }
 
   *os << "{" << be_idt_nl
-      << "this->optable_ = &tao_" << node->flatname ()
+      << "this->optable_ = &tao_" << node->flat_name ()
       << "_optable;" << be_uidt_nl
-      << "}\n\n";
+      << "}" << be_nl << be_nl;
 
   *os << "// copy ctor" << be_nl;
   // find if we are at the top scope or inside some module
@@ -166,7 +161,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                        "be_visitor_interface_ss::visit_interface - "
                        " copy ctor generation failed\n"), -1);
   *os << "  TAO_ServantBase (rhs)" << be_uidt_nl
-      << "{}\n" << be_nl;
+      << "{}" << be_nl << be_nl;
 
   *os << "// skeleton destructor" << be_nl;
 
@@ -182,7 +177,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       *os << node->full_skel_name () << "::~" << node->local_name () <<
         " (void)" << be_nl;
     }
-  *os << "{\n";
+  *os << "{" << be_nl;
   *os << "}\n\n";
 
 
@@ -220,11 +215,10 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" << be_nl;
   *os << "if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))" << be_idt_nl;
   *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt << be_uidt_nl;
-  *os << "}\n\n";
+  *os << "}" << be_nl << be_nl;
 
 
   // generate code for the _non_existent skeleton
-  os->indent ();
   *os << "void " << node->full_skel_name ()
       << "::_non_existent_skel (" << be_idt << be_idt_nl
       << "CORBA::ServerRequest &_tao_server_request, " << be_nl
@@ -242,10 +236,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" << be_nl;
   *os << "if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))" << be_idt_nl;
   *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt << be_uidt_nl;
-  *os << "}\n\n";
+  *os << "}" << be_nl << be_nl;
 
-
-  os->indent ();
   *os << "CORBA::Boolean " << node->full_skel_name ()
       << "::_is_a (" << be_idt << be_idt_nl
       << "const char* value," << be_nl
@@ -268,15 +260,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << be_idt_nl << "return 1;" << be_uidt_nl
       << "else" << be_idt_nl
       << "return 0;" << be_uidt << be_uidt << be_uidt_nl
-      << "}\n\n";
+      << "}" << be_nl << be_nl;
 
   // the downcast method.
-  os->indent ();
   *os << "void* " << node->full_skel_name ()
       << "::_downcast (" << be_idt << be_idt_nl
       << "const char* logical_type_id" << be_uidt_nl
       << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
+      << "{\n" << be_idt;
 
   if (node->traverse_inheritance_graph (be_interface::downcast_helper, os) == -1)
     {
@@ -287,22 +278,20 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                         -1);
     }
 
+  os->indent ();
   *os << "if (ACE_OS::strcmp (logical_type_id, "
       << "\"IDL:omg.org/CORBA/Object:1.0\") == 0)" << be_idt_nl
       << "return ACE_static_cast(PortableServer::Servant, this);"
       << be_uidt_nl;
 
   *os << "return 0;" << be_uidt_nl
-      << "}\n\n";
-
+      << "}" << be_nl << be_nl;
 
   // now the dispatch method
-  os->indent ();
   *os << "void " << node->full_skel_name () <<
     "::_dispatch (CORBA::ServerRequest &req, " <<
     "void *context, CORBA::Environment &ACE_TRY_ENV)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
+  *os << "{" << be_idt_nl;
   *os << "TAO_Skeleton skel; // pointer to skeleton for operation" << be_nl;
   *os << "const char *opname = req.operation (); // retrieve operation name"
       << be_nl;
@@ -317,28 +306,22 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   *os << "}" << be_nl;
   *os << "else" << be_idt_nl;
   *os << "skel (req, this, context, ACE_TRY_ENV);" << be_uidt << be_uidt_nl;
-  *os << "}\n\n";
+  *os << "}" << be_nl << be_nl;
 
-  os->indent ();
   *os << "const char* " << node->full_skel_name ()
       << "::_interface_repository_id (void) const"
       << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return \"" << node->repoID () << "\";\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  *os << "\n";
+  *os << "{" << be_idt_nl;
+  *os << "return \"" << node->repoID () << "\";" << be_uidt_nl;
+  *os << "}" << be_nl << be_nl;
 
   // the _this () operation
-  *os << node->name () << "*" << be_nl
+  *os << node->full_name () << "*" << be_nl
       << node->full_skel_name ()
       << "::_this (CORBA_Environment &ACE_TRY_ENV)" << be_nl
       << "{" << be_idt_nl
       << "TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);" << be_nl
       << "ACE_CHECK_RETURN (0);" << be_nl
-      << "if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())" << be_idt_nl
       << "switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())" << be_idt_nl
       << "{" << be_nl
       << "case TAO_ORB_Core::THRU_POA:" << be_idt_nl;
@@ -361,24 +344,19 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   *os << "default:" << be_idt_nl
       << "ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);" << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// stub->_incr_refcnt ();" << be_nl
-      << "CORBA::Object_var obj = new CORBA::Object (stub);" << be_nl
-      << "return " << node->name () << "::_unchecked_narrow (obj.in ());" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
       << "}\n\n";
 
   // the _create_collocated_objref method.  If the idl compiler does
   // not generate the type of collocated stub but the orb is asking
   // for it, simply return null so a remote stub will be used.
-  os->indent ();
-
   // generate the collocated class impl
   if (idl_global->gen_thru_poa_collocation ())
     {
       be_visitor_context ctx (*this->ctx_);
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS);
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CS)
+        ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_THRU_POA_COLLOCATED_CS);
+      else
+        ctx.state (TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS);
       be_visitor *visitor = tao_cg->make_visitor (&ctx);
       if (!visitor)
         {
@@ -403,7 +381,10 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   if (idl_global->gen_direct_collocation ())
     {
       be_visitor_context ctx (*this->ctx_);
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS);
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CS)
+        ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_THRU_POA_COLLOCATED_CS);
+      else
+        ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS);
       be_visitor *visitor = tao_cg->make_visitor (&ctx);
       if (!visitor)
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
index fd104d55a66..6d2d1112bf4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
@@ -46,14 +46,14 @@ int be_visitor_interface_thru_poa_collocated_sh::visit_interface (be_interface *
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  os->gen_ifdef_macro (node->flatname (), "_thru_poa_collocated");
+  os->gen_ifdef_macro (node->flat_name (), "_thru_poa_collocated");
 
   // output the class defn
   os->indent ();
-  *os << "class " << idl_global->skel_export_macro ()
+  *os << "class " << idl_global->export_macro ()
       << " " << node->local_coll_name (be_interface::THRU_POA);
   os->incr_indent ();
-  *os << " : public virtual " << node->name ();
+  *os << " : public virtual " << node->full_name ();
 
   // generate base classes if any
   if (node->n_inherits () > 0)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
index d6d869d5553..94d0f2291b8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
@@ -44,32 +44,26 @@ be_visitor_interface_thru_poa_collocated_ss::~be_visitor_interface_thru_poa_coll
 
 int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *node)
 {
-  TAO_OutStream *os = tao_cg->server_skeletons ();
+  TAO_OutStream *os = this->ctx_->stream ();
 
   this->ctx_->node (node);
 
+  os->indent ();
   *os << node->full_coll_name (be_interface::THRU_POA) << "::"
       << node->local_coll_name (be_interface::THRU_POA) << " (" << be_idt_nl
       << "TAO_Stub *stub" << be_uidt_nl
-      << ")\n";
-  os->decr_indent (0);
-
-  os->incr_indent ();
+      << ")" << be_idt_nl;
 
   if (node->is_nested ())
     {
-      be_decl* scope =
-	be_scope::narrow_from_scope (node->defined_in ())->decl ();
+      be_decl* scope = be_scope::narrow_from_scope (node->defined_in ())->decl ();
 
-      *os << ": ACE_NESTED_CLASS ("
-	  << scope->name () << ","
-	  << node->local_name ()
-	  << ") ()," << be_nl;
+      *os << ": ACE_NESTED_CLASS (" << scope->full_name () << ","
+          << node->local_name () << ") ()," << be_nl;
     }
   else
     {
-      *os << ": " << node->name ()
-	  << " ()," << be_nl;
+      *os << ": " << node->full_name () << " ()," << be_nl;
     }
 
   // @@ We should call the constructor for all base classes, since we
@@ -85,13 +79,10 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
                         -1);
     }
 
-  *os << "  CORBA_Object (stub, 0, 1)\n";
-
-  os->decr_indent ();
-  *os << "{\n";
-  *os << "}\n\n";
+  *os << "  CORBA_Object (stub, 0, 1)" << be_uidt_nl;
 
-  os->indent ();
+  *os << "{" << be_nl;
+  *os << "}" << be_nl << be_nl;
 
   // Generate _is_a implementation.
   *os << "CORBA::Boolean " << node->full_coll_name (be_interface::THRU_POA) << "::"
@@ -119,9 +110,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "\"" << node->repoID ()  << "\"" << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
       << ")->_is_a (logical_type_id, ACE_TRY_ENV);" << be_uidt << be_uidt_nl
-      << "}\n\n" << be_uidt_nl;
-
-  os->indent ();
+      << "}" << be_uidt_nl << be_nl << be_nl;
 
   // Generate _non_existent implementation.
   *os << "CORBA::Boolean " << node->full_coll_name (be_interface::THRU_POA) << "::"
@@ -148,7 +137,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "\"" << node->repoID ()  << "\"" << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
       << ")->_non_existent (ACE_TRY_ENV);" << be_uidt << be_uidt_nl
-      << "}\n\n" << be_uidt_nl;
+      << "}" << be_uidt_nl << be_nl << be_nl;
 
   if (this->visit_scope (node) == -1)
     {
@@ -176,7 +165,7 @@ be_visitor_interface_thru_poa_collocated_ss::collocated_ctor_helper (be_interfac
     {
       be_decl *scope;
       scope = be_scope::narrow_from_scope (base->defined_in ())->decl ();
-      *os << "  ACE_NESTED_CLASS (POA_" << scope->name () << ","
+      *os << "  ACE_NESTED_CLASS (POA_" << scope->full_name () << ","
           << base->local_coll_name (be_interface::THRU_POA) << ") (stub)," << be_nl;
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index 0c568e4bfe5..bed27304a98 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -63,15 +63,15 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
   if (!node->is_nested ())
     {
       // we are outermost
-      ACE_OS::sprintf (namebuf, "POA_%s", node->local_name ()->get_string ());
+      ACE_OS::sprintf (namebuf, "POA_%s", node->local_name ());
       ACE_OS::sprintf (tiename, "POA_%s_tie",
-                       node->local_name ()->get_string ());
+                       node->local_name ());
     }
   else
     {
-      ACE_OS::sprintf (namebuf, "%s", node->local_name ()->get_string ());
+      ACE_OS::sprintf (namebuf, "%s", node->local_name ());
       ACE_OS::sprintf (tiename, "%s_tie",
-                       node->local_name ()->get_string ());
+                       node->local_name ());
     }
 
   // now generate the class definition
@@ -87,7 +87,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
 
   *os << "// TIE class: Refer to CORBA v2.2, Section 20.34.4" << be_nl;
   *os << "template <class T>" << be_nl;
-  *os << "class " << idl_global->skel_export_macro ()
+  *os << "class " << idl_global->export_macro ()
       << " " << tiename << " : public " << namebuf << be_nl;
   *os << "{" << be_nl
       << "public:" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
index 6b720a11366..3e48f8cd187 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
@@ -66,16 +66,16 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
   if (!node->is_nested ())
     {
       ACE_OS::sprintf (localskelname, "POA_%s",
-                       node->local_name ()->get_string ());
+                       node->local_name ());
       ACE_OS::sprintf (localtiename, "POA_%s_tie",
-                       node->local_name ()->get_string ());
+                       node->local_name ());
     }
   else
     {
       ACE_OS::sprintf (localskelname, "%s",
-                       node->local_name ()->get_string ());
+                       node->local_name ());
       ACE_OS::sprintf (localtiename, "%s_tie",
-                       node->local_name ()->get_string ());
+                       node->local_name ());
     }
 
   if (node->is_nested ())
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
index 7591f4d83be..1ecae4bb0a5 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
@@ -55,7 +55,7 @@ be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node)
       *os << "class " << node->local_name () << ";" << be_nl;
 
       // generate the ifdefined macro for the _ptr type
-      os->gen_ifdef_macro (node->flatname (), "_ptr");
+      os->gen_ifdef_macro (node->flat_name (), "_ptr");
 
       // generate the _ptr declaration
       *os << "typedef " << node->local_name () << " *" << node->local_name ()
@@ -64,7 +64,7 @@ be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node)
       os->gen_endif ();
 
       // enclose under an ifdef macro
-      os->gen_ifdef_macro (node->flatname (), "_var");
+      os->gen_ifdef_macro (node->flat_name (), "_var");
 
       // generate the _var declaration
       if (node->gen_var_defn () == -1)
@@ -78,7 +78,7 @@ be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node)
       os->gen_endif ();
 
       // enclose under an ifdef macro
-      os->gen_ifdef_macro (node->flatname (), "_out");
+      os->gen_ifdef_macro (node->flat_name (), "_out");
 
       // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
       if (node->gen_out_defn () == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
index bdecfc4e071..f109e3cd647 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
@@ -56,7 +56,7 @@ be_visitor_module_ch::visit_module (be_module *node)
 
       os->indent (); // start from whatever indentation level we were at
       // now generate the class definition
-      *os << "TAO_NAMESPACE " // << idl_global->stub_export_macro ()
+      *os << "TAO_NAMESPACE " // << idl_global->export_macro ()
 	  << " " << node->local_name () << be_nl
           << "{\n";
       os->incr_indent (0);
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
index c2eabbdf962..f3080384f59 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
@@ -55,7 +55,7 @@ be_visitor_module_sh::visit_module (be_module *node)
 
       // now generate the class definition. The prefix POA_ is prepended to our
       // name only if we are the outermost module
-      *os << "TAO_NAMESPACE "; // << idl_global->skel_export_macro ()
+      *os << "TAO_NAMESPACE "; // << idl_global->export_macro ()
 
       if (!node->is_nested ())
           // we are outermost module
diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp
index 3b4c8db91ac..04441aa4819 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation.cpp
@@ -62,7 +62,10 @@
 #include "be_visitor_operation/ami_handler_operation_ch.cpp"
 #include "be_visitor_operation/ami_handler_arglist.cpp"
 #include "be_visitor_operation/ami_handler_operation_cs.cpp"
+#include "be_visitor_operation/ami_handler_servant_operation_cs.cpp"
 #include "be_visitor_operation/ami_handler_skeleton_cs.cpp"
 #include "be_visitor_operation/ami_handler_argument_marshal.cpp"
+#include "be_visitor_operation/ami_handler_thru_poa_collocated_ch.cpp"
+#include "be_visitor_operation/ami_handler_thru_poa_collocated_cs.cpp"
 
 ACE_RCSID(be, be_visitor_operation, "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
index 17283768469..fa0efac3f45 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
@@ -61,13 +61,24 @@ be_visitor_operation_ami_arglist::visit_operation (be_operation *node)
   if (interface == 0)
     cerr << "Invalid interface";
 
-  // AMI Handler argument.
-  *os << "AMI_"
-      << interface->fullname ()
-      << "_Handler_ptr "
-      << "_tao_ami_handler"
-      << ",\n";
-  // #endif /* TAO_IDL_HAS_AMI */
+  // @@ Michael: This is not very nice, but we do not have 
+  //             a be_interface pointer and therefor no strategy.
+  {
+    char *full_name = 0;
+    
+    interface->compute_full_name ("AMI_", 
+                                  "_Handler",
+                                  full_name);
+    // Genereate scope name.
+    // AMI Handler argument.
+    *os << full_name
+        << "_ptr "
+        << "_tao_ami_handler"
+        << ",\n";
+
+    delete full_name;
+  }
+
 
   // all we do is hand over code generation to our scope
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 3f87f4430db..37d859136ef 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -85,7 +85,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
                       -1);
 
   // Generate the scope::operation name.
-  *os << parent->fullname ()
+  *os << parent->full_name ()
       << "::"
       << "sendc_"
       << node->local_name ()->get_string ();
@@ -376,7 +376,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname () <<
+  *os << node->flat_name () <<
     "_paramdata [] = " << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -397,7 +397,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node,
     }
   *os << "\n";
   os->decr_indent ();
-  *os << "}; // " << node->flatname () << "_paramdata\n\n";
+  *os << "}; // " << node->flat_name () << "_paramdata\n\n";
 
   // Check if this operation raises any exceptions. In that case, we must
   // generate a list of exception typecodes. This is not valid for
@@ -430,7 +430,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname ()
+  *os << node->flat_name ()
       << "_calldata = " << be_nl
       << "{"
       << "\"";
@@ -468,7 +468,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname () << "_paramdata, ";
+  *os << node->flat_name () << "_paramdata, ";
 
       // insert exception list (if any) - node for attributes
   if (this->ctx_->attribute ())
@@ -478,7 +478,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node,
       if (node->exceptions ())
         {
           *os << node->exceptions ()->length ()
-              << ", _tao_" << node->flatname () << "_exceptiondata};\n\n";
+              << ", _tao_" << node->flat_name () << "_exceptiondata};\n\n";
         }
       else
         *os << "0, 0};\n\n";
@@ -544,7 +544,7 @@ be_interpretive_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
       else
         *os << "_get_";
     }
-  *os << node->flatname () << "_calldata," << be_nl
+  *os << node->flat_name () << "_calldata," << be_nl
       << "_tao_arguments" << be_uidt_nl
       << ");\n";
 
@@ -674,9 +674,21 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node
   // Get the interface.
   be_decl *interface = be_interface::narrow_from_scope (node->defined_in ())->decl ();
 
-  *os << "&AMI_" << interface->fullname () << "_Handler" << "::"
-      << node->local_name () << "_skel," << be_nl;
-  
+  {
+    char *full_name = 0;
+    
+    interface->compute_full_name ("AMI_", 
+                                  "_Handler",
+                                  full_name);
+
+    *os << "&" << full_name << "::"
+        << node->local_name () << "_skel," << be_nl;
+
+    delete full_name;
+  }
+
+
+
   // Next argument is the ami handler passed in for this method. 
   *os << "_tao_ami_handler" << be_uidt_nl
     
@@ -735,7 +747,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node
       << "int _invoke_status =" << be_idt_nl;
   if (node->exceptions ())
     {
-      *os << "_tao_call.invoke (_tao_" << node->flatname ()
+      *os << "_tao_call.invoke (_tao_" << node->flat_name ()
           << "_exceptiondata, "
           << node->exceptions ()->length ()
           << ", ACE_TRY_ENV);";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp
index 30f38acf344..450e5bd6cb1 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp
@@ -90,7 +90,8 @@ be_visitor_operation_ami_handler_operation_ch::visit_operation (be_operation *no
   // Generating the skeleton method.
 
   // Skeleton not necessary for collocated class.
-  if (this->ctx_->state () == TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_OPERATION_CH)
+  if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_THRU_POA_COLLOCATED_CH
+      || this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_DIRECT_COLLOCATED_CH)
     {
       return 0;
       /* NOT REACHED */
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
index 89d14a4d74e..d98be024263 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
@@ -90,8 +90,20 @@ be_visitor_operation_ami_handler_operation_cs::visit_operation (be_operation *no
                         -1);
     }
 
-  // Genereate scope name.
-  *os << parent->compute_name ("AMI_", "_Handler");
+  // Here we do not have our overridden be_interface methods,
+  // so the interface type strategy does not work here. 
+  // We have to go by foot.
+  {
+    char *full_name = 0;
+    
+    parent->compute_full_name ("AMI_", 
+                               "_Handler",
+                               full_name);
+    // Genereate scope name.
+    *os << full_name;
+
+    delete full_name;
+  }
 
   // Generate the operation name.
   *os << "::" << node->local_name ();
@@ -374,7 +386,7 @@ be_interpretive_visitor_operation_ami_handler_operation_cs::gen_pre_stub_info (b
       else
         *os << "_get_";
     }
-  *os << node->flatname () <<
+  *os << node->flat_name () <<
     "_paramdata [] = " << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -397,7 +409,7 @@ be_interpretive_visitor_operation_ami_handler_operation_cs::gen_pre_stub_info (b
   os->indent ();
   *os << be_nl;
   os->decr_indent ();
-  *os << "}; // " << node->flatname () << "_paramdata\n\n";
+  *os << "}; // " << node->flat_name () << "_paramdata\n\n";
 
   // Check if this operation raises any exceptions. In that case, we must
   // generate a list of exception typecodes. This is not valid for
@@ -430,7 +442,7 @@ be_interpretive_visitor_operation_ami_handler_operation_cs::gen_pre_stub_info (b
       else
         *os << "_get_";
     }
-  *os << node->flatname ()
+  *os << node->flat_name ()
       << "_calldata = " << be_nl
       << "{"
       << "\"";
@@ -468,7 +480,7 @@ be_interpretive_visitor_operation_ami_handler_operation_cs::gen_pre_stub_info (b
       else
         *os << "_get_";
     }
-  *os << node->flatname () << "_paramdata, ";
+  *os << node->flat_name () << "_paramdata, ";
 
       // insert exception list (if any) - node for attributes
   if (this->ctx_->attribute ())
@@ -478,7 +490,7 @@ be_interpretive_visitor_operation_ami_handler_operation_cs::gen_pre_stub_info (b
       if (node->exceptions ())
         {
           *os << node->exceptions ()->length ()
-              << ", _tao_" << node->flatname () << "_exceptiondata};\n\n";
+              << ", _tao_" << node->flat_name () << "_exceptiondata};\n\n";
         }
       else
         *os << "0, 0};\n\n";
@@ -546,7 +558,7 @@ gen_marshal_and_invoke (be_operation*node,
       else
         *os << "_get_";
     }
-  *os << node->flatname () << "_calldata," << be_nl
+  *os << node->flat_name () << "_calldata," << be_nl
       << "_tao_arguments" << be_uidt_nl
       << ");\n";
 
@@ -647,8 +659,6 @@ gen_marshal_and_invoke (be_operation *node,
                         be_type *bt)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_visitor *visitor;
-  be_visitor_context ctx;
 
   os->indent ();
 
@@ -699,43 +709,28 @@ gen_marshal_and_invoke (be_operation *node,
           << be_nl
           << "if (!(\n" << be_idt << be_idt << be_idt;
 
-      // @@ Michael: This has to be replaced witht he code in the
-      //             "#if 0" clause
-      // Marshal the ami result argument, if the return type is not
-      // void.
-      if (!this->void_return_type (bt))
-        {
-          os->indent ();
-          *os << "(_tao_out << _tao_retval)";
-
-          // Print the && if there are OUT or INOUT arguements in the
-          // signature.
-          if (this->has_param_type (node, AST_Argument::dir_OUT) ||
-              this->has_param_type (node, AST_Argument::dir_INOUT))
-            *os << " &&\n";
-        }
-
-#if 0
-      // @@ This for giving the _tao_retval argument only. But
-      //    this may be needed for some data types.
-      //    But the one that is above is ok for basic types.
-      // @@ We may need to do this.
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_MARSHAL_CS);
+      // demarshal
+      be_visitor_context ctx (*this->ctx_);
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_DEMARSHAL_CS);
       ctx.sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
-      visitor = tao_cg->make_visitor (&ctx);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
       if (!visitor || (node->accept (visitor) == -1))
         {
           delete visitor;
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_compiled_visitor_operation_ami_handler_operation_cs::"
-                             "gen_marshal_and_invoke - "
-                             "codegen for return var in do_static_call failed\n"),
+                             "gen_demarshal_params - "
+                             "codegen for demarshal failed\n"),
                             -1);
         }
       delete visitor;
-      visitor = 0;
-#endif /* 0 */
+
+      // Print the && if there are OUT or INOUT arguements in the
+      // signature.
+      if (this->has_param_type (node, AST_Argument::dir_OUT) ||
+          this->has_param_type (node, AST_Argument::dir_INOUT))
+        *os << " &&\n";
+
 
       // Marshal each out and inout argument.
       ctx = *this->ctx_;
@@ -774,7 +769,7 @@ gen_marshal_and_invoke (be_operation *node,
     {
       if (node->exceptions ())
         {
-          *os << "_tao_call.invoke (_tao_" << node->flatname ()
+          *os << "_tao_call.invoke (_tao_" << node->flat_name ()
               << "_exceptiondata, "
               << node->exceptions ()->length ()
               << ", ACE_TRY_ENV);";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_servant_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_servant_operation_cs.cpp
new file mode 100644
index 00000000000..e05fe0be6ea
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_servant_operation_cs.cpp
@@ -0,0 +1,686 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_servant_operation_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the server skeleton
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_operation.h"
+#include "be_visitor_argument.h"
+
+ACE_RCSID(be_visitor_operation, ami_handler_servant_operation_cs, "$Id$")
+
+
+// ************************************************************
+// Operation visitor for server skeletons
+// ************************************************************
+
+be_visitor_operation_ami_handler_servant_operation_cs::be_visitor_operation_ami_handler_servant_operation_cs (be_visitor_context *ctx)
+  : be_visitor_operation (ctx)
+{
+}
+
+be_visitor_operation_ami_handler_servant_operation_cs::~be_visitor_operation_ami_handler_servant_operation_cs (void)
+{
+}
+
+// processing to be done after every element in the scope is processed
+int
+be_visitor_operation_ami_handler_servant_operation_cs::post_process (be_decl *bd)
+{
+  // all we do here is to insert a comma and a newline
+  TAO_OutStream *os = this->ctx_->stream ();
+  if (!this->last_node (bd))
+    *os << ",\n";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_servant_operation_cs::visit_operation (be_operation *node)
+{
+  TAO_OutStream *os; // output stream
+  be_type *bt;       // type node for return type
+
+  os = this->ctx_->stream (); // grab the o/p stream
+  this->ctx_->node (node); // save the node for future use
+
+  os->indent (); // start with the current indentation level
+
+  // if there is an argument of type "native", return immediately
+  if (node->has_native ())
+    return 0;
+
+  // retrieve the operation return type
+  bt = be_type::narrow_from_decl (node->return_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "Bad return type\n"),
+                        -1);
+    }
+
+  // We need the interface node in which this operation was defined. However,
+  // if this operation node was an attribute node in disguise, we get this
+  // information from the context
+  be_interface *intf;
+  intf = this->ctx_->attribute ()
+    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
+    : be_interface::narrow_from_scope (node->defined_in ());
+
+  if (!intf)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "bad interface scope\n"),
+                        -1);
+    }
+
+  // Default implementation
+  os->indent ();
+  *os << "void " << intf->full_skel_name () << "::";
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->local_name () << " ";
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CS);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if ((!visitor) || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_thru_poa_collocated_cs::"
+                         "visit_operation - "
+                         "codegen for argument list failed\n"),
+                        -1);
+    }
+  delete visitor;
+  visitor = 0;
+  os->indent ();
+  *os << "{" << be_idt_nl;
+
+  *os << "ACE_DEBUG ((LM_DEBUG," << be_idt << be_idt_nl
+      <<"\"(%P | %t):" << intf->full_skel_name () << "\\n\"));"
+      << be_uidt << be_uidt_nl;
+
+  *os << be_uidt_nl << "}" << be_nl << be_nl;
+
+
+
+  // generate the signature of the static skeleton
+  os->indent ();
+  *os << "void " << intf->full_skel_name () << "::";
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->local_name ()
+      << "_skel (" << be_idt << be_idt_nl;
+
+  *os << "CORBA::ServerRequest &_tao_server_request, " << be_nl;
+
+  *os << "void *_tao_object_reference, " << be_nl
+      << "void * /* context */, " << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt << be_uidt_nl
+      << ")" << be_nl;
+
+  // generate the actual code for the skeleton. However, if any of the argument
+  // types is "native", we do not generate any skeleton
+  // last argument - is always CORBA::Environment
+  *os << "{\n" << be_idt;
+
+  // generate all the tables and other pre-skel info
+  if (this->gen_pre_skel_info (node, bt) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "gen_pre_skel_info failed\n"),
+                        -1);
+    }
+
+  os->indent ();
+  // get the right object implementation.
+  *os << intf->full_skel_name () << " *_tao_impl = ("
+      << intf->full_skel_name () << " *)_tao_object_reference;\n\n";
+
+  // declare a return type variable
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_DECL_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (bt->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "codegen for return var decl failed\n"),
+                        -1);
+    }
+  delete visitor;
+  visitor = 0;
+
+  // declare variables for arguments
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DECL_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "codegen for return var decl failed\n"),
+                        -1);
+    }
+  delete visitor;
+  visitor = 0;
+
+  // Demarshal parameters
+  if (this->gen_demarshal_params (node, bt) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "gen_demarshal_params failed\n"),
+                        -1);
+    }
+
+  // make the upcall
+  os->indent ();
+  *os << "_tao_impl->" << node->local_name () << " (" << be_idt << "\n";
+
+  if (!this->void_return_type (bt))
+  {
+    os->indent ();
+    *os << "_tao_retval,\n";
+  }
+
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "codegen for making upcall failed\n"),
+                        -1);
+    }
+  delete visitor;
+  visitor = 0;
+
+  // end the upcall
+  os->indent ();
+  *os << be_uidt_nl << ");\n";
+
+  os->indent ();
+  *os << "ACE_CHECK;\n"
+      << "_tao_server_request.init_reply (ACE_TRY_ENV);\n";
+
+  os->decr_indent ();
+  *os << "}\n\n";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_servant_operation_cs::visit_argument (be_argument *node)
+{
+  // this method is used to generate the ParamData table entry
+
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_type *bt; // argument type
+
+  // retrieve the type for this argument
+  bt = be_type::narrow_from_decl (node->field_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_argument - "
+                         "Bad argument type\n"),
+                        -1);
+    }
+
+  os->indent ();
+  *os << "{" << bt->tc_name () << ", ";
+  switch (node->direction ())
+    {
+    case AST_Argument::dir_IN:
+      *os << "CORBA::ARG_IN, ";
+      break;
+    case AST_Argument::dir_INOUT:
+      *os << "CORBA::ARG_INOUT, ";
+      break;
+    case AST_Argument::dir_OUT:
+      *os << "CORBA::ARG_OUT, ";
+      break;
+    }
+  *os << "0}";
+
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_servant_operation_cs::gen_raise_exception (be_type *,
+                                              const char *excep,
+                                              const char *completion_status,
+                                              const char * /* env */)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  os->indent ();
+  *os << "ACE_THROW ("
+      << excep << " (" << completion_status << ") "
+      << ");\n";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_servant_operation_cs::gen_check_exception (be_type *, const char * /* env */)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  os->indent ();
+  // check if there is an exception
+  *os << "ACE_CHECK;\n";
+  // << env << ");\n";
+
+  return 0;
+}
+
+
+// *********************************************************************
+// Operation visitor for server skeletons using interpretive marshaling
+// *********************************************************************
+
+be_interpretive_visitor_operation_ami_handler_servant_operation_cs::
+be_interpretive_visitor_operation_ami_handler_servant_operation_cs (be_visitor_context *ctx)
+  : be_visitor_operation_ami_handler_servant_operation_cs (ctx)
+{
+}
+
+be_interpretive_visitor_operation_ami_handler_servant_operation_cs::
+~be_interpretive_visitor_operation_ami_handler_servant_operation_cs (void)
+{
+}
+
+int
+be_interpretive_visitor_operation_ami_handler_servant_operation_cs::gen_pre_skel_info (be_operation *node,
+                                                         be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor_context ctx;
+
+  os->indent ();
+  // generate the param_data and call_data tables. We generate these if and
+  // only if none of our arguments is of "native" type. Native types cannot be
+  // marshaled.
+  // native type does not exist. Generate the static tables
+
+  // generate the TAO_Param_Data_Skel table
+  *os << "static const TAO_Param_Data_Skel ";
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->flat_name () <<
+    "_paramdata [] = " << be_nl;
+  *os << "{\n";
+  os->incr_indent ();
+
+      // entry for the return type
+  *os << "{" << bt->tc_name () << ", 0, 0}";
+  if (node->nmembers () > 0)
+    *os << ",\n";
+
+      // generate entries for the param data table for arguments
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "visit scope failed\n"),
+                        -1);
+    }
+  *os << "\n";
+  os->decr_indent ();
+  *os << "}; // " << node->flat_name () << "_paramdata\n\n";
+
+  // now generate the calldata table
+  os->indent ();
+  *os << "static const TAO_Call_Data_Skel ";
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->flat_name ()
+      << "_calldata = " << be_nl
+      << "{"
+      << "\"";
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->local_name () << "\", ";
+
+      // are we oneway or two operation?
+  if (node->flags () == AST_Operation::OP_oneway)
+    {
+      *os << "0, "; // for false
+    }
+  else
+    {
+      *os << "1, "; // for true
+    }
+  // insert the size of the paramdata table i.e., number of arguments + 1
+  // for return type
+  *os << (node->argument_count () + 1) << ", ";
+
+  // insert the address of the paramdata table
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->flat_name () << "_paramdata};\n\n";
+
+  return 0;
+}
+
+int
+be_interpretive_visitor_operation_ami_handler_servant_operation_cs::gen_demarshal_params (be_operation *node,
+                                                            be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor *visitor;
+  be_visitor_context ctx;
+
+  // setup parameters for demarshaling and demarshal them
+  os->indent ();
+  *os << "_tao_server_request.demarshal (" << be_idt_nl
+      << "ACE_TRY_ENV, " << be_nl
+      << "&";
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->flat_name () << "_calldata,\n";
+
+  // pass the appropriate return value to the demarshal operation
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_DEMARSHAL_SS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (bt->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "codegen for return var in demarshal failed\n"),
+                        -1);
+    }
+  // insert a comma after the return val if there are arguments
+  if (node->argument_count () > 0)
+    *os << ",\n";
+
+  // pass each argument to the demarshal operation
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_DEMARSHAL_SS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "codegen for argument in demarshal failed\n"),
+                        -1);
+    }
+
+  // end the demarshal call
+  *os << be_uidt_nl;
+  *os << ");" << be_nl;
+
+  *os << "ACE_CHECK;\n";
+
+  return 0;
+}
+
+int
+be_interpretive_visitor_operation_ami_handler_servant_operation_cs::gen_marshal_params (be_operation *node,
+                                                          be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor *visitor;
+  be_visitor_context ctx;
+
+  // setup parameters for marshaling and marshal them into the
+  // outgoing stream
+  os->indent ();
+  *os << "_tao_server_request.marshal (" << be_idt_nl
+      << "ACE_TRY_ENV, " << be_nl
+    //      << "_tao_skel_environment, " << be_nl
+      << "&";
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->flat_name () << "_calldata,\n";
+
+  // pass the appropriate return value to the marshal operation
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_MARSHAL_SS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (bt->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "codegen for return var in marshal failed\n"),
+                        -1);
+    }
+  // insert a comma after the return val if there are arguments
+  if (node->argument_count () > 0)
+    {
+      *os << ",\n";
+    }
+
+  // pass each argument to the marshal operation
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_servant_operation_cs::"
+                         "visit_operation - "
+                         "codegen for argument in marshal failed\n"),
+                        -1);
+    }
+  // end the marshal call
+  *os << be_uidt_nl;
+  *os << ");\n";
+
+  return 0;
+}
+
+// *********************************************************************
+// Operation visitor for server skeletons using compiled marshaling
+// *********************************************************************
+
+be_compiled_visitor_operation_ami_handler_servant_operation_cs::
+be_compiled_visitor_operation_ami_handler_servant_operation_cs (be_visitor_context *ctx)
+  : be_visitor_operation_ami_handler_servant_operation_cs (ctx)
+{
+}
+
+be_compiled_visitor_operation_ami_handler_servant_operation_cs::
+~be_compiled_visitor_operation_ami_handler_servant_operation_cs (void)
+{
+}
+
+int
+be_compiled_visitor_operation_ami_handler_servant_operation_cs::gen_pre_skel_info (be_operation *node,
+                                                         be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // now make sure that we have some in and inout parameters. Otherwise, there
+  // is nothing to be marshaled in
+  if (this->has_param_type (node, AST_Argument::dir_INOUT) ||
+      this->has_param_type (node, AST_Argument::dir_OUT) ||
+      !this->void_return_type (bt))
+    {
+      // instantiate a TAO_InputCDR variable
+      os->indent ();
+      *os << "TAO_InputCDR &_tao_in = _tao_server_request.incoming ();\n";
+    }
+
+  return 0;
+}
+
+int
+be_compiled_visitor_operation_ami_handler_servant_operation_cs::gen_demarshal_params (be_operation *node,
+                                                        be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor *visitor;
+  be_visitor_context ctx;
+
+  // now make sure that we have some in and inout parameters. Otherwise, there
+  // is nothing to be marshaled in
+  if (this->has_param_type (node, AST_Argument::dir_INOUT) ||
+      this->has_param_type (node, AST_Argument::dir_OUT) ||
+      !this->void_return_type (bt))
+    {
+      os->indent ();
+
+      // demarshal the inout and out arguments and return values
+      *os << "if (!(\n" << be_idt;
+  
+      // demarshal
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_DEMARSHAL_CS);
+      ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_compiled_visitor_operation_ami_handler_servant_operation_cs::"
+                             "gen_demarshal_params - "
+                             "codegen for demarshal failed\n"),
+                            -1);
+        }
+
+      // Print the && if there are OUT or INOUT arguements in the
+      // signature.
+      if (this->has_param_type (node, AST_Argument::dir_OUT) ||
+          this->has_param_type (node, AST_Argument::dir_INOUT))
+        *os << " &&\n";
+
+      // marshal each in and inout argument
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DEMARSHAL_CS);
+      ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_compiled_visitor_operation_ami_handler_servant_operation_cs::"
+                             "gen_demarshal_params - "
+                             "codegen for demarshal failed\n"),
+                            -1);
+        }
+      *os << be_uidt_nl << "))\n" << be_idt;
+
+      // if marshaling fails, raise exception
+      if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
+                                     "",
+                                     "ACE_TRY_ENV") == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_compiled_visitor_operation_ami_handler_servant_operation_cs::"
+                             "gen_marshal_and invoke - "
+                             "codegen for return var failed\n"),
+                            -1);
+        }
+      *os << be_uidt << "\n";
+
+    };
+
+  return 0;
+}
+
+int
+be_compiled_visitor_operation_ami_handler_servant_operation_cs::gen_marshal_params (be_operation *node,
+                                                      be_type *bt)
+{
+  // because we do not want to return something.
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp
index d6936926da6..7828662ff7f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp
@@ -145,8 +145,6 @@ be_visitor_operation_ami_handler_skeleton_cs::visit_operation (be_operation *nod
   *os << "ACE_CHECK;" << be_nl << be_nl
       << "// @@ Error handling " << be_nl << be_nl;
 
-  *os << "//Demarshall all the arguments.\n";
-
   // declare a return type variable
   ctx = *this->ctx_;
   ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_DECL_CS);
@@ -402,57 +400,58 @@ gen_marshal_and_invoke (be_operation *node,
 
   os->indent ();
 
-  *os << "if (!(\n" << be_idt << be_idt << be_idt;
-
-  if (!this->void_return_type (bt))
+  *os << "// Demarshall all the arguments.\n";
+  if (!this->void_return_type (bt)
+      || this->has_param_type (node, AST_Argument::dir_INOUT)
+      || this->has_param_type (node, AST_Argument::dir_OUT))
     {
-      // demarshal the return val
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_DEMARSHAL_CS);
-      ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
+      *os << "if (!(\n" << be_idt << be_idt << be_idt;
+
+      if (!this->void_return_type (bt))
         {
+          // demarshal the return val
+          ctx = *this->ctx_;
+          ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_DEMARSHAL_CS);
+          ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
+          visitor = tao_cg->make_visitor (&ctx);
+          if (!visitor || (node->accept (visitor) == -1))
+            {
+              delete visitor;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_compiled_visitor_operation_ami_handler_skeleton_cs::"
+                                 "gen_demarshal_params - "
+                                 "codegen for return var failed\n"),
+                                -1);
+            }
           delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_compiled_visitor_operation_ami_handler_skeleton_cs::"
-                             "gen_demarshal_params - "
-                             "codegen for return var failed\n"),
-                            -1);
         }
-      delete visitor;
 
-      // Print the && if there are OUT or INOUT arguements in the
-      // signature.
-      if (this->has_param_type (node, AST_Argument::dir_OUT) ||
-          this->has_param_type (node, AST_Argument::dir_INOUT))
-        *os << " &&\n";
-    }
-
-  if (this->has_param_type (node, AST_Argument::dir_INOUT) ||
-      this->has_param_type (node, AST_Argument::dir_OUT))
-    {
-      // demarshal each in and inout argument
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DEMARSHAL_CS);
-      ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
+      if (this->has_param_type (node, AST_Argument::dir_INOUT) ||
+          this->has_param_type (node, AST_Argument::dir_OUT))
         {
+          *os << " &&\n";
+
+          // demarshal each in and inout argument
+          ctx = *this->ctx_;
+          ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DEMARSHAL_CS);
+          ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
+          visitor = tao_cg->make_visitor (&ctx);
+          if (!visitor || (node->accept (visitor) == -1))
+            {
+              delete visitor;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l)  be_compiled_visitor_operation_ami_handler_skeleton_cs::"
+                                 "gen_marshal_params - "
+                                 "codegen for args failed\n"),
+                                -1);
+            }
           delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l)  be_compiled_visitor_operation_ami_handler_skeleton_cs::"
-                             "gen_marshal_params - "
-                             "codegen for args failed\n"),
-                            -1);
         }
-      delete visitor;
+      *os << be_uidt << be_uidt_nl
+          << " ))" << be_nl
+          << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl;
     }
 
-  *os << be_uidt << be_uidt_nl
-      << " ))" << be_nl
-      << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl;
-
   // Invoke the callback method
   *os << "// Invoke the call back method." << be_nl
       << "_tao_reply_handler_object->"
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_thru_poa_collocated_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_thru_poa_collocated_ch.cpp
new file mode 100644
index 00000000000..dae79c4beba
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_thru_poa_collocated_ch.cpp
@@ -0,0 +1,101 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_thru_poa_collocated_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for thru_poa_collocated operation in the client stub
+//    Special code for the AMI Reply Handler
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//    Michael Kircher
+//
+// ============================================================================
+
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
+
+#include "be_visitor_operation.h"
+
+ACE_RCSID(be_visitor_operation, ami_handler_thru_poa_collocated_ch, "$Id$")
+
+
+// *************************************************************************
+//  be_visitor_operation_ami_handler_thru_poa_collocated_ch --
+//  This visitor generates code for the thru_poa_collocated operation signature in a
+//  server header file
+// *************************************************************************
+
+be_visitor_operation_ami_handler_thru_poa_collocated_ch::be_visitor_operation_ami_handler_thru_poa_collocated_ch
+(be_visitor_context *ctx)
+  : be_visitor_scope (ctx)
+{
+}
+
+be_visitor_operation_ami_handler_thru_poa_collocated_ch::~be_visitor_operation_ami_handler_thru_poa_collocated_ch (void)
+{
+}
+
+int be_visitor_operation_ami_handler_thru_poa_collocated_ch::visit_operation (be_operation *node)
+{
+  TAO_OutStream *os; // output stream
+  be_type *bt;       // type node representing the return type
+
+  os = this->ctx_->stream ();
+  this->ctx_->node (node); // save the node
+
+  os->indent (); // start with the current indentation level
+
+  // every operation is declared virtual in the client code
+  *os << "virtual ";
+
+  // STEP I: generate the return type
+  bt = be_type::narrow_from_decl (node->return_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_sh::"
+                         "visit_operation - "
+                         "Bad return type\n"),
+                        -1);
+    }
+
+  // STEP 2: generate the operation name
+  *os << "void " << node->local_name ();
+
+  // STEP 3: generate the argument list with the appropriate mapping. For these
+  // we grab a visitor that generates the parameter listing
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CH);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_operation_sh::"
+                         "visit_operation - "
+                         "Bad visitor to return type\n"),
+                        -1);
+    }
+
+  if (node->accept (visitor) == -1)
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_sh::"
+                         "visit_operation - "
+                         "codegen for argument list failed\n"),
+                        -1);
+    }
+  delete visitor;
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_thru_poa_collocated_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_thru_poa_collocated_cs.cpp
new file mode 100644
index 00000000000..d9d86773fff
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_thru_poa_collocated_cs.cpp
@@ -0,0 +1,200 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_thru_poa_collocated_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for thru_poa_collocated Operation in the skeleton.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//    Michael Kircher
+//
+// ============================================================================
+
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
+
+#include "be_visitor_operation.h"
+
+ACE_RCSID(be_visitor_operation, ami_handler_thru_poa_collocated_cs, "$Id$")
+
+
+// *************************************************************************
+//  be_visitor_operation_ami_handler_thru_poa_collocated_cs --
+//  This visitor generates code for the thru_poa_collocated operation signature in a
+//  server skeletons file
+// *************************************************************************
+
+be_visitor_operation_ami_handler_thru_poa_collocated_cs::be_visitor_operation_ami_handler_thru_poa_collocated_cs
+(be_visitor_context *ctx)
+  : be_visitor_scope (ctx)
+{
+}
+
+be_visitor_operation_ami_handler_thru_poa_collocated_cs::~be_visitor_operation_ami_handler_thru_poa_collocated_cs (void)
+{
+}
+
+int be_visitor_operation_ami_handler_thru_poa_collocated_cs::visit_operation (be_operation *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // We need the interface node in which this operation was defined. However,
+  // if this operation node was an attribute node in disguise, we get this
+  // information from the context
+  be_interface *intf;
+  intf = this->ctx_->attribute ()
+    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
+    : be_interface::narrow_from_scope (node->defined_in ());
+
+  if (!intf)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_thru_poa_collocated_cs::"
+                         "visit_operation - "
+                         "bad interface scope\n"),
+                        -1);
+    }
+
+  // retrieve the operation return type
+  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_thru_poa_collocated_cs::"
+                         "visit_operation - "
+                         "Bad return type\n"),
+                        -1);
+    }
+
+
+
+  *os << "void " << intf->full_coll_name (be_interface::THRU_POA) << "::"
+      << node->local_name () << " ";
+
+  // Generate the argument list with the appropriate mapping (same as
+  // in the header file)
+  // Generate the argument list with the appropriate mapping (same as
+  // in the header file).
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CS);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if ((!visitor) || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_thru_poa_collocated_cs::"
+                         "visit_operation - "
+                         "codegen for argument list failed\n"),
+                        -1);
+    }
+  delete visitor;
+
+
+  *os << "{" << be_idt_nl;
+
+  // @@ Michael: Not sure about this one.
+#if 0  
+  if (!idl_global->exception_support ())
+      *os << "ACE_DECLARE_NEW_CORBA_ENV;" << be_nl;
+#endif /* 0 */
+
+  *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall ("
+      << be_idt << be_idt_nl
+      << "*this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()"
+      << be_uidt_nl
+      << ");" << be_uidt_nl
+      << "servant_upcall.prepare_for_upcall (" << be_idt << be_idt_nl
+      << "this->_object_key ()," << be_nl
+      << "\"" << node->original_local_name () << "\"";
+  if (!idl_global->exception_support ())
+    *os << "," << be_nl
+        << "ACE_TRY_ENV" << be_uidt_nl
+        << ");\n" << be_uidt;
+  else
+    *os << be_uidt_nl << ");\n" << be_uidt;
+
+  // check if there is an exception
+  if (!idl_global->exception_support ())
+    {
+      os->indent ();
+      *os << "ACE_CHECK;\n";
+    }
+
+  os->indent ();
+  *os << "ACE_reinterpret_cast (" << be_idt << be_idt_nl
+      << intf->full_skel_name () << "_ptr," << be_nl
+      << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl
+      << "\"" << intf->repoID ()  << "\"" << be_uidt_nl
+      << ")" << be_uidt << be_uidt_nl
+      << ")" << be_uidt;
+
+  if (this->gen_invoke (ctx, node) == -1)
+    return -1;
+
+  os->indent ();
+  *os << "return;";
+
+  *os << be_uidt_nl
+      << "}\n\n";
+
+  return 0;
+}
+
+int be_visitor_operation_ami_handler_thru_poa_collocated_cs::gen_invoke (be_visitor_context &ctx,
+                                                    be_operation *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  *os << "->" << node->local_name () << " ("
+      << be_idt << be_idt << "\n";
+
+  // retrieve the operation return type
+  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  if (!this->void_return_type (bt))
+    {
+      os->indent ();
+      *os << "_tao_retval,\n";
+    }
+
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_COLLOCATED_ARG_UPCALL_CS);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_thru_poa_collocated_cs::"
+                         "gen_invoke - "
+                         "codegen for making upcall failed\n"),
+                        -1);
+    }
+
+  // end the upcall
+  *os << be_uidt_nl
+      << ");\n" << be_uidt;
+  return 0;
+}
+
+
+int
+be_visitor_operation_ami_handler_thru_poa_collocated_cs::void_return_type (be_type *bt)
+{
+  // is the operation return type void?
+
+  if (bt->node_type () == AST_Decl::NT_pre_defined
+      && (be_predefined_type::narrow_from_decl (bt)->pt ()
+          == AST_PredefinedType::PT_void))
+    return 1;
+  else
+    return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
index a36fd00d9a4..c50bd87c007 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
@@ -61,6 +61,7 @@ be_visitor_operation_argument::post_process (be_decl *bd)
         case TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS:
           *os << ",\n";
           break;
+        case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_COLLOCATED_ARG_UPCALL_CS:          
         case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS:          
           {
             // @@ Michael
@@ -68,7 +69,8 @@ be_visitor_operation_argument::post_process (be_decl *bd)
             // print a comma for in arguments.
             // This is due to the concept of post processing,
             // which I was not able to prevent to be executed
-            // in the case of in arguments.
+            // in the case of in arguments. Post processing
+            // does always write a comma, though.
             be_argument *arg = this->ctx_->be_node_as_argument ();
             ACE_ASSERT (arg != 0);
             if (arg->direction () != AST_Argument::dir_IN)
@@ -105,7 +107,6 @@ be_visitor_operation_argument::visit_operation (be_operation *node)
         {
         case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
         case TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS:
-        case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS:
           // applicable only to these cases where the actual upcall is made 
 
           // last argument is the environment
@@ -115,6 +116,11 @@ be_visitor_operation_argument::visit_operation (be_operation *node)
           os->indent ();
           *os << "ACE_TRY_ENV";
           break;
+        case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_COLLOCATED_ARG_UPCALL_CS:
+        case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS:
+          os->indent ();
+          *os << "ACE_TRY_ENV";
+          break;          
         default:
           break;
         }
@@ -173,9 +179,6 @@ be_visitor_operation_argument::visit_argument (be_argument *node)
     case TAO_CodeGen::TAO_AMI_OPERATION_ARG_INVOKE_CS:
       ctx.state (TAO_CodeGen::TAO_AMI_ARGUMENT_INVOKE_CS);
       break;
-// @@ Michael    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_INVOKE_CS:
-//      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_INVOKE_CS);
-//      break;
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_CS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_POST_INVOKE_CS);
       break;
@@ -206,6 +209,9 @@ be_visitor_operation_argument::visit_argument (be_argument *node)
     case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS);
       break;
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_COLLOCATED_ARG_UPCALL_CS:
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_COLLOCATED_UPCALL_CS);
+      break;
     case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS:
       ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_UPCALL_CS);
       break;
@@ -215,9 +221,6 @@ be_visitor_operation_argument::visit_argument (be_argument *node)
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_MARSHAL_SS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_POST_MARSHAL_SS);
       break;
-    // case TAO_CodeGen::TAO_OPERATION_ARG_AMI:
-    //   ctx.state (TAO_CodeGen::TAO_ARGUMENT_AMI);
-    //   break;
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
index 700c11a34ed..756964eacbd 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
@@ -212,7 +212,7 @@ be_visitor_compiled_args_decl::visit_array (be_array *node)
     }
 
   // for anonymous arrays, the type name has a _ prepended. We compute
-  // the fullname with or without the underscore and use it later on.
+  // the full_name with or without the underscore and use it later on.
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
@@ -228,18 +228,18 @@ be_visitor_compiled_args_decl::visit_array (be_array *node)
         {
           be_decl *parent =
             be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
+          ACE_OS::sprintf (fname, "_%s", node->full_name ());
         }
     }
   else
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
+      ACE_OS::sprintf (fname, "%s", node->full_name ());
     }
 
   if (f->direction () != AST_Argument::dir_IN)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
index 771706f01af..86c35484097 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
@@ -50,7 +50,7 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node)
   if (node->exceptions ())
     {
       os->indent ();
-      *os << "static TAO_Exception_Data " << "_tao_" << node->flatname ()
+      *os << "static TAO_Exception_Data " << "_tao_" << node->flat_name ()
           << "_exceptiondata [] = " << be_nl;
       *os << "{" << be_idt_nl;
       // initialize an iterator to iterate thru the exception list
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
index 9db88553f3d..f55999f91f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
@@ -81,7 +81,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
                       -1);
 
   // Generate the scope::operation name.
-  *os << parent->fullname ()
+  *os << parent->full_name ()
       << "::"
       << "sendc_"
       << node->local_name ()->get_string ();
@@ -369,7 +369,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname () <<
+  *os << node->flat_name () <<
     "_paramdata [] = " << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -390,7 +390,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node,
     }
   *os << "\n";
   os->decr_indent ();
-  *os << "}; // " << node->flatname () << "_paramdata\n\n";
+  *os << "}; // " << node->flat_name () << "_paramdata\n\n";
 
   // Check if this operation raises any exceptions. In that case, we must
   // generate a list of exception typecodes. This is not valid for
@@ -423,7 +423,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname ()
+  *os << node->flat_name ()
       << "_calldata = " << be_nl
       << "{"
       << "\"";
@@ -461,7 +461,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname () << "_paramdata, ";
+  *os << node->flat_name () << "_paramdata, ";
 
       // insert exception list (if any) - node for attributes
   if (this->ctx_->attribute ())
@@ -471,7 +471,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node,
       if (node->exceptions ())
         {
           *os << node->exceptions ()->length ()
-              << ", _tao_" << node->flatname () << "_exceptiondata};\n\n";
+              << ", _tao_" << node->flat_name () << "_exceptiondata};\n\n";
         }
       else
         *os << "0, 0};\n\n";
@@ -537,7 +537,7 @@ be_interpretive_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
       else
         *os << "_get_";
     }
-  *os << node->flatname () << "_calldata," << be_nl
+  *os << node->flat_name () << "_calldata," << be_nl
       << "_tao_arguments" << be_uidt_nl
       << ");\n";
 
@@ -731,7 +731,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
     {
       if (node->exceptions ())
         {
-          *os << "_tao_call.invoke (_tao_" << node->flatname ()
+          *os << "_tao_call.invoke (_tao_" << node->flat_name ()
               << "_exceptiondata, "
               << node->exceptions ()->length ()
               << ", ACE_TRY_ENV);";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
index b992f6afc2f..a0cebee3569 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -404,7 +404,7 @@ be_interpretive_visitor_operation_cs::gen_pre_stub_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname () <<
+  *os << node->flat_name () <<
     "_paramdata [] = " << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -425,7 +425,7 @@ be_interpretive_visitor_operation_cs::gen_pre_stub_info (be_operation *node,
     }
   *os << "\n";
   os->decr_indent ();
-  *os << "}; // " << node->flatname () << "_paramdata\n\n";
+  *os << "}; // " << node->flat_name () << "_paramdata\n\n";
 
   // Check if this operation raises any exceptions. In that case, we must
   // generate a list of exception typecodes. This is not valid for
@@ -458,7 +458,7 @@ be_interpretive_visitor_operation_cs::gen_pre_stub_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname ()
+  *os << node->flat_name ()
       << "_calldata = " << be_nl
       << "{"
       << "\"";
@@ -471,7 +471,7 @@ be_interpretive_visitor_operation_cs::gen_pre_stub_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->original_local_name () << "\", ";
+  *os << node->local_name () << "\", ";
 
       // are we oneway or two operation?
   if (node->flags () == AST_Operation::OP_oneway)
@@ -496,7 +496,7 @@ be_interpretive_visitor_operation_cs::gen_pre_stub_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname () << "_paramdata, ";
+  *os << node->flat_name () << "_paramdata, ";
 
       // insert exception list (if any) - node for attributes
   if (this->ctx_->attribute ())
@@ -506,7 +506,7 @@ be_interpretive_visitor_operation_cs::gen_pre_stub_info (be_operation *node,
       if (node->exceptions ())
         {
           *os << node->exceptions ()->length ()
-              << ", _tao_" << node->flatname () << "_exceptiondata};\n\n";
+              << ", _tao_" << node->flat_name () << "_exceptiondata};\n\n";
         }
       else
         *os << "0, 0};\n\n";
@@ -572,7 +572,7 @@ be_interpretive_visitor_operation_cs::gen_marshal_and_invoke (be_operation
       else
         *os << "_get_";
     }
-  *os << node->flatname () << "_calldata," << be_nl
+  *os << node->flat_name () << "_calldata," << be_nl
       << "_tao_arguments" << be_uidt_nl
       << ");\n";
 
@@ -767,7 +767,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
     {
       if (node->exceptions ())
         {
-          *os << "_tao_call.invoke (_tao_" << node->flatname ()
+          *os << "_tao_call.invoke (_tao_" << node->flat_name ()
               << "_exceptiondata, "
               << node->exceptions ()->length ()
               << ", ACE_TRY_ENV);";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
index 67a50e5b36f..872dbd8a9f6 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
@@ -116,8 +116,9 @@ be_visitor_operation_ih::visit_operation (be_operation *node)
   delete visitor;
 
   //generate the exceptions that are thrown by the operation
-  //Don't have to do it here. It will be done as part of the argument list generatio
-  //this->gen_throw_spec (node);
+  this->gen_throw_spec (node);
+
+  *os << ";\n\n";
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
index 4e366f6ef46..82432bef649 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
@@ -90,12 +90,12 @@ be_visitor_operation_is::visit_operation (be_operation *node)
   delete visitor;
 
 
-  ACE_CString str(node->flatname ());
+  ACE_CString str(node->flat_name ());
 
 
   int lnmlength = ACE_OS::strlen (node->local_name ()->get_string ());
 
-  int fnmlength = ACE_OS::strlen (node->flatname ());
+  int fnmlength = ACE_OS::strlen (node->flat_name ());
   fnmlength--;
 
   char * classname =  str.substr (0,(fnmlength-lnmlength) ).rep ();
@@ -132,7 +132,7 @@ be_visitor_operation_is::visit_operation (be_operation *node)
   delete visitor;
 
   //generate the excetions thrown by the operation
-  //  this->gen_throw_spec (node);
+  this->gen_throw_spec (node);
 
   *os <<be_idt_nl << "{"<<be_idt_nl;
   *os << "//Add your implementation here"<<be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index d4ac4d925ed..172fe6e66a2 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -406,7 +406,7 @@ be_interpretive_visitor_operation_ss::gen_pre_skel_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname () <<
+  *os << node->flat_name () <<
     "_paramdata [] = " << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -427,7 +427,7 @@ be_interpretive_visitor_operation_ss::gen_pre_skel_info (be_operation *node,
     }
   *os << "\n";
   os->decr_indent ();
-  *os << "}; // " << node->flatname () << "_paramdata\n\n";
+  *os << "}; // " << node->flat_name () << "_paramdata\n\n";
 
   // now generate the calldata table
   os->indent ();
@@ -441,7 +441,7 @@ be_interpretive_visitor_operation_ss::gen_pre_skel_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname ()
+  *os << node->flat_name ()
       << "_calldata = " << be_nl
       << "{"
       << "\"";
@@ -479,7 +479,7 @@ be_interpretive_visitor_operation_ss::gen_pre_skel_info (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname () << "_paramdata};\n\n";
+  *os << node->flat_name () << "_paramdata};\n\n";
 
   return 0;
 }
@@ -506,7 +506,7 @@ be_interpretive_visitor_operation_ss::gen_demarshal_params (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname () << "_calldata,\n";
+  *os << node->flat_name () << "_calldata,\n";
 
   // pass the appropriate return value to the demarshal operation
   ctx = *this->ctx_;
@@ -572,7 +572,7 @@ be_interpretive_visitor_operation_ss::gen_marshal_params (be_operation *node,
       else
         *os << "_get_";
     }
-  *os << node->flatname () << "_calldata,\n";
+  *os << node->flat_name () << "_calldata,\n";
 
   // pass the appropriate return value to the marshal operation
   ctx = *this->ctx_;
diff --git a/TAO/TAO_IDL/be/be_visitor_rettype.cpp b/TAO/TAO_IDL/be/be_visitor_rettype.cpp
index eb1cf5095d9..623a95e3e0a 100644
--- a/TAO/TAO_IDL/be/be_visitor_rettype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_rettype.cpp
@@ -79,7 +79,7 @@ be_visitor_rettype_ami_handler_result_arg::visit_type (be_type *node)
   os->indent (); // start from current indentation level
 
   // generate the typecode information here
-  *os << "static const CORBA::Long _oc_" << node->flatname () << "[] ="
+  *os << "static const CORBA::Long _oc_" << node->flat_name () << "[] ="
       << be_nl;
   *os << "{" << be_idt << "\n";
 
@@ -102,7 +102,7 @@ be_visitor_rettype_ami_handler_result_arg::visit_type (be_type *node)
     }
   *os << be_uidt << "};" << be_nl;
 
-  *os << "static CORBA::TypeCode _tc_TAO_tc_" << node->flatname ()
+  *os << "static CORBA::TypeCode _tc_TAO_tc_" << node->flat_name ()
       << " (";
   switch (node->node_type ())
     {
@@ -134,8 +134,8 @@ be_visitor_rettype_ami_handler_result_arg::visit_type (be_type *node)
       return -1; // error
     }
 
-  *os << ", sizeof (_oc_" <<  node->flatname ()
-      << "), (char *) &_oc_" << node->flatname ()
+  *os << ", sizeof (_oc_" <<  node->flat_name ()
+      << "), (char *) &_oc_" << node->flat_name ()
       << ", 0, sizeof (" << node->name () << "));" << be_nl;
 
   // is our enclosing scope a module? We need this check because for
@@ -155,7 +155,7 @@ be_visitor_rettype_ami_handler_result_arg::visit_type (be_type *node)
         }
       *os << "TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_"
           << node->local_name () << ", &_tc_TAO_tc_"
-          << node->flatname () << ")" << be_nl;
+          << node->flat_name () << ")" << be_nl;
       if (this->gen_nested_namespace_end (module) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -168,7 +168,7 @@ be_visitor_rettype_ami_handler_result_arg::visit_type (be_type *node)
     {
       // outermost scope.
       *os << "CORBA::TypeCode_ptr " << node->tc_name () << " = &_tc_TAO_tc_"
-          <<  node->flatname () << ";\n\n";
+          <<  node->flat_name () << ";\n\n";
     }
   return 0;
 }
@@ -3007,8 +3007,8 @@ queue_lookup (ACE_Unbounded_Queue <be_visitor_typecode_defn::QNode *> &queue,
       iter.next (addr);
       item = *addr;
 
-      if (!ACE_OS::strcmp (item->node->fullname (),
-                           node->fullname ()))
+      if (!ACE_OS::strcmp (item->node->full_name (),
+                           node->full_name ()))
         {
           // found
           return item;
diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp
index f2fb9d62921..17fb8e2c918 100644
--- a/TAO/TAO_IDL/be/be_visitor_scope.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_scope.cpp
@@ -70,12 +70,11 @@ be_visitor_scope::visit_scope (be_scope *node)
                                  "bad node in this scope\n"), -1);
 
             }
-
           be_decl *bd = be_decl::narrow_from_decl (d);
-
           // set the scope node as "node" in which the code is being
           // generated so that elements in the node's scope can use it
           // for code generation
+
           this->ctx_->scope (node->decl ());
 
           // set the node to be visited
@@ -119,7 +118,7 @@ be_visitor_scope::visit_scope (be_scope *node)
   // For debugging the prefix...
   be_decl* decl = node->decl ();
   ACE_DEBUG ((LM_DEBUG, "Enter scope <%s> : [%s]\n",
-              decl->fullname (), decl->prefix ()));
+              decl->full_name (), decl->prefix ()));
   if (decl->pragmas () != 0)
     {
       for (UTL_StrlistActiveIterator i(decl->pragmas ());
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
index 531cf49e1c2..f1223cd7642 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
@@ -51,13 +51,13 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
 
   // generate the Any <<= and >>= operators
   os->indent ();
-  *os << "void " << idl_global->stub_export_macro ()
+  *os << "void " << idl_global->export_macro ()
       << " operator<<= (CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
-  *os << "void " << idl_global->stub_export_macro ()
+  *os << "void " << idl_global->export_macro ()
       << " operator<<= (CORBA::Any &, " << node->name ()
       << "*); // noncopying version" << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>>= (const CORBA::Any &, "
       << node->name () << " *&);\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
index fd72bd07aa9..773a7f26d73 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
@@ -50,35 +50,18 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // generate the CDR << and >> operator declarations
-
-  be_type *bt = be_type::narrow_from_decl (node);
-  be_typedef *tdef = be_typedef::narrow_from_decl (bt);
-
-  // If we're an anonymous sequence, we must protect against
-  // being declared more than once.
-  if (!tdef)
-    {
-      *os << "\n#if !defined _TAO_CDR_OP_" 
-          << node->flatname () << "_H_" << be_nl
-          << "#define _TAO_CDR_OP_" << node->flatname () << "_H_\n\n";
-    }
-
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  os->indent ();
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &," << be_nl
       << "const " << node->name () << " &" << be_uidt_nl
       << ");" << be_uidt_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>> (" << be_idt << be_idt_nl
       << "TAO_InputCDR &," << be_nl
       << node->name () << " &" << be_uidt_nl
       << ");" << be_uidt << "\n\n";
 
-  if (!tdef)
-    {
-      *os << "#endif /* _TAO_CDR_OP_" 
-          << node->flatname () << "_H_ */\n\n";
-    }
 
   node->cli_hdr_cdr_op_gen (1);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp
index 2cc13a9f049..c2da5f9d78d 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp
@@ -55,35 +55,18 @@ be_visitor_sequence_cdr_op_ci::visit_sequence (be_sequence *node)
   // save all that time to generate them inline and this breaks
   // the dependencies for recursive types.
 
-  be_type *bt = be_type::narrow_from_decl (node);
-  be_typedef *tdef = be_typedef::narrow_from_decl (bt);
-
-  // If we're an anonymous sequence, we must protect against
-  // being declared more than once.
-  if (!tdef)
-    {
-      *os << "\n#if !defined _TAO_CDR_OP_" 
-          << node->flatname () << "_I_" << be_nl
-          << "#define _TAO_CDR_OP_" << node->flatname () << "_I_\n\n";
-    }
-
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  os->indent ();
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &," << be_nl
       << "const " << node->name () << " &" << be_uidt_nl
       << ");" << be_uidt_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>> (" << be_idt << be_idt_nl
       << "TAO_InputCDR &," << be_nl
       << node->name () << " &" << be_uidt_nl
       << ");" << be_uidt << "\n\n";
 
-  if (!tdef)
-    {
-      *os << "#endif /* _TAO_CDR_OP_" 
-          << node->flatname () << "_I_ */\n\n";
-    }
-
   node->cli_inline_cdr_op_gen (1);
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index f5baff48ba0..63a7cde5c2c 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -75,17 +75,6 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       // save the sequence node for further use
       this->ctx_->node (node);
 
-      be_typedef *tdef = be_typedef::narrow_from_decl (bt);
-
-      // If we're an anonymous sequence, we must protect against
-      // being declared more than once.
-      if (!tdef)
-        {
-          *os << "\n#if !defined _TAO_CDR_OP_" 
-              << node->flatname () << "_CPP_" << be_nl
-              << "#define _TAO_CDR_OP_" << node->flatname () << "_CPP_\n\n";
-        }
-
       //  set the sub state as generating code for the output operator
       this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
       *os << "CORBA::Boolean operator<< (" << be_idt << be_idt_nl
@@ -175,12 +164,6 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
           << "return 0; // error" << be_uidt_nl
           << "}\n\n";
 
-      if (!tdef)
-        {
-          *os << "#endif /* _TAO_CDR_OP_" 
-              << node->flatname () << "_CPP_ */\n\n";
-        }
-
       node->cli_stub_cdr_op_gen (1);
     }
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
index 8f4c05ee2a1..c98182f2f24 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
@@ -63,7 +63,7 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
   if (node->is_nested ())
     {
       ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
                        class_name);
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
index 8ff1a215796..3e21c77dc46 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
@@ -63,7 +63,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
   if (node->is_nested ())
     {
       ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
                        class_name);
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp
index 167d7a4b79c..7a6528965b2 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp
@@ -64,7 +64,7 @@ be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node)
   if (node->is_nested ())
     {
       ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
                        class_name);
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp
index 0b72e049306..6b9a02512ce 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp
@@ -64,7 +64,7 @@ be_visitor_sequence_cs::gen_bounded_sequence (be_sequence *node)
   if (node->is_nested ())
     {
       ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
                        class_name);
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp
index bc74e1f12de..1ca16ecb0a3 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp
@@ -52,7 +52,7 @@ be_visitor_sequence_ci::gen_bounded_str_sequence (be_sequence *node)
   if (node->is_nested ())
     {
       ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
                        class_name);
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp
index 07a34995988..c93c81acee2 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp
@@ -52,7 +52,7 @@ be_visitor_sequence_cs::gen_bounded_str_sequence (be_sequence *node)
   if (node->is_nested ())
     {
       ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
                        class_name);
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
index 16d8728477c..699d35a414e 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
@@ -66,7 +66,7 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
   if (node->is_nested ())
     {
       ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
                        class_name);
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
index b42030ec7ab..8be7242f7ce 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
@@ -66,7 +66,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
   if (node->is_nested ())
     {
       ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
                        class_name);
     }
   else
@@ -93,8 +93,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
       << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl
       << "{" << be_idt_nl;
   pt->accept(visitor);
-  *os <<" **tmp = 0;" << be_nl
-      << "tmp = " << full_class_name << "::allocbuf (length);" << be_nl
+  *os <<" **tmp = " << full_class_name << "::allocbuf (length);" << be_nl
       << be_nl
       << "if (this->buffer_ != 0)" << be_nl
       << "{" << be_idt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp
index 9348769b863..954525463c6 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp
@@ -65,7 +65,7 @@ be_visitor_sequence_ci::gen_unbounded_sequence (be_sequence *node)
   if (node->is_nested ())
     {
       ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
                        class_name);
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp
index 93c7138ba1a..8e8359db59d 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp
@@ -65,7 +65,7 @@ be_visitor_sequence_cs::gen_unbounded_sequence (be_sequence *node)
   if (node->is_nested ())
     {
       ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
                        class_name);
     }
   else
@@ -92,8 +92,7 @@ be_visitor_sequence_cs::gen_unbounded_sequence (be_sequence *node)
       << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl
       << "{" << be_idt_nl;
   pt->accept (visitor);
-  *os << "* tmp = 0;" << be_nl
-      << "tmp = " << full_class_name << "::allocbuf (length);" << be_nl
+  *os <<"* tmp = " << full_class_name << "::allocbuf (length);" << be_nl
       << be_nl
       << "if (this->buffer_ != 0)" << be_nl
       << "{" << be_idt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index 4afb9114834..bcccd41dfd2 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -130,7 +130,7 @@ be_visitor_sequence_ch::gen_base_sequence_class (be_sequence *node)
           *os << ", " << node->max_size () << ">";
         }
     }
-
+ 
   os->gen_endif_AHETI();
 
   return 0;
@@ -164,7 +164,7 @@ be_visitor_sequence_ch::instantiate_sequence (be_sequence *node)
     case be_sequence::MNG_STRING: // sequence of strings
       if (!node->unbounded ())
         this->gen_bounded_str_sequence (node);
-      // else
+      // else 
       //   inheriting from the right class is enough
       break;
     default: // not a managed type
@@ -176,9 +176,9 @@ be_visitor_sequence_ch::instantiate_sequence (be_sequence *node)
 	  be_predefined_type *predef = 0;
 	  if (bt->base_node_type () == AST_Type::NT_pre_defined)
 	    {
-	      be_typedef* alias =
+	      be_typedef* alias = 
 		be_typedef::narrow_from_decl (bt);
-
+	      
 	      if (alias == 0)
 		{
 		  predef =
@@ -199,7 +199,7 @@ be_visitor_sequence_ch::instantiate_sequence (be_sequence *node)
 	    this->gen_unbounded_sequence (node);
 #else
 	  // @@ This needs to be fixed. (Michael)
-	  be_predefined_type * bpt =
+	  be_predefined_type * bpt = 
 	    be_predefined_type::narrow_from_decl (node->base_type());
 	  if (bpt)
 	    {
@@ -249,7 +249,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
   // end of instantiation
 
   // generate the ifdefined macro for the sequence type
-  os->gen_ifdef_macro (node->flatname ());
+  os->gen_ifdef_macro (node->flat_name ());
 
   os->indent (); // start with the current indentation level
 
@@ -271,7 +271,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
       << be_nl << be_nl;
 
   // generate a typedef to a parametrized sequence
-  *os << "class " << idl_global->stub_export_macro ()
+  *os << "class " << idl_global->export_macro ()
       << " " << node->local_name () << " : public ";
 
   if (this->gen_base_sequence_class (node) == -1)
@@ -332,7 +332,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
   be_predefined_type *predef = 0;
   if (bt->base_node_type () == AST_Type::NT_pre_defined)
     {
-      be_typedef* alias =
+      be_typedef* alias = 
 	be_typedef::narrow_from_decl (bt);
 
       if (alias == 0)
@@ -390,7 +390,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
   os->gen_endif (); // endif macro
 
   // generate the ifdefined macro for the var type
-  os->gen_ifdef_macro (node->flatname (), "_var");
+  os->gen_ifdef_macro (node->flat_name (), "_var");
 
   // generate the var and out types
   if (this->gen_var_defn (node) == -1)
@@ -404,7 +404,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
   os->gen_endif ();
 
   // generate the ifdefined macro for the _out type
-  os->gen_ifdef_macro (node->flatname (), "_out");
+  os->gen_ifdef_macro (node->flat_name (), "_out");
 
   if (this->gen_out_defn (node) == -1)
     {
@@ -454,7 +454,7 @@ be_visitor_sequence_ch::gen_var_defn (be_sequence *node)
   // for over here.
 
   os->indent (); // start with whatever was our current indent level
-  *os << "class " << idl_global->stub_export_macro ()
+  *os << "class " << idl_global->export_macro ()
       << " " << namebuf << be_nl;
   *os << "{" << be_nl;
   *os << "public:\n";
@@ -563,7 +563,7 @@ be_visitor_sequence_ch::gen_out_defn (be_sequence *node)
   // generate the out definition (always in the client header)
   os->indent (); // start with whatever was our current indent level
 
-  *os << "class " << idl_global->stub_export_macro () << " "
+  *os << "class " << idl_global->export_macro () << " "
       << namebuf << be_nl;
   *os << "{" << be_nl;
   *os << "public:\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
index d30852ffa11..54e6a1d3c44 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
@@ -63,7 +63,7 @@ be_visitor_sequence_ci::visit_sequence (be_sequence *node)
   // end of instantiation
 
   // generate the ifdefined macro for the sequence type
-  os->gen_ifdef_macro (node->flatname ());
+  os->gen_ifdef_macro (node->flat_name ());
 
   // all we do is generate the _var and _out implementations
   if (this->gen_var_impl (node) == -1)
@@ -180,7 +180,7 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
 
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", node->fullname ());
+  ACE_OS::sprintf (fname, "%s_var", node->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   ACE_OS::sprintf (lname, "%s_var", node->local_name ()->get_string ());
@@ -420,7 +420,7 @@ be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
 
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", node->fullname ());
+  ACE_OS::sprintf (fname, "%s_out", node->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   ACE_OS::sprintf (lname, "%s_out", node->local_name ()->get_string ());
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
index d74ffea45d1..254bfed4526 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -162,7 +162,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
   // end of instantiation
 
   // generate the ifdefined macro for the sequence type
-  os->gen_ifdef_macro (node->flatname ());
+  os->gen_ifdef_macro (node->flat_name ());
 
   os->indent (); // start with the current indentation level
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
index 7ece072b5f7..34b3f3210d3 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
@@ -51,13 +51,13 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
 
   // generate the Any <<= and >>= operator declarations
   os->indent ();
-  *os << "void " << idl_global->stub_export_macro ()
+  *os << "void " << idl_global->export_macro ()
       << " operator<<= (CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
-  *os << "void " << idl_global->stub_export_macro ()
+  *os << "void " << idl_global->export_macro ()
       << " operator<<= (CORBA::Any &, " << node->name ()
       << "*); // noncopying version" << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>>= (const CORBA::Any &, "
       << node->name () << " *&);\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
index 5f77c18f62c..a5313415f80 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
@@ -51,10 +51,10 @@ be_visitor_structure_cdr_op_ch::visit_structure (be_structure *node)
 
   // generate the CDR << and >> operator declarations
   os->indent ();
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator<< (TAO_OutputCDR &, const " << node->name ()
       << " &);" << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>> (TAO_InputCDR &, "
       << node->name () << " &);\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ci.cpp
index b3fc996b4cd..24941e54591 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ci.cpp
@@ -133,8 +133,7 @@ be_visitor_structure_cdr_op_ci::post_process (be_decl *bd)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  if (!this->last_node (bd) 
-      && bd->node_type () != AST_Decl::NT_enum_val)
+  if (!this->last_node (bd))
     {
       switch (this->ctx_->sub_state ())
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
index f61809509c0..f9ce9cb68e2 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
@@ -51,7 +51,7 @@ int be_visitor_structure_ch::visit_structure (be_structure *node)
       os = this->ctx_->stream ();
 
       os->indent (); // start from whatever indentation level we were at
-      *os << "struct " << idl_global->stub_export_macro () << " "
+      *os << "struct " << idl_global->export_macro () << " "
           << node->local_name () << be_nl
           << "{" << be_idt << "\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
index 489ea7f3285..90db4fab104 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
@@ -73,7 +73,7 @@ be_visitor_typecode_decl::visit_type (be_type *node)
     {
       // we are in the ROOT scope
       os->indent ();
-      *os << "extern " << idl_global->stub_export_macro () << " CORBA::TypeCode_ptr "
+      *os << "extern " << idl_global->export_macro () << " CORBA::TypeCode_ptr "
           << " " << node->tc_name (prefix, postfix)->last_component () << ";\n\n";
     }
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index 79fd133600f..a99d30f2df8 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -101,6 +101,11 @@ be_visitor_typecode_defn::visit_type (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
+  char *flat_name = 0;
+  node->compute_flat_name ("AMI_", 
+                           "_Handler", 
+                           flat_name);
+
   // reset the queue
   this->queue_reset (this->tc_queue_);
   this->tc_offset_ = 0;
@@ -127,9 +132,9 @@ be_visitor_typecode_defn::visit_type (be_type *node)
     
   // Flat name generation.
   if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
-    *os << node->compute_flatname ("AMI_", "_Handler");
+    *os << flat_name;
   else
-    *os << node->flatname ();
+    *os << node->flat_name ();
 
   *os << "[] =" << be_nl;
   *os << "{" << be_idt << "\n";
@@ -161,9 +166,9 @@ be_visitor_typecode_defn::visit_type (be_type *node)
 
   // Flat name generation.
   if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
-    *os << node->compute_flatname ("AMI_", "_Handler");
+    *os << flat_name;
   else
-    *os << node->flatname ();
+    *os << node->flat_name ();
   
   *os << " (";
   
@@ -201,17 +206,17 @@ be_visitor_typecode_defn::visit_type (be_type *node)
   
   // Flat name generation.
   if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
-    *os <<  node->compute_flatname ("AMI_", "_Handler");
+    *os << flat_name;
   else
-    *os <<  node->flatname ();
+    *os <<  node->flat_name ();
   
   *os << "), (char *) &_oc_";
 
   // Flat name generation.
   if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN) 
-    *os <<  node->compute_flatname ("AMI_", "_Handler");
+    *os << flat_name;
   else
-    *os <<  node->flatname ();
+    *os <<  node->flat_name ();
   
   // Name generation.
   if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
@@ -246,9 +251,9 @@ be_visitor_typecode_defn::visit_type (be_type *node)
 
       // Flat name generation.
       if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
-        *os << node->compute_flatname ("AMI_", "_Handler");
+        *os << flat_name;
       else
-        *os << node->flatname ();
+        *os << node->flat_name ();
 
       *os << ")" << be_nl;
       
@@ -275,12 +280,14 @@ be_visitor_typecode_defn::visit_type (be_type *node)
 
       // Flat name generation.
       if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN) 
-        *os <<  node->compute_flatname ("AMI_", "_Handler");
+        *os << flat_name;
       else
-        *os <<  node->flatname ();
+        *os <<  node->flat_name ();
       
       *os << ";\n\n";
     }
+
+  delete [] flat_name;
   return 0;
 }
 
@@ -2839,6 +2846,11 @@ be_visitor_typecode_defn::gen_repoID (be_decl *node)
   TAO_OutStream *os = this->ctx_->stream ();
   int flag = 0;
 
+  char *repoID = 0;
+  node->compute_repoID ("AMI_", 
+                        "_Handler", 
+                        repoID);
+
   // check if we want to generate optimized typecodes. In such a case, there is
   // no need to generate the repoID (unless we are an object reference or an
   // exception in which case it is mandatory to have the repository ID)
@@ -2878,7 +2890,7 @@ be_visitor_typecode_defn::gen_repoID (be_decl *node)
       
       // repoID generation.
       if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
-        *os << node->compute_repoID ("AMI_", "_Handler");
+        *os << repoID;
       else
         *os << node->repoID ();
       
@@ -2890,14 +2902,14 @@ be_visitor_typecode_defn::gen_repoID (be_decl *node)
       // Unoptimized case.
       
       if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
-        *os << (ACE_OS::strlen (node->compute_repoID ("AMI_", "_Handler")) + 1) << ", ";
+        *os << (ACE_OS::strlen (repoID) + 1) << ", ";
       else
         *os << (ACE_OS::strlen (node->repoID ()) + 1) << ", ";
       
       ACE_CDR::ULong *arr, i, arrlen;
 
       if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
-        (void) this->tc_name2long (node->compute_repoID ("AMI_", "_Handler"), arr, arrlen);
+        (void) this->tc_name2long (repoID, arr, arrlen);
       else
         (void) this->tc_name2long (node->repoID (), arr, arrlen);
 
@@ -2908,7 +2920,7 @@ be_visitor_typecode_defn::gen_repoID (be_decl *node)
       
       // Comment.
       if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
-        *os << " // repository ID = " << node->compute_repoID ("AMI_", "_Handler");
+        *os << " // repository ID = " << repoID;
       else
         *os << " // repository ID = " << node->repoID ();
 
@@ -2916,6 +2928,9 @@ be_visitor_typecode_defn::gen_repoID (be_decl *node)
       this->tc_offset_ += (arrlen + 1) * sizeof (ACE_CDR::ULong);
     }
   *os << "\n";
+
+  delete repoID;
+
   return;
 }
 
@@ -3136,8 +3151,8 @@ queue_lookup (ACE_Unbounded_Queue <be_visitor_typecode_defn::QNode *> &queue,
       iter.next (addr);
       item = *addr;
 
-      if (!ACE_OS::strcmp (item->node->fullname (),
-                           node->fullname ()))
+      if (!ACE_OS::strcmp (item->node->full_name (),
+                           node->full_name ()))
         {
           // found
           return item;
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
index 392af049873..f743a905db8 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
@@ -51,13 +51,13 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
 
   // generate the Any <<= and >>= operator declarations
   os->indent ();
-  *os << "void " << idl_global->stub_export_macro ()
+  *os << "void " << idl_global->export_macro ()
       << " operator<<= (CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
-  *os << "void " << idl_global->stub_export_macro ()
+  *os << "void " << idl_global->export_macro ()
       << " operator<<= (CORBA::Any &, " << node->name ()
       << "*); // noncopying version" << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>>= (const CORBA::Any &, "
       << node->name () << " *&);\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
index ed9b70a4b94..01173b46b6d 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
@@ -51,10 +51,10 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node)
 
   // generate the CDR << and >> operator declarations
   os->indent ();
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator<< (TAO_OutputCDR &, const " << node->name ()
       << " &); // " << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>> (TAO_InputCDR &, "
       << node->name () << " &);\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp
index 017b0e00ac3..3465da85363 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp
@@ -68,33 +68,9 @@ be_visitor_union_cdr_op_ci::visit_union (be_union *node)
       << "TAO_OutputCDR &strm," << be_nl
       << "const " << node->name () << " &_tao_union" << be_uidt_nl
       << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  switch (node->udisc_type ())
-    {
-      case AST_Expression::EV_bool:
-        *os << "CORBA_Any::from_boolean tmp (_tao_union._d ());" << be_nl
-            << "if ( !(strm << tmp) )" << be_idt_nl;
-        break;
-
-      case AST_Expression::EV_char:
-        *os << "CORBA_Any::from_char tmp (_tao_union._d ());" << be_nl
-            << "if ( !(strm << tmp) )" << be_idt_nl;
-        break;
-
-      case AST_Expression::EV_wchar:
-        *os << "CORBA_Any::from_wchar tmp (_tao_union._d ());" << be_nl
-            << "if ( !(strm << tmp) )" << be_idt_nl;
-        break;
-
-      default:
-        *os << "if ( !(strm << _tao_union._d ()) )" << be_idt_nl;
-        break;
-    }
-
-  *os << "{" << be_idt_nl
+      << "{" << be_idt_nl
+      << "if (!(strm << _tao_union._d ()))" << be_idt_nl
       << "return 0;" << be_uidt_nl
-      << "}" << be_uidt_nl
       << "CORBA::Boolean result = 0;" << be_nl
       << "switch (_tao_union._d ())" << be_nl
       << "{" << be_idt_nl;
@@ -106,21 +82,6 @@ be_visitor_union_cdr_op_ci::visit_union (be_union *node)
                          "visit_union - "
                          "codegen for scope failed\n"), -1);
     }
-
-  // If there is no explicit default case, but there
-  // is an implicit one, and the discriminant is an enum,
-  // we need this to avert warnings in some compilers that
-  // not all case values are included. If there is no
-  // implicit default case, or the discriminator is not
-  // an enum, this does no harm.
-  if (node->default_index () == -1)
-    {
-      os->decr_indent (0);
-      *os << "default:" << be_nl;
-      os->incr_indent ();
-      *os << "break;";
-    }
-
   *os << be_uidt_nl << "}" << be_nl
       << "return result;" << be_uidt_nl
       << "}\n\n";
@@ -137,34 +98,10 @@ be_visitor_union_cdr_op_ci::visit_union (be_union *node)
     be_type::narrow_from_decl (node->disc_type ());
 
   // Generate a temporary to store the discriminant
-  *os << disc_type->fullname ()
-      << " " << "_tao_discriminant;" << be_nl;
-
-  switch (node->udisc_type ())
-    {
-      case AST_Expression::EV_bool:
-        *os << "CORBA_Any::to_boolean tmp (_tao_discriminant);" << be_nl
-            << "if ( !(strm >> tmp) )" << be_idt_nl;
-        break;
-
-      case AST_Expression::EV_char:
-        *os << "CORBA_Any::to_char tmp (_tao_discriminant);" << be_nl
-            << "if ( !(strm >> tmp) )" << be_idt_nl;
-        break;
-
-      case AST_Expression::EV_wchar:
-        *os << "CORBA_Any::to_wchar tmp (_tao_discriminant);" << be_nl
-            << "if ( !(strm >> tmp) )" << be_idt_nl;
-        break;
-
-      default:
-        *os << "if ( !(strm >> _tao_discriminant) )" << be_idt_nl;
-        break;
-    }
-
-  *os << "{" << be_idt_nl
+  *os << disc_type->full_name ()
+      << " " << "_tao_discriminant;" << be_nl
+      << "if ( !(strm >> _tao_discriminant) )" << be_idt_nl
       << "return 0;" << be_uidt_nl
-      << "}" << be_uidt_nl
       << "CORBA::Boolean result = 0;" << be_nl
       << "switch (_tao_discriminant)" << be_nl
       << "{" << be_idt_nl;
@@ -177,20 +114,6 @@ be_visitor_union_cdr_op_ci::visit_union (be_union *node)
                          "codegen for scope failed\n"), -1);
     }
 
-  // If there is no explicit default case, but there
-  // is an implicit one, and the discriminant is an enum,
-  // we need this to avert warnings in some compilers that
-  // not all case values are included. If there is no
-  // implicit default case, or the discriminator is not
-  // an enum, this does no harm.
-  if (node->default_index () == -1)
-    {
-      os->decr_indent (0);
-      *os << "default:" << be_nl;
-      os->incr_indent ();
-      *os << "break;";
-    }
-
   *os << be_uidt_nl << "}" << be_nl
       << "return result;" << be_uidt_nl
       << "}\n\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
index e2a13a2553f..6b7f6feb914 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
@@ -58,9 +58,9 @@ int be_visitor_union_ch::visit_union (be_union *node)
       os = this->ctx_->stream ();
 
       // generate the ifdefined macro for the union type
-      os->gen_ifdef_macro (node->flatname ());
+      os->gen_ifdef_macro (node->flat_name ());
       os->indent (); // start with the current indentation level
-      *os << "class " << idl_global->stub_export_macro () << " "
+      *os << "class " << idl_global->export_macro () << " "
           << node->local_name () << ": public TAO_Base_Union " << be_nl
           << "{" << be_nl
           << "public:" << be_idt_nl
@@ -199,7 +199,7 @@ int be_visitor_union_ch::visit_union (be_union *node)
       os->gen_endif ();
 
       // generate the ifdefined macro for the _var type
-      os->gen_ifdef_macro (node->flatname (), "_var");
+      os->gen_ifdef_macro (node->flat_name (), "_var");
       // generate var defn
       if (node->gen_var_defn () == -1)
         {
@@ -211,7 +211,7 @@ int be_visitor_union_ch::visit_union (be_union *node)
       os->gen_endif ();
 
       // generate the ifdefined macro for the array type
-      os->gen_ifdef_macro (node->flatname (), "_out");
+      os->gen_ifdef_macro (node->flat_name (), "_out");
       // a class is generated for an out defn only for a variable length struct
       if (node->size_type () == be_decl::VARIABLE)
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
index 8790e6a339b..d4327d785a9 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
@@ -131,7 +131,7 @@ int be_visitor_union_ci::visit_union (be_union *node)
         }
 
       // generate the ifdefined macro for the array type
-      os->gen_ifdef_macro (node->flatname (), "_var");
+      os->gen_ifdef_macro (node->flat_name (), "_var");
       if (node->gen_var_impl () == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -143,7 +143,7 @@ int be_visitor_union_ci::visit_union (be_union *node)
 
       // generate the ifdefined macro for the array type then generate the _out
       // impl
-      os->gen_ifdef_macro (node->flatname (), "_out");
+      os->gen_ifdef_macro (node->flat_name (), "_out");
       if (node->size_type () == be_decl::VARIABLE
           && node->gen_out_impl () == -1)
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
index ebd1d84b68e..d739655b4f2 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -133,19 +133,6 @@ int be_visitor_union_cs::visit_union (be_union *node)
                              "codegen for copy ctor failed\n"), -1);
         }
 
-      // If there is no explicit default case, but there
-      // is an implicit one, and the discriminant is an enum,
-      // we need this to avert warnings in some compilers that
-      // not all case values are included. If there is no
-      // implicit default case, or the discriminator is not
-      // an enum, this does no harm.
-      if (node->default_index () == -1)
-        {
-          os->indent ();
-          *os << "default:" << be_nl
-              << "break;" << be_uidt_nl;
-        }
-
       os->decr_indent ();
       *os << "}\n";
       os->decr_indent ();
@@ -176,19 +163,6 @@ int be_visitor_union_cs::visit_union (be_union *node)
                              "codegen for assign op failed\n"), -1);
         }
 
-      // If there is no explicit default case, but there
-      // is an implicit one, and the discriminant is an enum,
-      // we need this to avert warnings in some compilers that
-      // not all case values are included. If there is no
-      // implicit default case, or the discriminator is not
-      // an enum, this does no harm.
-      if (node->default_index () == -1)
-        {
-          os->indent ();
-          *os << "default:" << be_nl
-              << "break;" << be_uidt_nl;
-        }
-
       os->decr_indent ();
       *os << "}" << be_nl;
       *os << "return *this;\n";
@@ -200,7 +174,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
       os->indent ();
       *os << "// reset method to reset old values of a union" << be_nl;
       *os << "void " << node->name () << "::_reset (" << bt->name ()
-          << ", CORBA::Boolean /*finalize*/)" << be_nl;
+          << ", CORBA::Boolean finalize)" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "switch (this->disc_)" << be_nl;
       *os << "{" << be_idt_nl;
@@ -212,20 +186,6 @@ int be_visitor_union_cs::visit_union (be_union *node)
                              "codegen for reset failed\n"), -1);
         }
 
-      // If there is no explicit default case, but there
-      // is an implicit one, and the discriminant is an enum,
-      // we need this to avert warnings in some compilers that
-      // not all case values are included. If there is no
-      // implicit default case, or the discriminator is not
-      // an enum, this does no harm.
-      if (node->default_index () == -1)
-        {
-          os->decr_indent (0);
-          *os << "default:" << be_nl;
-          os->incr_indent ();
-          *os << "break;";
-        }
-
       *os << be_uidt_nl << "}" << be_uidt_nl
           << "}\n\n";
 
@@ -233,7 +193,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
       os->indent ();
       *os << "// the virtual overloaded access method" << be_nl;
       *os << "void *" << node->name () << "::_access ("
-          << "CORBA::Boolean alloc_flag)" << be_nl;
+          << " CORBA::Boolean alloc_flag)" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "switch (this->disc_)" << be_nl;
       *os << "{" << be_idt_nl;
@@ -246,22 +206,9 @@ int be_visitor_union_cs::visit_union (be_union *node)
                              "codegen for access failed\n"), -1);
         }
 
-      // If there is no explicit default case, but there
-      // is an implicit one, and the discriminant is an enum,
-      // we need this to avert warnings in some compilers that
-      // not all case values are included. If there is no
-      // implicit default case, or the discriminator is not
-      // an enum, this does no harm.
-      if (node->default_index () == -1)
-        {
-          os->decr_indent (0);
-          *os << "default:" << be_nl;
-          os->incr_indent ();
-          *os << "return 0;";
-        }
-
-      *os << be_uidt_nl << "}" << be_uidt_nl;
-      *os << "}\n\n";
+      *os << be_uidt_nl << "}" << be_nl;
+      *os << "return 0; // default" << be_uidt_nl
+          << "}\n\n";
 
 
       // by using a visitor to declare and define the TypeCode, we have the
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
index 081214f15c7..e9fdc5da287 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
@@ -104,18 +104,18 @@ be_visitor_union_branch_cdr_op_ci::visit_array (be_array *node)
         {
           be_decl *parent =
             be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
+          ACE_OS::sprintf (fname, "_%s", node->full_name ());
         }
     }
   else
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
+      ACE_OS::sprintf (fname, "%s", node->full_name ());
     }
 
   // check what is the code generations substate. Are we generating code for
@@ -506,28 +506,12 @@ be_visitor_union_branch_cdr_op_ci::visit_sequence (be_sequence *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      {
-        // If the typedef'd sequence is included from another
-        // file, node->name() won't work. The following works
-        // for all typedefs, external or not.
-        be_typedef *td = this->ctx_->alias ();
-
-        if (td)
-          {
-            *os << td->name ();
-          }
-        else
-          {
-            *os << node->name ();
-          }
-
-        *os << " _tao_union_tmp;" << be_nl
-            << "result = strm >> _tao_union_tmp;" << be_nl
-            << "if (result)" << be_idt_nl
-            << "_tao_union."
-            << f->local_name () << " (_tao_union_tmp);" << be_uidt;
-        return 0;
-      }
+      *os << node->name () << " _tao_union_tmp;" << be_nl
+          << "result = strm >> _tao_union_tmp;" << be_nl
+          << "if (result)" << be_idt_nl
+          << "_tao_union."
+          << f->local_name () << " (_tao_union_tmp);" << be_uidt;
+      return 0;
 
     case TAO_CodeGen::TAO_CDR_OUTPUT:
       *os << "result = strm << _tao_union."
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
index 7686eb88d75..3c1d6e42452 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
@@ -359,8 +359,7 @@ be_visitor_union_branch_private_ch::visit_structure (be_structure *node)
   os->indent ();
 
   // if we are variable sized, we need a pointer type
-  if (node->size_type () == be_decl::VARIABLE
-      || node->has_constructor ())
+  if (node->size_type () == be_type::VARIABLE)
     {
       *os << bt->nested_type_name (bu) << " *" << ub->local_name () << "_;\n";
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp
index 776f5726158..91ab43e1694 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp
@@ -141,25 +141,25 @@ be_visitor_union_branch_public_access_cs::visit_array (be_array *node)
       if (bt->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (bt->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            bt->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", bt->fullname ());
+          ACE_OS::sprintf (fname, "_%s", bt->full_name ());
         }
     }
   else
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", bt->fullname ());
+      ACE_OS::sprintf (fname, "%s", bt->full_name ());
     }
 
   os = this->ctx_->stream ();
-  *os << "if (alloc_flag)" << be_idt_nl
-      << "this->u_." << ub->local_name () << "_ = " << fname
-      << "_alloc ();" << be_uidt_nl
-      << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
+  *os << "if (alloc_flag)" << be_idt_nl;
+  *os << "this->u_." << ub->local_name () << "_ = " << fname
+      << "_alloc ();" << be_uidt_nl;
+  *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
 
   return 0;
 }
@@ -181,8 +181,7 @@ be_visitor_union_branch_public_access_cs::visit_enum (be_enum *)
                          ), -1);
     }
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << "ACE_UNUSED_ARG (alloc_flag);" << be_nl
-      << "return &this->u_." << ub->local_name () << "_;" << be_uidt_nl;
+  *os << "return &this->u_." << ub->local_name () << "_;" << be_uidt_nl;
 
   return 0;
 }
@@ -212,12 +211,12 @@ be_visitor_union_branch_public_access_cs::visit_interface (be_interface *node)
                          ), -1);
     }
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << "if (alloc_flag)" << be_idt_nl
-      << "ACE_NEW_RETURN (this->u_." << ub->local_name () << "_, "
+  *os << "if (alloc_flag)" << be_idt_nl;
+  *os << "ACE_NEW_RETURN (this->u_." << ub->local_name () << "_, "
       << "(TAO_Object_Field_T<"
       << bt->name () << ","
-      << bt->name () << "_var>), 0);" << be_uidt_nl
-      << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
+      << bt->name () << "_var>), 0);" << be_uidt_nl;
+  *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
 
   return 0;
 }
@@ -239,8 +238,7 @@ be_visitor_union_branch_public_access_cs::visit_interface_fwd (be_interface_fwd
                          ), -1);
     }
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << "ACE_UNUSED_ARG (alloc_flag);" << be_nl
-      << "return (CORBA::Object_ptr) &this->u_." << ub->local_name ()
+  *os << "return (CORBA::Object_ptr) &this->u_." << ub->local_name ()
       << "_->inout ();" << be_uidt_nl;
 
   return 0;
@@ -275,21 +273,18 @@ be_visitor_union_branch_public_access_cs::visit_predefined_type (be_predefined_t
   switch (node->pt ())
     {
     case AST_PredefinedType::PT_pseudo:
-      *os << "ACE_UNUSED_ARG (alloc_flag);" << be_nl
-          << "return &this->u_." << ub->local_name () << "_;" << be_uidt_nl;
+      *os << "return &this->u_." << ub->local_name () << "_;" << be_uidt_nl;
       break;
     case AST_PredefinedType::PT_any:
-      *os << "if (alloc_flag)" << be_idt_nl
-          << "this->u_." << ub->local_name () << "_ = new " << bt->name ()
-          << ";" << be_uidt_nl
-          << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
+      *os << "if (alloc_flag)" << be_idt_nl;
+      *os << "this->u_." << ub->local_name () << "_ = new " << bt->name ()
+          << ";" << be_uidt_nl;
+      *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
       break;
     case AST_PredefinedType::PT_void:
-     *os << "ACE_UNUSED_ARG (alloc_flag);" << be_nl;
       break;
     default:
-      *os << "ACE_UNUSED_ARG (alloc_flag);" << be_nl
-          << "return &this->u_." << ub->local_name () << "_;" << be_uidt_nl;
+      *os << "return &this->u_." << ub->local_name () << "_;" << be_uidt_nl;
     }
   return 0;
 }
@@ -319,10 +314,10 @@ be_visitor_union_branch_public_access_cs::visit_sequence (be_sequence *node)
                          ), -1);
     }
   os = this->ctx_->stream ();
-  *os << "if (alloc_flag)" << be_idt_nl
-      << "this->u_." << ub->local_name () << "_ = new " << bt->name ()
-      << ";" << be_uidt_nl
-      << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
+  *os << "if (alloc_flag)" << be_idt_nl;
+  *os << "this->u_." << ub->local_name () << "_ = new " << bt->name ()
+      << ";" << be_uidt_nl;
+  *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
 
   return 0;
 }
@@ -344,8 +339,7 @@ be_visitor_union_branch_public_access_cs::visit_string (be_string *)
                          ), -1);
     }
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << "ACE_UNUSED_ARG (alloc_flag);" << be_nl
-      << "return &this->u_." << ub->local_name () << "_;" << be_uidt_nl;
+  *os << "return &this->u_." << ub->local_name () << "_;" << be_uidt_nl;
 
   return 0;
 }
@@ -375,18 +369,16 @@ be_visitor_union_branch_public_access_cs::visit_structure (be_structure *node)
                          ), -1);
     }
   os = this->ctx_->stream ();
-  if (bt->size_type () == be_type::VARIABLE
-      || node->has_constructor ())
+  if (bt->size_type () == be_type::VARIABLE)
     {
-      *os << "if (alloc_flag)" << be_idt_nl
-          << "this->u_." << ub->local_name () << "_ = new " << bt->name ()
-          << ";" << be_uidt_nl
-          << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
+      *os << "if (alloc_flag)" << be_idt_nl;
+      *os << "this->u_." << ub->local_name () << "_ = new " << bt->name ()
+          << ";" << be_uidt_nl;
+      *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
     }
   else
     {
-      *os << "ACE_UNUSED_ARG (alloc_flag);" << be_nl
-          << "return &this->u_." << ub->local_name () << "_;" << be_uidt_nl;
+      *os << "return &this->u_." << ub->local_name () << "_;" << be_uidt_nl;
     }
 
   return 0;
@@ -438,10 +430,10 @@ be_visitor_union_branch_public_access_cs::visit_union (be_union *node)
                          ), -1);
     }
   os = this->ctx_->stream ();
-  *os << "if (alloc_flag)" << be_idt_nl
-      << "this->u_." << ub->local_name () << "_ = new " << bt->name ()
-      << ";" << be_uidt_nl
-      << "return this->u_." << ub->local_name () << "_;" << be_uidt;
+  *os << "if (alloc_flag)" << be_idt_nl;
+  *os << "this->u_." << ub->local_name () << "_ = new " << bt->name ()
+      << ";" << be_uidt_nl;
+  *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
index 6745c75e020..b39e689be6c 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
@@ -127,7 +127,7 @@ be_visitor_union_branch_public_assign_cs::visit_array (be_array *node)
   os = this->ctx_->stream ();
 
   // for anonymous arrays, the type name has a _ prepended. We compute the
-  // fullname with or without the underscore and use it later on.
+  // full_name with or without the underscore and use it later on.
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   // save the node's local name and full name in a buffer for quick use later
@@ -143,18 +143,18 @@ be_visitor_union_branch_public_assign_cs::visit_array (be_array *node)
       if (bt->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (bt->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            bt->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", bt->fullname ());
+          ACE_OS::sprintf (fname, "_%s", bt->full_name ());
         }
     }
   else
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", bt->fullname ());
+      ACE_OS::sprintf (fname, "%s", bt->full_name ());
     }
 
   os->indent (); // start from current indentation
@@ -425,8 +425,7 @@ be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node)
 
   os->indent (); // start from current indentation
   // set the discriminant to the appropriate label
-  if (bt->size_type () == be_type::VARIABLE
-      || node->has_constructor ())
+  if (bt->size_type () == be_type::VARIABLE)
     {
       *os << "this->u_." << ub->local_name () << "_ = new "
           << bt->name () << " (*u.u_."
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
index 13629b7cf88..24f83f1f29d 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
@@ -131,7 +131,7 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
     }
 
   // for anonymous arrays, the type name has a _ prepended. We compute the
-  // fullname with or without the underscore and use it later on.
+  // full_name with or without the underscore and use it later on.
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   // save the node's local name and full name in a buffer for quick use later
@@ -147,18 +147,18 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
       if (bt->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (bt->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            bt->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", bt->fullname ());
+          ACE_OS::sprintf (fname, "_%s", bt->full_name ());
         }
     }
   else
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", bt->fullname ());
+      ACE_OS::sprintf (fname, "%s", bt->full_name ());
     }
 
   // set method
@@ -449,59 +449,53 @@ be_visitor_union_branch_public_ci::visit_predefined_type (be_predefined_type *no
   *os << " val) // set" << be_nl
       << "{" << be_idt_nl;
   // set the discriminant to the appropriate label
-  *os << "// set the discriminant val" << be_nl;
-  *os << "this->_reset (";
-
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      *os << "// set the discriminant val" << be_nl;
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
       ub->gen_label_value (os);
+      *os << ";" << be_nl;
+
+      switch (node->pt ())
+        {
+        case AST_PredefinedType::PT_pseudo:
+          if (!ACE_OS::strcmp (node->local_name ()->get_string (), "Object"))
+            {
+              *os << "this->u_." << ub->local_name () << "_ = new "
+                  << "TAO_Object_Field_T<CORBA::Object,"
+                  << "CORBA::Object_var> (CORBA::Object::_duplicate (val));"
+                  << be_uidt_nl;
+            }
+          else
+            {
+              *os << "this->u_." << ub->local_name () << "_ = "
+                  << bt->name () << "::_duplicate (val);" << be_uidt_nl;
+            }
+          break;
+
+        case AST_PredefinedType::PT_any:
+          *os << "this->u_." << ub->local_name () << "_ = new "
+              << bt->name () << " (val);" << be_uidt_nl;
+          break;
+
+        case AST_PredefinedType::PT_void:
+          break;
+
+        default:
+          *os << "// set the value" << be_nl
+              << "this->u_." << ub->local_name ()
+              << "_ = val;" << be_uidt_nl;
+        }
     }
   else
-  // We have an explicit default case.
     {
-      ub->gen_default_label_value (os, bu);
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-      ub->gen_default_label_value (os, bu);
-    }
-
-  *os << ";" << be_nl;
-
-  switch (node->pt ())
-    {
-      case AST_PredefinedType::PT_pseudo:
-        if (!ACE_OS::strcmp (node->local_name ()->get_string (), "Object"))
-          {
-            *os << "this->u_." << ub->local_name () << "_ = new "
-                << "TAO_Object_Field_T<CORBA::Object,"
-                << "CORBA::Object_var> (CORBA::Object::_duplicate (val));"
-                << be_uidt_nl;
-          }
-        else
-          {
-            *os << "this->u_." << ub->local_name () << "_ = "
-                << bt->name () << "::_duplicate (val);" << be_uidt_nl;
-          }
-        break;
-
-      case AST_PredefinedType::PT_any:
-        *os << "this->u_." << ub->local_name () << "_ = new "
-            << bt->name () << " (val);" << be_uidt_nl;
-        break;
-
-      case AST_PredefinedType::PT_void:
-        break;
-
-      default:
-        *os << "// set the value" << be_nl
-            << "this->u_." << ub->local_name ()
-            << "_ = val;" << be_uidt_nl;
+      // default label
+      // XXXASG - TODO
     }
-
-  *os << "}\n\n";
+  *os << "}" << be_nl;
 
   switch (node->pt ())
     {
@@ -623,31 +617,25 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
       << "{" << be_idt_nl;
 
   // set the discriminant to the appropriate label
-  *os << "// set the discriminant val" << be_nl;
-  *os << "this->_reset (";
-
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      *os << "// set the discriminant val" << be_nl;
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
       ub->gen_label_value (os);
+      *os << ";" << be_nl;
+
+      *os << "this->u_." << ub->local_name () << "_ = new "
+          << bt->name () << " (val);" << be_uidt_nl;
     }
   else
-  // We have an explicit default case.
     {
-      ub->gen_default_label_value (os, bu);
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-      ub->gen_default_label_value (os, bu);
+      // default label
+      // XXXASG - TODO
     }
-
-  *os << ";" << be_nl;
-
-  *os << "this->u_." << ub->local_name () << "_ = new "
-      << bt->name () << " (val);" << be_uidt_nl;
-
-  *os << "}\n\n";
+  *os << "}" << be_nl;
 
   // readonly get method
   *os << "// readonly get method " << be_nl
@@ -655,7 +643,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
       << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
       << "{" << be_idt_nl
       << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl
-      << "}\n\n";
+      << "}" << be_nl;
 
   // read/write get method
   *os << "// read/write get method " << be_nl
@@ -696,31 +684,25 @@ be_visitor_union_branch_public_ci::visit_string (be_string *)
       << be_nl
       << "{" << be_idt_nl;
   // set the discriminant to the appropriate label
-  *os << "// set the discriminant val" << be_nl;
-  *os << "this->_reset (";
-
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      *os << "// set the discriminant val" << be_nl;
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
       ub->gen_label_value (os);
-    }
+      *os << ";" << be_nl;
+
+      *os << "// set the value" << be_nl
+          << "this->u_." << ub->local_name () << "_ = val;" << be_uidt_nl;
+   }
   else
-  // We have an explicit default case.
     {
-      ub->gen_default_label_value (os, bu);
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-      ub->gen_default_label_value (os, bu);
+      // default label
+      // XXXASG - TODO
     }
-
-  *os << ";" << be_nl;
-
-  *os << "// set the value" << be_nl
-      << "this->u_." << ub->local_name () << "_ = val;" << be_uidt_nl;
-
-  *os << "}\n\n";
+  *os << "}" << be_nl;
 
   // (2) set method from const char *
   *os << "// accessor to set the member" << be_nl
@@ -730,31 +712,27 @@ be_visitor_union_branch_public_ci::visit_string (be_string *)
       << "{\n";
   os->incr_indent ();
   // set the discriminant to the appropriate label
-  *os << "// set the discriminant val" << be_nl;
-  *os << "this->_reset (";
-
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      *os << "// set the discriminant val" << be_nl;
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
       ub->gen_label_value (os);
+      *os << ";" << be_nl;
+
+      *os << "// set the value" << be_nl
+          << "this->u_." << ub->local_name () << "_ = "
+          << "CORBA::string_dup (val);" << be_uidt_nl;
     }
   else
-  // We have an explicit default case.
     {
-      ub->gen_default_label_value (os, bu);
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-      ub->gen_default_label_value (os, bu);
+      // default label
+      // XXXASG - TODO
     }
 
-  *os << ";" << be_nl;
-
-  *os << "// set the value" << be_nl
-      << "this->u_." << ub->local_name () << "_ = "
-      << "CORBA::string_dup (val);" << be_uidt_nl;
-  *os << "}\n\n";
+  *os << "}" << be_nl;
 
   // (3) set from const String_var&
   *os << "// accessor to set the member" << be_nl
@@ -763,33 +741,28 @@ be_visitor_union_branch_public_ci::visit_string (be_string *)
       << " (const CORBA::String_var &val)" << be_nl
       << "{" << be_idt_nl;
   // set the discriminant to the appropriate label
-  *os << "// set the discriminant val" << be_nl;
-  *os << "this->_reset (";
-
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      *os << "// set the discriminant val" << be_nl;
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
       ub->gen_label_value (os);
+      *os << ";" << be_nl;
+
+      *os << "// set the value" << be_nl
+          << "CORBA::String_var " << ub->local_name ()
+          << "_var = val;" << be_nl
+          << "this->u_." << ub->local_name () << "_ = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
-  // We have an explicit default case.
     {
-      ub->gen_default_label_value (os, bu);
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-      ub->gen_default_label_value (os, bu);
+      // default label
+      // XXXASG - TODO
     }
-
-  *os << ";" << be_nl;
-
-  *os << "// set the value" << be_nl
-      << "CORBA::String_var " << ub->local_name ()
-      << "_var = val;" << be_nl
-      << "this->u_." << ub->local_name () << "_ = "
-      << ub->local_name () << "_var._retn ();" << be_uidt_nl;
-  *os << "}\n\n";
+  *os << "}" << be_nl;
 
   // get method
   *os << "ACE_INLINE const char *" << be_nl
@@ -866,59 +839,50 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
       << "{" << be_idt_nl;
 
   // set the discriminant to the appropriate label
-  *os << "// set the discriminant val" << be_nl;
-  *os << "this->_reset (";
-
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      *os << "// set the discriminant val" << be_nl;
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
       ub->gen_label_value (os);
-    }
-  else
-  // We have an explicit default case.
-    {
-      ub->gen_default_label_value (os, bu);
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-      ub->gen_default_label_value (os, bu);
-    }
-
-  *os << ";" << be_nl;
+      *os << ";" << be_nl;
 
-  if (bt->size_type () == be_type::VARIABLE
-      || node->has_constructor ())
-    {
-      *os << "this->u_." << ub->local_name () << "_ = new "
-          << bt->name () << " (val);" << be_uidt_nl;
+      if (bt->size_type () == be_type::VARIABLE)
+        {
+          *os << "this->u_." << ub->local_name () << "_ = new "
+              << bt->name () << " (val);" << be_uidt_nl;
+        }
+      else
+        {
+          *os << "this->u_." << ub->local_name () << "_ = val;" << be_uidt_nl;
+        }
     }
   else
     {
-      *os << "this->u_." << ub->local_name () << "_ = val;" << be_uidt_nl;
+      // default label
+      // XXXASG - TODO
     }
-
-  *os << "}\n\n";
+  *os << "}" << be_nl;
 
   // readonly get method
   *os << "// readonly get method " << be_nl
       << "ACE_INLINE const " << bt->name () << " &" << be_nl
       << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
       << "{" << be_idt_nl;
-  if (bt->size_type () == be_type::VARIABLE
-      || node->has_constructor ())
+  if (bt->size_type () == be_type::VARIABLE)
     *os << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl;
   else
     *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
-  *os << "}\n\n";
+  *os << "}" << be_nl;
 
   // read/write get method
   *os << "// read/write get method " << be_nl
       << "ACE_INLINE " << bt->name () << " &" << be_nl
       << bu->name () << "::" << ub->local_name () << " (void)" << be_nl
       << "{" << be_idt_nl;
-  if (bt->size_type () == be_type::VARIABLE
-      || node->has_constructor ())
+  if (bt->size_type () == be_type::VARIABLE)
     *os << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl;
   else
     *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
@@ -1011,31 +975,26 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
       << bu->name () << "::" << ub->local_name ()
       << " (const " << bt->name () << " &val)" << be_nl
       << "{" << be_idt_nl;
-  *os << "// set the discriminant val" << be_nl;
-  *os << "this->_reset (";
-
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      *os << "// set the discriminant val" << be_nl;
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
       ub->gen_label_value (os);
+      *os << ";" << be_nl;
+
+      *os << "this->u_."
+          << ub->local_name () << "_ = new " << bt->name ()
+          << " (val);" << be_nl;
     }
   else
-  // We have an explicit default case.
     {
-      ub->gen_default_label_value (os, bu);
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-      ub->gen_default_label_value (os, bu);
+      // default label
+      // XXXASG - TODO
     }
-
-  *os << ";" << be_nl;
-
-  *os << "this->u_."
-      << ub->local_name () << "_ = new " << bt->name ()
-      << " (val);" << be_uidt_nl;
-  *os << "}\n\n";
+  *os << "}" << be_nl;
 
   // readonly get method
   *os << "// readonly get method " << be_nl
@@ -1043,7 +1002,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
       << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
       << "{" << be_idt_nl
       << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl
-      << "}\n\n";
+      << "}" << be_nl;
 
   // read/write get method
   *os << "// read/write get method " << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
index e6723b1f654..62195e9fc7e 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
@@ -125,7 +125,7 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
     }
 
   // for anonymous arrays, the type name has a _ prepended. We compute the
-  // fullname with or without the underscore and use it later on.
+  // full_name with or without the underscore and use it later on.
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   // save the node's local name and full name in a buffer for quick use later
@@ -141,18 +141,18 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
       if (bt->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (bt->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            bt->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", bt->fullname ());
+          ACE_OS::sprintf (fname, "_%s", bt->full_name ());
         }
     }
   else
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", bt->fullname ());
+      ACE_OS::sprintf (fname, "%s", bt->full_name ());
     }
 
   os = this->ctx_->stream ();
@@ -371,8 +371,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure (be_structure *node)
                          ), -1);
     }
   os = this->ctx_->stream ();
-  if (bt->size_type () == be_type::VARIABLE
-      || node->has_constructor ())
+  if (bt->size_type () == be_type::VARIABLE)
     {
       *os << "delete this->u_." << ub->local_name ()
           << "_;" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
index 7a467491264..eb01d5ff6c4 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
@@ -50,10 +50,10 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
   // generate the CDR << and >> operator declarations (prototypes)
 
   os->indent ();
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator<< (TAO_OutputCDR &, const " << node->name ()
       << " *); // " << be_nl;
-  *os << "CORBA::Boolean " << idl_global->stub_export_macro ()
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>> (TAO_InputCDR &, "
       << node->name () << " *&);\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ci.cpp
index d8288c7af99..6637b766bf0 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ci.cpp
@@ -89,7 +89,7 @@ be_visitor_valuetype_field_cdr_ci::visit_array (be_array *node)
     }
 
   // for anonymous arrays, the type name has a _ prepended. We compute
-  // the fullname with or without the underscore and use it later on.
+  // the full_name with or without the underscore and use it later on.
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   // save the node's local name and full name in a buffer for quick
@@ -107,18 +107,18 @@ be_visitor_valuetype_field_cdr_ci::visit_array (be_array *node)
         {
           be_decl *parent =
             be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
+          ACE_OS::sprintf (fname, "_%s", node->full_name ());
         }
     }
   else
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
+      ACE_OS::sprintf (fname, "%s", node->full_name ());
     }
 
   // check what is the code generation substate. Are we generating
@@ -867,7 +867,7 @@ be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node)
     }
 
   // for anonymous arrays, the type name has a _ prepended. We compute
-  // the fullname with or without the underscore and use it later on.
+  // the full_name with or without the underscore and use it later on.
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
@@ -882,18 +882,18 @@ be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
+          ACE_OS::sprintf (fname, "_%s", node->full_name ());
         }
     }
   else
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
+      ACE_OS::sprintf (fname, "%s", node->full_name ());
     }
 
   // check what is the code generation substate. Are we generating code for
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
index b052358eae7..d1e2c9cdcc3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
@@ -131,7 +131,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
     }
 
   // for anonymous arrays, the type name has a _ prepended. We compute the
-  // fullname with or without the underscore and use it later on.
+  // full_name with or without the underscore and use it later on.
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   // save the node's local name and full name in a buffer for quick use later
@@ -148,18 +148,18 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
         {
           be_decl *parent =
                  be_scope::narrow_from_scope (bt->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            bt->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, "_%s", bt->fullname ());
+          ACE_OS::sprintf (fname, "_%s", bt->full_name ());
         }
     }
   else
     {
       // typedefed node
-      ACE_OS::sprintf (fname, "%s", bt->fullname ());
+      ACE_OS::sprintf (fname, "%s", bt->full_name ());
     }
 
   // set method
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
index 1f7e5405a67..e23026108de 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -62,7 +62,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
       else // only can access base class via virtual function
         {
           *os << "if (!this->_tao_marshal__"
-              <<       inh->flatname ()
+              <<       inh->flat_name ()
               << " (strm)) return 0;" << be_nl;
         }
     }
@@ -104,7 +104,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
       else // only can access base class via virtual function
         {
           *os << "if (!this->_tao_unmarshal__"
-              <<       inh->flatname ()
+              <<       inh->flat_name ()
               << " (strm)) return 0;" << be_nl;
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
index 1429a4d15cd..70806d09556 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
@@ -60,7 +60,7 @@ be_visitor_obv_module::visit_module (be_module *node)
         {
           os->indent ();
 
-          *os << "TAO_NAMESPACE "; // << idl_global->skel_export_macro ()
+          *os << "TAO_NAMESPACE "; // << idl_global->export_macro ()
 
           if (!node->is_nested ())
               // we are outermost module, so prepend
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index c86280c98f6..6553c85e483 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -783,7 +783,7 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *node)
   os = this->ctx_->stream ();
   os->indent (); // start with whatever indentation level we are at
 
-  *os << "class " << idl_global->skel_export_macro ()
+  *os << "class " << idl_global->export_macro ()
       << " " << node->local_name ()
       << "_init : public ACE_CORBA_1 (ValueFactoryBase)" << be_nl;
 
@@ -819,10 +819,10 @@ be_visitor_valuetype::gen_init_impl (be_valuetype *node)
   char lname [NAMEBUFSIZE];  // local _out names
 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_init", node->fullname ());
+  ACE_OS::sprintf (fname, "%s_init", node->full_name ());
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_init", node->local_name ()->get_string ());
+  ACE_OS::sprintf (lname, "%s_init", node->local_name ());
 
   // destructor
   *os << fname << "::~" << lname << " ()" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index c4a45105e74..ecaa726fb92 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -1,3 +1,4 @@
+
 //
 // $Id$
 //
@@ -61,7 +62,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
       *os << "class " << node->local_name () << ";" << be_nl;
 
       // generate the ifdefined macro for the _var type
-      os->gen_ifdef_macro (node->flatname (), "_var");
+      os->gen_ifdef_macro (node->flat_name (), "_var");
 
       // generate the _var declaration
       if (node->gen_var_defn () == -1)
@@ -74,7 +75,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
       os->gen_endif ();
 
       // generate the ifdef macro for the _out class
-      os->gen_ifdef_macro (node->flatname (), "_out");
+      os->gen_ifdef_macro (node->flat_name (), "_out");
 
       // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
       if (node->gen_out_defn () == -1)
@@ -88,7 +89,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
       os->gen_endif ();
 
       // generate the ifdef macro for the _init class
-      os->gen_ifdef_macro (node->flatname (), "_init");
+      os->gen_ifdef_macro (node->flat_name (), "_init");
 
       // generate the _init declaration - ptc/98-09-03 20.17.10 p.20-93
       if (this->gen_init_defn (node) == -1)
@@ -102,11 +103,11 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
       os->gen_endif ();
 
       // now the valuetype definition itself
-      os->gen_ifdef_macro (node->flatname ());
+      os->gen_ifdef_macro (node->flat_name ());
 
       // now generate the class definition
       os->indent ();
-      *os << "class " << idl_global->stub_export_macro ()
+      *os << "class " << idl_global->export_macro ()
                 << " " << node->local_name ();
 
       // node valuetype inherits from other valuetypes (OMG 20.17.9)
@@ -172,12 +173,12 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
 
           // generate the _ptr_type and _var_type typedef
           // but we must protect against certain versions of g++
-          << "#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)"
+          << "#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8"
           << be_idt_nl
           << "typedef " << node->local_name () << "* _ptr_type;" << be_nl
           << "typedef " << node->local_name () << "_var _var_type;"
           << be_uidt_nl
-          << "#endif /* ! __GNUC__ || g++ >= 2.8 */\n" << be_idt_nl
+          << "#endif /* __GNUC__ */\n" << be_idt_nl
 
           // generate the static _downcast operation
           // (see OMG 20.17.{4,5})
@@ -254,10 +255,10 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
             {
               *os << be_uidt_nl << "protected:" << be_idt_nl;
               *os << "virtual CORBA::Boolean _tao_marshal__"
-                  <<    node->flatname () << " (TAO_OutputCDR &) = 0;"
+                  <<    node->flat_name () << " (TAO_OutputCDR &) = 0;"
                   << be_nl;
               *os << "virtual CORBA::Boolean _tao_unmarshal__"
-                  <<    node->flatname () << " (TAO_InputCDR &) = 0;"
+                  <<    node->flat_name () << " (TAO_InputCDR &) = 0;"
                   << be_nl;
             }
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
index 368a53e1e71..6ee52bcc6f9 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
@@ -75,7 +75,7 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
       <<  "}\n\n";
 
   // generate the ifdefined macro for  the _var type
-  os->gen_ifdef_macro (node->flatname (), "_var");
+  os->gen_ifdef_macro (node->flat_name (), "_var");
   if (node->gen_var_impl () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -86,7 +86,7 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
   os->gen_endif ();
 
   // generate the ifdefined macro for  the _out type
-  os->gen_ifdef_macro (node->flatname (), "_out");
+  os->gen_ifdef_macro (node->flat_name (), "_out");
   if (node->gen_out_impl () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 40b655a80b1..a28d3e2432d 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -112,7 +112,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
         }
       else
         {
-          *os << "this->_tao_marshal__" << node->flatname ()
+          *os << "this->_tao_marshal__" << node->flat_name ()
               << " (strm);" << be_uidt_nl;
         }
       *os << "}\n" << be_nl;
@@ -130,7 +130,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
         }
       else
         {
-          *os << "this->_tao_unmarshal__" << node->flatname ()
+          *os << "this->_tao_unmarshal__" << node->flat_name ()
               << " (strm);" << be_uidt_nl;
         }
       *os << "}\n" << be_nl;
@@ -181,7 +181,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   // The static T::_tao_unmarshal method  ------------------------ end
 
   // generate the ifdefined macro for  the _init type
-  os->gen_ifdef_macro (node->flatname (), "_init");
+  os->gen_ifdef_macro (node->flat_name (), "_init");
   if (this->gen_init_impl (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
index 4cdee96d078..c95b5299225 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
@@ -61,7 +61,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
   if (node->opt_accessor ())
     {
       os->indent ();
-      *os << "typedef " << node->fullname () << " ";
+      *os << "typedef " << node->full_name () << " ";
       if (!node->is_nested ())
         *os << "OBV_";
       *os << node->local_name () << ";" << be_nl;
@@ -70,7 +70,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
     {
       // == STEP 1:  generate the class name and the class name we inherit ==
 
-      os->gen_ifdef_macro (node->flatname (), "_OBV");
+      os->gen_ifdef_macro (node->flat_name (), "_OBV");
       os->indent ();
 
       *os << "// OBV_ class" << be_nl;
@@ -78,7 +78,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
       if (!node->is_nested())   // we are in root ?
         *os << "OBV_";
       *os << node->local_name () << " : public virtual "
-                                 << node->fullname () << be_nl;
+                                 << node->full_name () << be_nl;
 
       // == STEP 2: generate the body ==
 
@@ -97,9 +97,9 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
         {
           *os << be_uidt_nl << "protected:" << be_idt_nl;
           *os << "virtual CORBA::Boolean _tao_marshal__"
-              <<    node->flatname () << " (TAO_OutputCDR &);" << be_nl;
+              <<    node->flat_name () << " (TAO_OutputCDR &);" << be_nl;
           *os << "virtual CORBA::Boolean _tao_unmarshal__"
-              <<    node->flatname () << " (TAO_InputCDR &);" << be_nl;
+              <<    node->flat_name () << " (TAO_InputCDR &);" << be_nl;
           *os << "CORBA::Boolean "
               << "_tao_marshal_state (TAO_OutputCDR &);" << be_nl
               << "CORBA::Boolean "
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
index 4bcf4ef00ba..15dc7954f15 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
@@ -62,7 +62,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
       os->indent ();
       *os << "CORBA::Boolean " << be_nl
           << node->full_obv_skel_name ()
-          << "::_tao_marshal__" << node->flatname ()
+          << "::_tao_marshal__" << node->flat_name ()
           <<    " (TAO_OutputCDR &strm)"
           << "{" << be_idt_nl
           <<   "return " << node->full_obv_skel_name ()
@@ -71,7 +71,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
 
       *os << "CORBA::Boolean "
           << node->full_obv_skel_name ()
-          << "::_tao_unmarshal__" << node->flatname ()
+          << "::_tao_unmarshal__" << node->flat_name ()
           <<    " (TAO_InputCDR &strm)"
           << "{" << be_idt_nl
           <<   "return " << node->full_obv_skel_name ()
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ch.cpp
index 5411463a7ec..a8a1c6bc183 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ch.cpp
@@ -59,7 +59,7 @@ be_visitor_valuetype_fwd_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
       *os << "class " << node->local_name () << ";" << be_nl;
 
       // generate the ifdefined macro for the _ptr type
-      os->gen_ifdef_macro (node->flatname (), "_ptr");
+      os->gen_ifdef_macro (node->flat_name (), "_ptr");
 
       // generate the _ptr declaration
       *os << "typedef " << node->local_name () << " *" << node->local_name ()
@@ -68,7 +68,7 @@ be_visitor_valuetype_fwd_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
       os->gen_endif ();
 
       // enclose under an ifdef macro
-      os->gen_ifdef_macro (node->flatname (), "_var");
+      os->gen_ifdef_macro (node->flat_name (), "_var");
 
       // generate the _var declaration
       if (node->gen_var_defn () == -1)
@@ -82,7 +82,7 @@ be_visitor_valuetype_fwd_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
       os->gen_endif ();
 
       // enclose under an ifdef macro
-      os->gen_ifdef_macro (node->flatname (), "_out");
+      os->gen_ifdef_macro (node->flat_name (), "_out");
 
       // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
       if (node->gen_out_defn () == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ci.cpp
index aaadbbb38f6..e14028a0034 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ci.cpp
@@ -55,7 +55,7 @@ be_visitor_valuetype_fwd_ci::visit_valuetype_fwd (be_valuetype_fwd *node)
     {
 
       // generate the ifdefined macro for  the _var type
-      os->gen_ifdef_macro (node->flatname (), "_var");
+      os->gen_ifdef_macro (node->flat_name (), "_var");
 
       if (node->gen_var_impl () == -1)
         {
@@ -68,7 +68,7 @@ be_visitor_valuetype_fwd_ci::visit_valuetype_fwd (be_valuetype_fwd *node)
       os->gen_endif ();
 
       // generate the ifdefined macro for  the _out type
-      os->gen_ifdef_macro (node->flatname (), "_out");
+      os->gen_ifdef_macro (node->flat_name (), "_out");
 
       if (node->gen_out_impl () == -1)
         {
diff --git a/TAO/TAO_IDL/be_include/be_argument.h b/TAO/TAO_IDL/be_include/be_argument.h
index d32814e2335..f22f4fe1b72 100644
--- a/TAO/TAO_IDL/be_include/be_argument.h
+++ b/TAO/TAO_IDL/be_include/be_argument.h
@@ -22,13 +22,6 @@
 #ifndef BE_ARGUMENT_H
 #define BE_ARGUMENT_H
 
-#include "be_decl.h"
-#include "ast_argument.h"
-
-class AST_Type;
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_Argument
  */
diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h
index fd9afcf42e7..b1f6b674bea 100644
--- a/TAO/TAO_IDL/be_include/be_array.h
+++ b/TAO/TAO_IDL/be_include/be_array.h
@@ -22,12 +22,7 @@
 #ifndef BE_ARRAY_H
 #define BE_ARRAY_H
 
-#include "be_type.h"
-#include "ast_array.h"
-
-class UTL_ExprList;
 class TAO_OutStream;
-class be_visitor;
 
 /*
  * BE_Array
diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h
index 345d63c14a2..fd228720030 100644
--- a/TAO/TAO_IDL/be_include/be_attribute.h
+++ b/TAO/TAO_IDL/be_include/be_attribute.h
@@ -22,13 +22,6 @@
 #ifndef BE_ATTRIBUTE_H
 #define BE_ATTRIBUTE_H
 
-#include "be_decl.h"
-#include "ast_attribute.h"
-
-class AST_Type;
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_Attribute
  */
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index 19edeafc611..4daebfe465b 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -304,8 +304,9 @@ public:
 
     TAO_AMI_HANDLER_STUB_CS,               // AMI_*_Handler class visitor.
 
-    TAO_AMI_HANDLER_SERVANT_OPERATION_CH,  // Operation in AMI_*_Handler.
-    TAO_AMI_HANDLER_STUB_OPERATION_CH,     // Operation in POA_AMI_*_Handler.
+    TAO_AMI_HANDLER_SERVANT_OPERATION_CS,
+    TAO_AMI_HANDLER_SERVANT_OPERATION_CH,  // Operation in POA_AMI_*_Handler.
+    TAO_AMI_HANDLER_STUB_OPERATION_CH,     // Operation in AMI_*_Handler.
     TAO_AMI_HANDLER_OPERATION_ARGLIST_CH,
     TAO_AMI_HANDLER_OPERATION_ARGLIST_CS,
     TAO_ARGUMENT_AMI_HANDLER_ARGLIST_CH,
@@ -315,14 +316,6 @@ public:
 
     TAO_AMI_HANDLER_TYPECODE_DECL,           // Typecode decl for the AMI_*_Handler.
 
-    TAO_COLLOCATED_AMI_HANDLER_CH,           // Collocated AMI_*_Handler class.
-
-    TAO_COLLOCATED_AMI_HANDLER_OPERATION_CH, // Operation inside the collocated AMI handler.
-
-// @@ Michael    TAO_AMI_HANDLER_ARGUMENT_INVOKE_CS,
-
-// @@ Michael    TAO_AMI_HANDLER_OPERATION_ARG_INVOKE_CS,
-
     TAO_AMI_HANDLER_STUB_OPERATION_CS,
 
     TAO_AMI_HANDLER_TYPECODE_DEFN,           // Typecode definition for AMI Handler class.
@@ -337,8 +330,28 @@ public:
 
     TAO_AMI_HANDLER_OPERATION_ARG_DECL_CS,           // Argument declartion.
 
+    TAO_AMI_HANDLER_INTERFACE_THRU_POA_COLLOCATED_CH,
+
+    TAO_AMI_HANDLER_INTERFACE_THRU_POA_COLLOCATED_CS,
+
+    TAO_AMI_HANDLER_INTERFACE_DIRECT_COLLOCATED_CH,
+
+    TAO_AMI_HANDLER_INTERFACE_DIRECT_COLLOCATED_CS,
+
+    TAO_AMI_HANDLER_OPERATION_THRU_POA_COLLOCATED_CH,
+
+    TAO_AMI_HANDLER_OPERATION_THRU_POA_COLLOCATED_CS,
+
+    TAO_AMI_HANDLER_OPERATION_DIRECT_COLLOCATED_CH,
+
+    TAO_AMI_HANDLER_OPERATION_DIRECT_COLLOCATED_CS,
+
     TAO_AMI_HANDLER_ARGUMENT_VARDECL_CS,             // State derived out of the above
 
+    TAO_AMI_HANDLER_OPERATION_COLLOCATED_ARG_UPCALL_CS, // Argument list for the upcall
+
+    TAO_AMI_HANDLER_ARGUMENT_COLLOCATED_UPCALL_CS,   // State derived out of the above
+
     TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS,         // Argument list for the upcall
                                                      // (only out and inout arguments)
     TAO_AMI_HANDLER_ARGUMENT_UPCALL_CS,              // State derived out of the above
diff --git a/TAO/TAO_IDL/be_include/be_constant.h b/TAO/TAO_IDL/be_include/be_constant.h
index d4e7f5713b9..bcee93fd117 100644
--- a/TAO/TAO_IDL/be_include/be_constant.h
+++ b/TAO/TAO_IDL/be_include/be_constant.h
@@ -23,13 +23,6 @@
 #ifndef BE_CONSTANT_H
 #define BE_CONSTANT_H
 
-#include "be_decl.h"
-#include "ast_constant.h"
-#include "ast_expression.h"
-
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_Constant
  */
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index e2423a851fc..86dd37c67f5 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -22,8 +22,6 @@
 #ifndef TAO_BE_DECL_H
 #define TAO_BE_DECL_H
 
-#include "ast_decl.h"
-
 class be_scope;
 class be_visitor;
 
@@ -65,37 +63,36 @@ public:
   virtual SIZE_TYPE size_type (void);
   // return our size type
 
-  const char *fullname (void);
+  const char *full_name (void);
   // return the stringified full name
 
-  const char *ami_handler_fullname (void);
-  // return the stringified full name of the assosciated AMI reply handler.
-
-  const char *flatname (void);
+  const char *flat_name (void);
   // return the flattened full scoped name.
 
-  const char *ami_handler_flatname (void);
-  // return the flattened full scoped name of the assosciated AMI reply handler.
+  const char *repoID (void);
+  // retrieve the repository ID.
 
-  char* compute_flatname (const char *prefix, const char *suffix);
+  // Methods used by the interface type strategy
+  void compute_full_name  (const char *prefix, 
+                           const char *suffix,
+                           char *&name);
   // Both the arguments should be non-null!!!. Applies prefix and
   // suffix to the local name and makes a flat name.
 
-  const char *repoID (void);
-  // retrieve the repository ID.
+  void compute_flat_name (const char *prefix, 
+                         const char *suffix,
+                         char *& name);
+  // Both the arguments should be non-null!!!. Applies prefix and
+  // suffix to the local name and makes a flat name.
 
-  const char *ami_handler_repoID (void);
-  // retrieve the repository ID of the assosciated AMI reply handler.
 
-  char *compute_repoID (const char *prefix, const char *suffix);
+  void compute_repoID (const char *prefix, 
+                       const char *suffix,
+                       char *& name);
   // Apply the prefix and suffix to the local name and compute the
   // repoID.  Both the parameters should be non-null.
 
-  int compute_ami_handler_name (const char *name,
-                                char *&ami_handler_name);
-  // Computes the name of the corresponding AMI handler out of a
-  // given name. The name might contain POA_ at the beginning
-  // and might possibly have many scope levels.
+  // End of Methods use by the interface type strategy
 
   const char* prefix (void);
   // retrieve the repository ID prefix
@@ -109,12 +106,6 @@ public:
   // Visiting
   virtual int accept (be_visitor *visitor);
 
-  idl_bool has_constructor (void);
-  // accessor for protected member.
-
-  void has_constructor (idl_bool value);
-  // mutator for protected member.
-
   // boolean methods to test if code was already generated
   idl_bool cli_hdr_gen (void);
   idl_bool cli_stub_gen (void);
@@ -158,13 +149,12 @@ protected:
   virtual int compute_size_type (void);
   // determine our size type and set it if it is unknown
 
-  virtual void compute_fullname (void);
+  virtual void compute_full_name (void);
   // computes the fully scoped name
 
-  virtual void compute_flatname (void);
+  virtual void compute_flat_name (void);
   // compute the flattened fully scoped name
 
-
   virtual void compute_repoID (void);
   // computes the repoID
 
@@ -187,33 +177,21 @@ protected:
   idl_bool cli_stub_cdr_op_gen_;
   idl_bool cli_inline_cdr_op_gen_;
 
-  char *fullname_;
+  char *full_name_;
   // our full scoped name
 
-  char *ami_handler_fullname_;
-  // our full scoped name of the associated AMI reply handler
-
-  char *flatname_;
+  char *flat_name_;
   // flattened fully scoped name
 
-  char *ami_handler_flatname_;
-  // flattened fully scoped name of the associated AMI reply handler
-
   char *repoID_;
   // repository ID
 
-  char *ami_handler_repoID_;
-  // repository ID of the associated AMI reply handler
-
   char *prefix_;
   // The repository ID prefix
 
   SIZE_TYPE size_type_;
   // whether we are fixed or variable size (by default fixed)
 
-  idl_bool has_constructor_;
-  // attribute that helps a union determine whether a member 
-  // should be included by value or by reference.
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h
index 200a08f2978..38073ed6915 100644
--- a/TAO/TAO_IDL/be_include/be_enum.h
+++ b/TAO/TAO_IDL/be_include/be_enum.h
@@ -23,13 +23,6 @@
 #ifndef BE_ENUM_H
 #define BE_ENUM_H
 
-#include "be_scope.h"
-#include "be_type.h"
-#include "ast_enum.h"
-
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_Enum
  */
diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h
index 1c3c571b7be..9abb2d015dd 100644
--- a/TAO/TAO_IDL/be_include/be_enum_val.h
+++ b/TAO/TAO_IDL/be_include/be_enum_val.h
@@ -23,12 +23,6 @@
 #ifndef BE_ENUM_VAL_H
 #define BE_ENUM_VAL_H
 
-#include "be_decl.h"
-#include "ast_enum_val.h"
-
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_EnumVal
  */
diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h
index 40aeb8b6a11..d73076c2ee5 100644
--- a/TAO/TAO_IDL/be_include/be_exception.h
+++ b/TAO/TAO_IDL/be_include/be_exception.h
@@ -3,13 +3,6 @@
 #ifndef BE_EXCEPTION_H
 #define BE_EXCEPTION_H
 
-#include "be_scope.h"
-#include "be_type.h"
-#include "ast_exception.h"
-
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_Exception
  */
diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h
index 432d21b1161..a09ca7ab18c 100644
--- a/TAO/TAO_IDL/be_include/be_expression.h
+++ b/TAO/TAO_IDL/be_include/be_expression.h
@@ -22,10 +22,6 @@
 #ifndef BE_EXPRESSION_H
 #define BE_EXPRESSION_H
 
-#include "ast_expression.h"
-
-class be_visitor;
-
 /*
  * BE_Expression
  */
diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h
index 315b4758575..0a0de3dbffa 100644
--- a/TAO/TAO_IDL/be_include/be_field.h
+++ b/TAO/TAO_IDL/be_include/be_field.h
@@ -22,12 +22,6 @@
 #ifndef BE_FIELD_H
 #define BE_FIELD_H
 
-#include "be_decl.h"
-#include "ast_field.h"
-
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_Field
  */
@@ -41,7 +35,7 @@ public:
   // default constructor
 
   be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p,
-            Visibility vis = vis_NA);
+                                    Visibility vis = vis_NA);
   // constructor
 
   // Visiting
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
index c931b758f97..cb0a911e2f9 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -134,7 +134,7 @@ public:
   int print (const char *format, ...);
   // "printf" style variable argument print
 
-  int gen_ifdef_macro (const char *flatname, const char *suffix=0);
+  int gen_ifdef_macro (const char *flat_name, const char *suffix=0);
   // generate a #if !defined, #defined macro
 
   int gen_endif (void);
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index d9b7d2c669a..3b8c8d7c42a 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -16,18 +16,226 @@
 // = AUTHOR
 //    Copyright 1994-1995 by Sun Microsystems, Inc.
 //    and
-//    Aniruddha Gokhale
+//    Aniruddha Gokhale,
+//    Michael Kircher
 //
 // ============================================================================
 
 #ifndef TAO_BE_INTERFACE_H
 #define TAO_BE_INTERFACE_H
 
-#include "be_scope.h"
-#include "be_type.h"
-#include "ast_interface.h"
-
 class TAO_OutStream;
+class be_interface;
+
+// This class serves as a strategy base class for the differences
+// in generating e.g. ami reply handlers.
+
+class be_interface_type_strategy
+{
+public:
+  be_interface_type_strategy (be_interface *node)
+    : local_name_(0),
+      full_name_(0),
+      flat_name_(0),
+      repoID_(0),
+      full_skel_name_(0),
+      full_coll_name_(0),
+      local_coll_name_(0),
+      relative_skel_name_(0),
+      node_ (node)
+  {
+  };
+
+  virtual ~be_interface_type_strategy ()
+  {
+    if (this->local_name_ != 0)
+      delete [] this->local_name_;
+    if (this->full_name_ != 0)
+      delete [] this->full_name_;
+    if (this->flat_name_ != 0)
+      delete [] this->flat_name_;
+    if (this->repoID_ != 0)
+      delete [] this->repoID_;
+    if (this->full_skel_name_ != 0)
+      delete [] this->full_skel_name_;
+    if (this->full_coll_name_ != 0)
+      delete [] this->full_coll_name_;
+    if (this->local_coll_name_ != 0)
+      delete [] this->local_coll_name_;
+    if (this->relative_skel_name_ != 0)
+      delete [] this->relative_skel_name_;
+  }
+  virtual const char *local_name (void) = 0;
+  // return the local name
+
+  virtual const char *full_name (void) = 0;
+  // return the stringified full name
+
+  virtual const char *flat_name (void) = 0;
+  // return the flattened full scoped name.
+
+  virtual const char *repoID (void) = 0;
+  // retrieve the repository ID.
+
+  virtual const char *full_skel_name (void) = 0;
+  // retrieve the fully scoped skel class name.
+
+  virtual const char *full_coll_name (int) = 0;
+  // retrieve the fully qualified collocated class name
+
+  virtual const char *local_coll_name (int) = 0;
+  // retrieve the fully qualified collocated class name.
+
+  const char *relative_skel_name (const char *skel_name);
+  // relative skeleton name
+
+  const char* relative_name (const char *localname,
+                             const char *othername);
+
+  void compute_names (const char* name,
+                     const char* prefix,
+                     const char* suffix,
+                     char *&new_name);
+  // compute the names using the local prefix and suffix
+
+  void compute_coll_names (int type,
+                           const char *prefix,
+                           const char *suffix);
+  // compute the collocation names
+
+  virtual TAO_OutStream *get_out_stream () = 0;
+  // return the out stream depending on the strategy
+  // -> the client stub (e.g. AMI)  or server skeleton
+  // outstream is returned.
+
+  virtual const char *get_out_stream_fname () = 0;
+  // return the file name of the output stream.
+
+protected:
+  
+  char *local_name_;
+
+  char *full_name_;
+
+  char *flat_name_;
+
+  char *repoID_;
+
+  char *full_skel_name_;
+
+  char *full_coll_name_;
+
+  char *local_coll_name_;
+
+  char *relative_skel_name_;
+
+  be_interface *node_;
+  // The node we strategize
+};
+
+
+
+class be_interface_ami_handler_strategy 
+  : public be_interface_type_strategy
+{
+public:
+  // begin overridden methods.
+  be_interface_ami_handler_strategy (be_interface *node)
+    : be_interface_type_strategy (node),
+      prefix_("AMI_"),
+      suffix_("_Handler")
+  {
+  };
+
+  virtual ~be_interface_ami_handler_strategy ()
+  {
+  };
+
+  const char * local_name (void);
+  // return the local name
+
+  virtual const char *full_name (void);
+  // return the stringified full name
+
+  virtual const char *flat_name (void);
+  // return the flattened full scoped name.
+
+  virtual const char *repoID (void);
+  // retrieve the repository ID.
+
+  virtual const char *full_skel_name (void);
+  // retrieve the fully scoped skel class name.
+
+  virtual const char *full_coll_name (int);
+  // retrieve the fully qualified collocated class name
+
+  virtual const char *local_coll_name (int);
+  // retrieve the fully qualified collocated class name.
+
+  virtual TAO_OutStream *get_out_stream ();
+  // return the out stream depending on the strategy
+  // return the client stub
+
+  virtual const char *get_out_stream_fname ();
+  // return the file name of the output stream.
+
+  // end of overridden methods
+private:
+
+  const char *prefix_;
+  // The prefix to the interface
+   
+  const char *suffix_;
+  // The suffix to the interface
+};
+
+
+class be_interface_default_strategy
+  : public be_interface_type_strategy
+{
+public:
+  // begin overridden methods.
+  be_interface_default_strategy (be_interface *node)
+    : be_interface_type_strategy (node)
+  {
+  };
+
+  virtual ~be_interface_default_strategy ()
+  {
+  };
+
+  const char * local_name (void);
+  // return the local name
+
+  virtual const char *full_name (void);
+  // return the stringified full name
+
+  virtual const char *flat_name (void);
+  // return the flattened full scoped name.
+
+  virtual const char *repoID (void);
+  // retrieve the repository ID.
+
+  virtual const char *full_skel_name (void);
+  // retrieve the fully scoped skel class name.
+
+  virtual const char *full_coll_name (int);
+  // retrieve the fully qualified collocated class name
+
+  virtual const char *local_coll_name (int);
+  // retrieve the fully qualified collocated class name.
+
+  virtual TAO_OutStream *get_out_stream ();
+  // return the out stream depending on the strategy
+  // return the server skeleton
+
+  virtual const char *get_out_stream_fname ();
+  // return the file name of the output stream.
+
+  // end of overridden methods
+};
+
+
 
 /*
  * BE_Interface
@@ -46,7 +254,6 @@ public:
     THRU_POA = 0,
     DIRECT = 1
   };
-  // Collocated stubs type value.
 
   // used to pass functions to the template method
   typedef int (*tao_code_emitter) (be_interface *, be_interface *, TAO_OutStream *);
@@ -55,7 +262,9 @@ public:
   be_interface (void);
   // Default constructor
 
-  be_interface (UTL_ScopedName *n, AST_Interface **ih, long nih,
+  be_interface (UTL_ScopedName *n, 
+                AST_Interface **ih, 
+                long nih,
                 UTL_StrList *p);
   // Constructor that sets its scoped name <n>, a list of inherited interfaces
   // <ih>, the number of inherited interfaces <nih>, and any prgmas <p>
@@ -63,6 +272,40 @@ public:
   ~be_interface (void);
   // dtor
 
+  be_interface_type_strategy *set_strategy (be_interface_type_strategy *new_strategy);
+  // Set the strategy to generate the names
+
+  // Methods, which access the strategy
+
+  const char *local_name (void) const;
+  // return the local name
+
+  const char *full_name (void) const;
+  // return the stringified full name
+
+  const char *flat_name (void) const;
+  // return the flattened full scoped name.
+
+  const char *repoID (void) const;
+  // retrieve the repository ID.
+
+  const char *full_skel_name (void) const;
+  // retrieve the fully scoped skel class name.
+
+  const char *full_coll_name (int) const;
+  // retrieve the fully qualified collocated class name
+
+  const char *local_coll_name (int) const;
+  // retrieve the fully qualified collocated class name.
+
+  const char *be_interface::relative_skel_name (const char *skel_name);
+  // relative skeleton name
+
+  void compute_full_skel_name (const char *prefix,char *&skel_name);
+  // Build up the skeleton name
+
+  static const char *relative_name (const char *localname, const char *othername);
+
   virtual void gen_def_ctors (TAO_OutStream* os);
   //call the default constructors of all the base classes
 
@@ -90,13 +333,6 @@ public:
   // Generate the out class implementation.
   // If any one of the argument is 0, then use the name giin this
   // node, else use the arguments.
-
-  const char *full_skel_name (void);
-  // Retrieve the fully scoped skel class name.
-
-  const char *ami_handler_full_skel_name (void);
-  // Retrieve the fully scoped skel AMI handler class name
-
   //
   // Each interface (to fix names "T") also defines two help classes,
   // the "collocated" class inherits from T, but delegates on the
@@ -108,35 +344,11 @@ public:
   // defines the stubs (all operations in T are pure virtual).
   // @@ TODO currently the stub class is not implemented.
   //
-  const char *full_coll_name (int);
-  // Retrieve the fully qualified collocated class name
-
-  const char *ami_handler_full_coll_name (void);
-  // Retrieve the fully qualified collocated AMI handler class name
-
-  const char *local_coll_name (int) const;
-  // Retrieve the fully qualified collocated class name.
-
-  const char *ami_handler_local_coll_name (void);
-  // Retrieve the fully qualified collocated AMI handler class name.
-
-  const char *ami_handler_local_name (void);
-  // Retrieve the local name of the AMI handler
-
-  int compute_coll_names (const char *local_name,
-                          char *&coll_local_name,
-                          char *&coll_full_name);
-  // Generate collocated local and full names for the arbitrary local
-  // name under the scope of this interface. Usefull to generate AMI
-  // Handlers.
 
   virtual int traverse_inheritance_graph (tao_code_emitter gen,
                                           TAO_OutStream *os);
   // template method using breadth first traversal of inheritance graph
 
-  const char *relative_skel_name (const char *other_class_name);
-  // relative skeleton name
-
   int in_mult_inheritance (void);
   // am I in some form of multiple inheritance
   // -1 => error
@@ -170,6 +382,12 @@ public:
   // helper method passed to the template method to generate code for the
   // operation table
 
+  static int ami_handler_gen_optable_helper (be_interface *,
+                                             be_interface *,
+                                             TAO_OutStream *os);
+  // helper method passed to the template method to generate code for the
+  // operation table
+
   static int gen_skel_helper (be_interface *,
                               be_interface *,
                               TAO_OutStream *os);
@@ -201,23 +419,12 @@ public:
   //helper method to generate a call to the copy constructors of all the base classes
 
 
-  void compute_fullskelname (void);
-  void compute_fullskelname (char *&skelname, const char * prefix);
-  // compute the fully scoped skel class name
-
   int gen_operation_table (void);
   // generate the operation table including entries for inherited interfaces
 
-  static const char *relative_name (const char* our_name,
-                                    const char *other_class_name);
-  // relative name for collocated class.
-
   int gen_optable_entries (be_interface *);
   // generate the operation table entries.
 
-  void compute_coll_name (int);
-  // compute the fully qualified collocated class name.
-
 private:
   void gen_gperf_input_header (TAO_OutStream *ss);
   // Output the header (type declaration and %%) to the gperf's input
@@ -253,36 +460,15 @@ private:
   void gen_linear_search_instance (void);
   // Create an instance of the linear search optable.
 
-  char *full_skel_name_;
-  // Fully scoped skeleton name.
-
-  char *ami_handler_full_skel_name_;
-  // Fully scoped AMI Handler skeleton name
-
   int skel_count_;
   // Number of static skeletons in the operation table.
 
-  char *full_coll_name_;
-  // Full collocated name
-
-  int cached_coll_name_type_;
-  // Record the type of cached collocated class prefix.
-
-  char *ami_handler_full_coll_name_;
-  // Full collocated name of the AMI handler
-
-  char *local_coll_name_;
-  // Local collocated name
-
-  char *ami_handler_local_coll_name_;
-  // Local collocated name of the AMI handler
-
-  char *ami_handler_local_name_;
-  // Local name of the AMI Handler
-
   int in_mult_inheritance_;
   // am I directly or indirectly involved in a multiple inheritance. If the
   // value is -1 => not computed yet.
+
+  be_interface_type_strategy *strategy_;
+  // Member for holding the strategy for generating names
 };
 
 #endif  // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h
index 70dd1d05b6d..02af9878a4d 100644
--- a/TAO/TAO_IDL/be_include/be_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h
@@ -23,13 +23,6 @@
 #ifndef BE_INTERFACE_FWD_H
 #define BE_INTERFACE_FWD_H
 
-#include "be_type.h"
-#include "ast_interface_fwd.h"
-
-class AST_Interface;
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_InterfaceFwd
  */
diff --git a/TAO/TAO_IDL/be_include/be_module.h b/TAO/TAO_IDL/be_include/be_module.h
index d3ada1c2a8a..944f85eb302 100644
--- a/TAO/TAO_IDL/be_include/be_module.h
+++ b/TAO/TAO_IDL/be_include/be_module.h
@@ -23,13 +23,6 @@
 #ifndef _BE_MODULE_H
 #define _BE_MODULE_H
 
-#include "be_scope.h"
-#include "be_decl.h"
-#include "ast_module.h"
-
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_Module
  */
diff --git a/TAO/TAO_IDL/be_include/be_native.h b/TAO/TAO_IDL/be_include/be_native.h
index 4c861669e65..63c043edf5e 100644
--- a/TAO/TAO_IDL/be_include/be_native.h
+++ b/TAO/TAO_IDL/be_include/be_native.h
@@ -21,12 +21,6 @@
 #ifndef BE_NATIVE_H
 #define BE_NATIVE_H
 
-#include "be_type.h"
-#include "ast_native.h"
-
-class UTL_StrList;
-class be_visitor;
-
 // Representation of "native" IDL type added by the POA spec
 
 class be_native : public virtual AST_Native, public virtual be_type
diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h
index 4a7556d2f6b..93f2c2d665e 100644
--- a/TAO/TAO_IDL/be_include/be_operation.h
+++ b/TAO/TAO_IDL/be_include/be_operation.h
@@ -22,13 +22,6 @@
 #ifndef BE_OPERATION_H
 #define BE_OPERATION_H
 
-#include "be_scope.h"
-#include "be_decl.h"
-#include "ast_operation.h"
-
-class AST_Type;
-class UTL_StrList;
-class be_visitor;
 class be_argument;
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h
index 6a682372da7..49b3f8727ba 100644
--- a/TAO/TAO_IDL/be_include/be_predefined_type.h
+++ b/TAO/TAO_IDL/be_include/be_predefined_type.h
@@ -23,12 +23,6 @@
 #ifndef _BE_PREDEFINED_TYPE_H
 #define _BE_PREDEFINED_TYPE_H
 
-#include "be_type.h"
-#include "ast_predefined_type.h"
-
-class UTL_StrList;
-class be_visitor;
-
 // be_classes.hh
 //
 // Defines all classes for dummy BE
diff --git a/TAO/TAO_IDL/be_include/be_root.h b/TAO/TAO_IDL/be_include/be_root.h
index 0f789bbfdbb..c325419ee3d 100644
--- a/TAO/TAO_IDL/be_include/be_root.h
+++ b/TAO/TAO_IDL/be_include/be_root.h
@@ -22,13 +22,6 @@
 #ifndef TAO_BE_ROOT_H
 #define TAO_BE_ROOT_H
 
-#include "be_decl.h"
-#include "be_scope.h"
-#include "ast_root.h"
-
-class UTL_StrList;
-class be_visitor;
-
 class be_root : public virtual AST_Root,
                 public virtual be_scope,
                 public virtual be_decl
diff --git a/TAO/TAO_IDL/be_include/be_scope.h b/TAO/TAO_IDL/be_include/be_scope.h
index ec5834df68c..45b567587b1 100644
--- a/TAO/TAO_IDL/be_include/be_scope.h
+++ b/TAO/TAO_IDL/be_include/be_scope.h
@@ -22,11 +22,7 @@
 #ifndef TAO_BE_SCOPE_H
 #define TAO_BE_SCOPE_H
 
-#include "utl_scope.h"
-#include "ast_decl.h"
-
 class be_decl;
-class be_visitor;
 
 /*
  * BE_Scope
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
index fdb18fd7e53..373dd0b062a 100644
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_sequence.h
@@ -22,14 +22,6 @@
 #ifndef BE_SEQUENCE_H
 #define BE_SEQUENCE_H
 
-#include "be_scope.h"
-#include "be_type.h"
-#include "ast_sequence.h"
-
-class AST_Expression;
-class AST_Type;
-class be_visitor;
-
 /*
  * BE_Sequence
  */
diff --git a/TAO/TAO_IDL/be_include/be_state.h b/TAO/TAO_IDL/be_include/be_state.h
index eaee5f30407..2b0fc01ce57 100644
--- a/TAO/TAO_IDL/be_include/be_state.h
+++ b/TAO/TAO_IDL/be_include/be_state.h
@@ -20,9 +20,6 @@
 #ifndef TAO_BE_STATE_H
 #define TAO_BE_STATE_H
 
-class be_type;
-class be_decl;
-
 class be_state
 {
   // =TITLE
diff --git a/TAO/TAO_IDL/be_include/be_stream_factory.h b/TAO/TAO_IDL/be_include/be_stream_factory.h
index 354d5730835..4fc14bc1e13 100644
--- a/TAO/TAO_IDL/be_include/be_stream_factory.h
+++ b/TAO/TAO_IDL/be_include/be_stream_factory.h
@@ -21,11 +21,6 @@
 #ifndef TAO_BE_FACTORY_H
 #define TAO_BE_FACTORY_H
 
-#include "ace/Singleton.h"
-#include "ace/Synch.h"
-
-class TAO_OutStream;
-
 class TAO_OutStream_Factory
 {
   // =TITLE
diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h
index 95c32af2fb1..9fdeac44ca4 100644
--- a/TAO/TAO_IDL/be_include/be_string.h
+++ b/TAO/TAO_IDL/be_include/be_string.h
@@ -22,12 +22,6 @@
 #ifndef BE_STRING_H
 #define BE_STRING_H
 
-#include "be_type.h"
-#include "ast_string.h"
-
-class AST_Expression;
-class be_visitor;
-
 /*
  * BE_String
  */
diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h
index 24bd279799f..a7f821a95a2 100644
--- a/TAO/TAO_IDL/be_include/be_structure.h
+++ b/TAO/TAO_IDL/be_include/be_structure.h
@@ -23,13 +23,6 @@
 #ifndef BE_STRUCTURE_H
 #define BE_STRUCTURE_H
 
-#include "be_scope.h"
-#include "be_type.h"
-#include "ast_structure.h"
-
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_Structure
  */
diff --git a/TAO/TAO_IDL/be_include/be_sunsoft.h b/TAO/TAO_IDL/be_include/be_sunsoft.h
index a44633f5395..4686c00750c 100644
--- a/TAO/TAO_IDL/be_include/be_sunsoft.h
+++ b/TAO/TAO_IDL/be_include/be_sunsoft.h
@@ -20,8 +20,6 @@
 #ifndef TAO_BE_HELPER_H
 #define TAO_BE_HELPER_H
 
-#include "be_helper.h"
-
 class TAO_SunSoft_OutStream : public TAO_OutStream
 {
   // =TITLE
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
index 070353c6149..f1b16123b58 100644
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ b/TAO/TAO_IDL/be_include/be_type.h
@@ -22,9 +22,6 @@
 #ifndef BE_TYPE_H
 #define BE_TYPE_H
 
-#include "be_decl.h"
-#include "ast_type.h"
-
 class TAO_OutStream;
 
 /*
@@ -45,7 +42,7 @@ public:
   virtual ~be_type (void);
 
   virtual int gen_var_defn (char *interface_local_name = 0);
-  // generate the _var class definition.
+  // generate the _var class definition. 
   // generate the var definition. If <interface_name> is not 0, generate
   // the var defn for that name. Otherwise, do it for the interface you
   // are visiting (this).
@@ -54,7 +51,7 @@ public:
                             char *interface_full_name = 0);
   // Generate the implementation for the _var class.
   // If any one of the argument is 0, then use the name in <this>,
-  // otherwise use the name given. Just making the class more useful.
+  // otherwise use the name given. Just making the class more useful. 
 
   virtual int gen_out_defn (char *interface_name = 0);
   // Generate the out class definition. If <interface_name> is not 0,
@@ -63,7 +60,7 @@ public:
 
   virtual int gen_out_impl (char *interface_local_name = 0,
                             char *interface_full_name = 0);
-  // Generate the out class implementation.
+  // Generate the out class implementation. 
   // If any one of the argument is 0, then use the name giin this
   // node, else use the arguments. );
 
diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h
index 8699239e5f9..32befef0852 100644
--- a/TAO/TAO_IDL/be_include/be_typedef.h
+++ b/TAO/TAO_IDL/be_include/be_typedef.h
@@ -22,12 +22,6 @@
 #ifndef BE_TYPEDEF_H
 #define BE_TYPEDEF_H
 
-#include "be_type.h"
-#include "ast_typedef.h"
-
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_Typedef
  */
diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h
index ab5b00fadd0..027d8804547 100644
--- a/TAO/TAO_IDL/be_include/be_union.h
+++ b/TAO/TAO_IDL/be_include/be_union.h
@@ -22,14 +22,6 @@
 #ifndef BE_UNION_H
 #define BE_UNION_H
 
-#include "be_type.h"
-#include "be_scope.h"
-#include "ast_union.h"
-
-class AST_ConcreteType;
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_Union
  */
@@ -67,7 +59,7 @@ public:
   // return the default index used
 
   virtual idl_bool in_recursion (be_type *node = 0);
-  // ar we or the parameter node involved in some kind of recursion
+  // ar we or the parameter node involved in some kind of recursion 
 
   // Visiting
   virtual int accept (be_visitor *visitor);
@@ -82,7 +74,6 @@ public:
     union PermittedTypes
     {
       char char_val;
-      ACE_CDR::WChar wchar_val;
       unsigned long bool_val;
       ACE_INT16 short_val;
       ACE_UINT16 ushort_val;
diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h
index b334ea15c10..8a364435e28 100644
--- a/TAO/TAO_IDL/be_include/be_union_branch.h
+++ b/TAO/TAO_IDL/be_include/be_union_branch.h
@@ -22,14 +22,6 @@
 #ifndef BE_UNION_BRANCH_H
 #define BE_UNION_BRANCH_H
 
-#include "be_decl.h"
-#include "ast_union_branch.h"
-
-class UTL_LabelList;
-class UTL_Type;
-class UTL_StrList;
-class be_visitor;
-
 /*
  * BE_UnionBranch
  */
@@ -41,20 +33,13 @@ public:
   be_union_branch (void);
   // default constructor
 
-  be_union_branch (UTL_LabelList *ll, 
-                   AST_Type *ft, 
-                   UTL_ScopedName *n,
+  be_union_branch (UTL_LabelList *ll, AST_Type *ft, UTL_ScopedName *n,
                    UTL_StrList *p);
   // constructor
 
-  int gen_label_value (TAO_OutStream *os, 
-                       unsigned long index = 0);
+  int gen_label_value (TAO_OutStream *os, unsigned long index = 0);
   // Generate the label value (as in a switch/case statement).
 
-  int gen_default_label_value (TAO_OutStream *os,
-                               be_union *bu);
-  // Generate the default label value (as in a switch/case statement).
-
   // Visiting
   virtual int accept (be_visitor *visitor);
 
diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h
index 536d9160bd9..7f5629ab15b 100644
--- a/TAO/TAO_IDL/be_include/be_union_label.h
+++ b/TAO/TAO_IDL/be_include/be_union_label.h
@@ -3,15 +3,10 @@
 #ifndef BE_UNION_LABEL_H
 #define BE_UNION_LABEL_H
 
-#include "ast_union_label.h"
-
-class be_visitor;
-
 /*
  * BE_UnionLabel
  */
-class   be_union_label : public virtual AST_UnionLabel
-{
+class   be_union_label : public virtual AST_UnionLabel {
 public:
   // Operations
   be_union_label();
diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h
index 819bee82351..a8f7a94e3a3 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype.h
@@ -20,8 +20,6 @@
 
 #ifdef IDL_HAS_VALUETYPE
 
-#include "be_interface.h"
-
 class TAO_OutStream;
 
 /*
diff --git a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
index b1cf603fbef..d6bb17f4586 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
@@ -26,8 +26,6 @@
 
 #ifdef IDL_HAS_VALUETYPE
 
-#include "be_interface_fwd.h"
-
 /*
  * BE_InterfaceFwd
  */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array.h b/TAO/TAO_IDL/be_include/be_visitor_array.h
index 619792ff8b1..8b001cb6f01 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array.h
@@ -32,6 +32,5 @@
 #include "be_visitor_array/any_op_cs.h"
 #include "be_visitor_array/cdr_op_ch.h"
 #include "be_visitor_array/cdr_op_ci.h"
-#include "be_visitor_array/cdr_op_cs.h"
 
 #endif /* TAO_BE_VISITOR_ARRAY_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
index ef8caeabe43..266e2696623 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
@@ -23,7 +23,7 @@
 #define _BE_VISITOR_ARRAY_CDR_OP_CI_H_
 
 // ************************************************************
-// class be_visitor_array_cdr_op_ci
+// class be_visitor_array_cs
 // ************************************************************
 
 class be_visitor_array_cdr_op_ci : public be_visitor_decl
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
deleted file mode 100644
index dc79510ed78..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_cs.h
-//
-// = DESCRIPTION
-//    The array's own CDR operators are generated in the .i file, but if the
-//    array contains an anonymous sequence, those CDR operators will not
-//    get generated on their own, and, since the sequence may contain a
-//    recursive type, they must also be generated in the .cpp file. That is
-//    the sole purpose of this visitor type.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_ARRAY_CDR_OP_CS_H_
-#define _BE_VISITOR_ARRAY_CDR_OP_CS_H_
-
-// ************************************************************
-// class be_visitor_array_cdr_op_cs
-// ************************************************************
-
-class be_visitor_array_cdr_op_cs : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_array_cdr_op_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for array that generates the CDR operator
-  //   implementations for the array's element type, if that type is
-  //   an anonymous sequence.
-  //
-
-public:
-  be_visitor_array_cdr_op_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_array_cdr_op_cs (void);
-  // destructor
-
-  virtual int visit_array (be_array *node);
-  // visit array
-
-};
-
-#endif /* _BE_VISITOR_ARRAY_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
index e35aed8ac7b..8f2e85f15fb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h
@@ -45,10 +45,13 @@
 #include "be_visitor_interface/tie_si.h"
 #include "be_visitor_interface/ami_handler_fwd_ch.h"
 #include "be_visitor_interface/ami_handler_fwd_ci.h"
-#include "be_visitor_interface/ami_handler_servant_ch.h"
-#include "be_visitor_interface/ami_handler_servant_cs.h"
 #include "be_visitor_interface/ami_handler_stub_ch.h"
 #include "be_visitor_interface/ami_handler_stub_cs.h"
+
+#if 0 /* We are using normal servant code */
 #include "be_visitor_interface/collocated_ami_handler_ch.h"
+#include "be_visitor_interface/ami_handler_servant_ch.h"
+#include "be_visitor_interface/ami_handler_servant_cs.h"
+#endif /* 0 */
 
 #endif /* _BE_VISITOR_INTERFACE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation.h
index e19952ca92d..dd637624a35 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation.h
@@ -61,6 +61,10 @@
 #include "be_visitor_operation/ami_handler_operation_ch.h"
 #include "be_visitor_operation/ami_handler_arglist.h"
 #include "be_visitor_operation/ami_handler_operation_cs.h"
+#include "be_visitor_operation/ami_handler_servant_operation_cs.h"
 #include "be_visitor_operation/ami_handler_skeleton_cs.h"
 #include "be_visitor_operation/ami_handler_argument_marshal.h"
+#include "be_visitor_operation/ami_handler_thru_poa_collocated_ch.h"
+#include "be_visitor_operation/ami_handler_thru_poa_collocated_cs.h"
+
 #endif // TAO_BE_VISITOR_OPERATION_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_servant_operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_servant_operation_cs.h
new file mode 100644
index 00000000000..66a2ef89ed8
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_servant_operation_cs.h
@@ -0,0 +1,142 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_servant_operation_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in server skeletons
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_AMI_HANDLER_SERVANT_OPERATION_CS_H_
+#define _BE_VISITOR_OPERATION_AMI_HANDLER_SERVANT_OPERATION_CS_H_
+
+// ************************************************************
+// Operation visitor for server skeletons
+// ************************************************************
+
+class be_visitor_operation_ami_handler_servant_operation_cs : public be_visitor_operation
+{
+  //
+  // = TITLE
+  //   be_visitor_operation_ami_handler_servant_operation_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server skeletons for operation
+  //
+  //
+public:
+
+  be_visitor_operation_ami_handler_servant_operation_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_ami_handler_servant_operation_cs (void);
+  // destructor
+
+  virtual int visit_operation (be_operation *node);
+  // visit operation. We provide code for this method in the derived class
+
+  virtual int visit_argument (be_argument *node);
+  // visit argument to generate ParamData entries
+
+  // template methods
+
+  virtual int gen_pre_skel_info (be_operation *, be_type *) = 0;
+  // generate any pre skeleton code info
+
+  virtual int gen_demarshal_params (be_operation *, be_type *) = 0;
+  // generate code for demarshaling incoming parameters
+
+  virtual int gen_marshal_params (be_operation *, be_type *) = 0;
+  // generate code for marshaling outgoing parameters
+
+  // = helper
+  virtual int post_process (be_decl *);
+  // stuff to output after every member of the scope is handled
+
+  virtual int gen_raise_exception (be_type *,
+                                   const char * excep,
+                                   const char * status,
+                                   const char * env);
+  // helper that generates code for raising an exception
+
+  virtual int gen_check_exception (be_type *, const char *env);
+  // helper that generates code for checking for an exception
+
+};
+
+// concrete visitors
+
+class be_interpretive_visitor_operation_ami_handler_servant_operation_cs : public be_visitor_operation_ami_handler_servant_operation_cs
+{
+  //
+  // = TITLE
+  //   be_interpretive_visitor_operation_ami_handler_servant_operation_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server skeletons for
+  //   operation using interpretive marshaling
+  //
+  //
+public:
+  be_interpretive_visitor_operation_ami_handler_servant_operation_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_interpretive_visitor_operation_ami_handler_servant_operation_cs (void);
+  // destructor
+
+  // template methods
+
+  virtual int gen_pre_skel_info (be_operation *, be_type *);
+  // generate any pre skeleton code info
+
+  virtual int gen_demarshal_params (be_operation *, be_type *);
+  // generate code for demarshaling incoming parameters
+
+  virtual int gen_marshal_params (be_operation *, be_type *);
+  // generate code for marshaling outgoing parameters
+
+};
+
+class be_compiled_visitor_operation_ami_handler_servant_operation_cs : public be_visitor_operation_ami_handler_servant_operation_cs
+{
+  //
+  // = TITLE
+  //   be_compiled_visitor_operation_ami_handler_servant_operation_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server skeletons for
+  //   operation using compiled marshaling
+  //
+  //
+public:
+  be_compiled_visitor_operation_ami_handler_servant_operation_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_compiled_visitor_operation_ami_handler_servant_operation_cs (void);
+  // destructor
+
+  // template methods
+
+  virtual int gen_pre_skel_info (be_operation *, be_type *);
+  // generate any pre skeleton code info
+
+  virtual int gen_demarshal_params (be_operation *, be_type *);
+  // generate code for demarshaling incoming parameters
+
+  virtual int gen_marshal_params (be_operation *, be_type *);
+  // generate code for marshaling outgoing parameters
+
+};
+
+#endif /* _BE_VISITOR_OPERATION_AMI_HANDLER_SERVANT_OPERATION_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_thru_poa_collocated_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_thru_poa_collocated_ch.h
new file mode 100644
index 00000000000..a7b09defbe9
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_thru_poa_collocated_ch.h
@@ -0,0 +1,53 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    thru_poa_collocated_ch.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations for the thru_poa collocated case
+//    inside of the servant header
+//    Special code for the AMI Reply Handler
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_ami_handler_thru_poa_collocated_ch_H_
+#define _BE_VISITOR_OPERATION_ami_handler_thru_poa_collocated_ch_H_
+
+// ************************************************************
+// Operation visitor for server header in the thru_poa collocated class
+// ************************************************************
+
+class be_visitor_operation_ami_handler_thru_poa_collocated_ch : public be_visitor_scope
+{
+  //
+  // = TITLE
+  //   be_visitor_operation_ami_handler_thru_poa_collocated_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for operation
+  //   in the thru_poa collocated class
+  //
+  //
+public:
+  be_visitor_operation_ami_handler_thru_poa_collocated_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_ami_handler_thru_poa_collocated_ch (void);
+  // destructor
+
+  virtual int visit_operation (be_operation *node);
+  // visit operation node.
+
+};
+
+#endif /* _BE_VISITOR_OPERATION_ami_handler_thru_poa_collocated_ch_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_thru_poa_collocated_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_thru_poa_collocated_cs.h
new file mode 100644
index 00000000000..b5eff14e374
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_thru_poa_collocated_cs.h
@@ -0,0 +1,58 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_thru_poa_collocated_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations for the thru_poa collocated case
+//    inside of the servant skeleton
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//    Michael Kircher
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_AMI_HANDLER_THRU_POA_COLLOCATED_CS_H_
+#define _BE_VISITOR_OPERATION_AMI_HANDLER_THRU_POA_COLLOCATED_CS_H_
+
+// *****************************************************************
+// Operation visitor for server skeletons for the thru_poa collocated class
+// *****************************************************************
+
+class be_visitor_operation_ami_handler_thru_poa_collocated_cs : public be_visitor_scope
+{
+  //
+  // = TITLE
+  //   be_visitor_operation_ss
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server skeletons for
+  //   operation in the thru_poa collocated class
+  //
+  //
+public:
+  be_visitor_operation_ami_handler_thru_poa_collocated_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_ami_handler_thru_poa_collocated_cs (void);
+  // destructor
+
+  virtual int visit_operation (be_operation *node);
+  // visit operation node.
+
+  virtual int gen_invoke (be_visitor_context &ctx, be_operation *node);
+  // A helper method to generate operation invocation code.
+
+  virtual int void_return_type (be_type *bt);
+  // is my return type void?
+};
+
+#endif /* _BE_VISITOR_OPERATION_AMI_HANDLER_THRU_POA_COLLOCATED_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
index 601300e9703..e701ed72120 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
@@ -23,8 +23,6 @@
 #ifndef _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_
 #define _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_
 
-#include "be_visitor_scope.h"
-
 const int TAO_BE_VISITOR_TYPECODE_DEFN_MAX_STACK_SIZE = 1024;
 
 class be_visitor_typecode_defn : public be_visitor_scope
@@ -223,8 +221,8 @@ public:
 
   // helper to get an array of long from a name
 
-  int tc_name2long (const char *name,
-                    ACE_CDR::ULong *&larr,
+  int tc_name2long (const char *name, 
+                    ACE_CDR::ULong *&larr, 
                     ACE_CDR::ULong &arrlen);
 
   // processing for scopes
@@ -242,7 +240,7 @@ public:
   };
 
 private:
-
+  
   ACE_CDR::Long computed_tc_size_;
   // the tc size of the node under consideration
 
@@ -252,7 +250,7 @@ private:
   ACE_CDR::Long computed_scope_encap_len_;
   // the encap length of the scope of the node under consideration
 
-  // the following are used for recursive and repeated typecodes
+  // the following are used for recursive and repeated typecodes 
 
   ACE_CDR::Long tc_offset_;
   // current computed length of the typecode
@@ -276,7 +274,7 @@ private:
 
   // queue related routines
 
-  const QNode *queue_insert (ACE_Unbounded_Queue <QNode*> &,
+  const QNode *queue_insert (ACE_Unbounded_Queue <QNode*> &, 
                              be_type *node, ACE_CDR::Long offset);
 
   const QNode *queue_lookup (ACE_Unbounded_Queue <QNode*> &, be_type *node);
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 271abe4660c..a5d2519763b 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -171,13 +171,6 @@ DRV_cpp_init (void)
       DRV_cpp_putarg ("-+");
 #endif /* ACE_MVS */
       DRV_cpp_putarg ("-E");
-#if defined (__HP_aCC)
-      DRV_cpp_putarg ("+W");
-      DRV_cpp_putarg ("67");     // Ignore "invalid #pragma directive"
-#endif /* __HP_aCC */
-#if defined (__IBMCPP__) && (__IBMCPP__ < 400)  // IBM C++ 3.6
-      DRV_cpp_putarg ("-qflag=w:w");  // Ignore info msg; invalid #pragma
-#endif /* __IBM_CPP__ */
 #endif /* !defined (__BORLANDC__) */
 
       // So we can find the required orb.idl file.
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index 78fc9f3c591..d220e987f50 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -267,7 +267,7 @@ oneway		return IDL_ONEWAY;
 ^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		{
 		  idl_parse_line_and_file(ace_yytext);
 		}
-^#line[ \t]*[0-9]+[ \t]*("\""[^\"]*"\"")?{NL}		|
+^#line[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		|
 ^\?\?=line[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		{
 		  idl_parse_line_and_file(ace_yytext);
 		}
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 1906aa25f28..29a0c40c016 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -283,7 +283,7 @@ static void tao_yy_fatal_error TAO_YY_PROTO(( tao_yyconst char msg[] ));
 
 #define TAO_YY_NUM_RULES 79
 #define TAO_YY_END_OF_BUFFER 80
-static tao_yyconst short int tao_yy_accept[392] =
+static tao_yyconst short int tao_yy_accept[393] =
     {   0,
        76,   76,   80,   78,   76,   77,   77,   78,   78,   78,
        78,   78,   56,   52,   78,   78,   78,   48,   48,   48,
@@ -319,15 +319,15 @@ static tao_yyconst short int tao_yy_accept[392] =
        48,    2,   30,   44,   48,   35,    3,   48,   48,   13,
 
        11,   48,   17,   48,   48,   48,   48,   48,   64,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   48,
-       48,   27,    7,   19,   48,   48,   34,   48,   48,   48,
-       48,   10,   48,   48,   14,    0,   72,   72,    0,   68,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       48,   48,   27,    7,   19,   48,   48,   34,   48,   48,
+       48,   48,   10,   48,   48,   14,    0,   72,   72,    0,
         0,    0,   67,    0,    0,    0,    0,   31,   48,   48,
        48,    4,   15,   36,   48,   24,   48,    0,    0,    0,
        65,    0,    0,    0,    0,    0,    0,    5,    6,    8,
-       48,   38,    0,   62,   62,    0,   73,   73,    0,    0,
-        0,   48,    0,    0,    0,   37,   69,    0,   63,   63,
-        0
+       48,   38,   68,    0,   62,   62,    0,   73,   73,    0,
+        0,    0,   48,    0,    0,    0,   37,   69,    0,   63,
+       63,    0
 
     } ;
 
@@ -373,105 +373,105 @@ static tao_yyconst int tao_yy_meta[58] =
         6,    8,    6,    8,    6,    6,    6
     } ;
 
-static tao_yyconst short int tao_yy_base[410] =
+static tao_yyconst short int tao_yy_base[411] =
     {   0,
-        0,   51,  740,  741,   57,  741,  741,   54,  706,   49,
-       52,   60,   62,   67,  721,  719,  716,    0,  713,  706,
-       44,  686,   50,   60,   42,  688,  685,  683,  682,  693,
-       47,   52,   36,   69,   59,  681,   78,   75,  125,  705,
-      112,   98,  741,    0,  717,  128,  118,  133,  138,  176,
-      741,  116,  160,  171,  182,  197,    0,  210,  741,  741,
-      741,    0,  697,  692,  671,  664,  668,  672,  667,  682,
-      670,  664,  674,  660,  659,  674,  663,  112,  663,  670,
-      655,  654,  666,  652,  660,  666,  658,  665,  650,  651,
-      647,  648,  652,  641,  645,   72,  648,  648,  648,  637,
-
-      644,  741,  138,  214,  649,  643,  635,  665,  145,  741,
-      675,  674,  223,  673,  227,    0,  232,  243,  741,  167,
-      741,  229,    0,  165,  247,    0,  651,  655,  626,    0,
-      627,  632,  636,  624,  115,  621,  637,  635,  625,  630,
-      633,  615,  613,  626,  623,  610,  619,  622,  605,    0,
-      605,  614,  606,  618,  602,  604,  156,  605,  600,  605,
-      611,  602,  605,  594,  608,  610,  594,  637,  636,  602,
-      594,  604,  290,  741,  741,  261,  630,    0,  263,  274,
-      741,  613,    0,  586,  592,  595,    0,    0,  581,  593,
-      584,  577,  585,    0,  580,  575,    0,  574,  575,    0,
-
-      580,  569,  570,  586,  585,  576,  579,  570,  577,  563,
-      568,  576,  565,  574,  573,  571,  562,  566,  567,    0,
-      555,  561,  597,  277,  556,  562,  559,  555,  741,  196,
-      305,  560,  554,  546,  741,  587,  741,  586,    0,  501,
-      488,  486,    0,  461,  456,  453,  457,  431,    0,    0,
-      432,  431,  430,    0,  410,  413,  426,  410,  413,  412,
-        0,  416,  377,  375,  378,  380,  375,    0,  367,  348,
-        0,  348,  741,  309,  341,  326,  341,  374,  373,  335,
-      327,  336,  323,  306,  305,  298,    0,  293,    0,  301,
-      308,    0,    0,    0,  300,    0,    0,  293,  295,    0,
-
-        0,  277,    0,  275,  282,  278,  259,  274,  741,  332,
-      264,  347,  362,  272,  297,  351,  256,  261,  256,  244,
-      234,    0,    0,    0,  237,  246,    0,  216,  231,  214,
-      229,    0,  222,  207,    0,  354,  741,  366,  386,  741,
-      246,  133,  741,  381,  193,  396,  191,    0,  188,  177,
-      175,    0,    0,    0,  169,    0,  165,  187,  378,  400,
-      741,  402,  405,  417,  422,  425,  128,    0,    0,    0,
-      112,    0,  431,  741,  439,  441,  741,  443,  104,   89,
-      156,   50,   64,  445,  447,    0,  741,  450,  741,  452,
-      741,  473,  481,  485,  491,  499,  507,  511,  515,  518,
-
-      525,  530,  537,  545,  553,  561,  569,  577,  585
+        0,   51,  736,  737,   57,  737,  737,   54,  702,   49,
+       52,   60,   62,   67,  717,  715,  712,    0,  709,  702,
+       44,  682,   50,   60,   42,  684,  681,  679,  678,  689,
+       47,   52,   36,   69,   59,  677,   78,   75,  125,  701,
+      112,   98,  737,    0,  713,  128,  118,  133,  138,  176,
+      737,  116,  160,  171,  182,  197,    0,  210,  737,  737,
+      737,    0,  693,  688,  667,  660,  664,  668,  663,  678,
+      666,  660,  670,  656,  655,  670,  659,  112,  659,  666,
+      651,  650,  662,  648,  656,  662,  654,  661,  646,  647,
+      643,  644,  648,  637,  641,   72,  644,  644,  644,  633,
+
+      640,  737,  138,  214,  645,  639,  631,  661,  145,  737,
+      671,  670,  223,  669,  227,    0,  232,  243,  737,  167,
+      737,  229,    0,  165,  247,    0,  647,  651,  622,    0,
+      623,  628,  632,  620,  115,  617,  633,  631,  621,  626,
+      629,  611,  609,  622,  619,  606,  615,  618,  601,    0,
+      601,  610,  602,  614,  598,  600,  156,  601,  596,  601,
+      607,  598,  601,  590,  604,  606,  590,  633,  632,  598,
+      590,  600,  290,  737,  737,  261,  626,    0,  263,  274,
+      737,  609,    0,  582,  588,  591,    0,    0,  577,  589,
+      580,  573,  581,    0,  576,  571,    0,  570,  571,    0,
+
+      576,  565,  566,  582,  581,  572,  575,  566,  573,  559,
+      564,  572,  561,  570,  569,  567,  558,  562,  563,    0,
+      551,  557,  593,  277,  552,  558,  555,  551,  737,  196,
+      305,  556,  550,  542,  737,  583,  737,  525,    0,  486,
+      482,  479,    0,  442,  449,  449,  441,  417,    0,    0,
+      427,  427,  425,    0,  405,  408,  421,  405,  409,  408,
+        0,  385,  370,  368,  375,  377,  372,    0,  364,  356,
+        0,  361,  737,  309,  348,  326,  344,  375,  374,  340,
+      332,  342,  322,  303,  309,  299,    0,  298,    0,  302,
+      309,    0,    0,    0,  304,    0,    0,  295,  300,    0,
+
+        0,  280,    0,  277,  287,  283,  260,  275,  737,  332,
+      264,  347,  352,  355,  280,  301,  369,  257,  263,  259,
+      245,  244,    0,    0,    0,  239,  247,    0,  226,  234,
+      219,  230,    0,  226,  212,    0,  361,  737,  372,  249,
+      246,  133,  737,  380,  193,  383,  191,    0,  188,  177,
+      175,    0,    0,    0,  169,    0,  165,  187,  383,  388,
+      737,  399,  402,  414,  419,  422,  128,    0,    0,    0,
+      112,    0,  737,  428,  737,  436,  438,  737,  440,  104,
+       89,  156,   50,   64,  442,  444,    0,  737,  447,  737,
+      449,  737,  470,  478,  482,  488,  496,  504,  508,  512,
+
+      515,  522,  527,  534,  542,  550,  558,  566,  574,  582
     } ;
 
-static tao_yyconst short int tao_yy_def[410] =
+static tao_yyconst short int tao_yy_def[411] =
     {   0,
-      391,    1,  391,  391,  391,  391,  391,  392,  393,  391,
-      391,  391,  391,  391,  391,  391,  391,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  391,  391,
-      391,  392,  391,  395,  391,  396,  391,  391,  391,  391,
-      391,  397,   50,  391,  391,  391,  398,  391,  391,  391,
-      391,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-
-       39,  391,   39,  391,  391,  391,  391,  391,  392,  391,
-      391,  391,  391,  399,  391,  400,  391,  391,  391,  397,
-      391,  397,   53,  391,  391,  398,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  401,  391,  391,
-      391,  391,  391,  391,  391,  391,  402,  400,  391,  391,
-      391,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  401,  391,  391,  391,  391,  173,  391,  173,
-      391,  391,  391,  391,  391,  391,  391,  391,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  391,  391,  391,  391,  391,  403,  391,  391,
-      391,  391,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-
-      394,  394,  394,  394,  394,  394,  394,  394,  391,  391,
-      404,  391,  391,  391,  403,  391,  391,  391,  391,  394,
-      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
-      394,  394,  394,  394,  394,  404,  391,  404,  391,  391,
-      405,  391,  391,  391,  391,  391,  391,  394,  394,  394,
-      394,  394,  394,  394,  394,  394,  394,  405,  391,  406,
-      391,  391,  407,  391,  391,  391,  391,  394,  394,  394,
-      394,  394,  406,  391,  406,  407,  391,  407,  408,  391,
-      391,  394,  408,  391,  409,  394,  391,  409,  391,  409,
-        0,  391,  391,  391,  391,  391,  391,  391,  391,  391,
-
-      391,  391,  391,  391,  391,  391,  391,  391,  391
+      392,    1,  392,  392,  392,  392,  392,  393,  394,  392,
+      392,  392,  392,  392,  392,  392,  392,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  392,  392,
+      392,  393,  392,  396,  392,  397,  392,  392,  392,  392,
+      392,  398,   50,  392,  392,  392,  399,  392,  392,  392,
+      392,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+
+       39,  392,   39,  392,  392,  392,  392,  392,  393,  392,
+      392,  392,  392,  400,  392,  401,  392,  392,  392,  398,
+      392,  398,   53,  392,  392,  399,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  402,  392,  392,
+      392,  392,  392,  392,  392,  392,  403,  401,  392,  392,
+      392,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  402,  392,  392,  392,  392,  173,  392,  173,
+      392,  392,  392,  392,  392,  392,  392,  392,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  392,  392,  392,  392,  392,  404,  392,  392,
+      392,  392,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+
+      395,  395,  395,  395,  395,  395,  395,  395,  392,  392,
+      405,  392,  392,  392,  392,  404,  392,  392,  392,  392,
+      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  405,  392,  405,  406,
+      392,  392,  392,  392,  392,  392,  392,  395,  395,  395,
+      395,  395,  395,  395,  395,  395,  395,  406,  392,  407,
+      392,  392,  408,  392,  392,  392,  392,  395,  395,  395,
+      395,  395,  392,  407,  392,  407,  408,  392,  408,  409,
+      392,  392,  395,  409,  392,  410,  395,  392,  410,  392,
+      410,    0,  392,  392,  392,  392,  392,  392,  392,  392,
+
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392
     } ;
 
-static tao_yyconst short int tao_yy_nxt[799] =
+static tao_yyconst short int tao_yy_nxt[795] =
     {   0,
         4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
        10,   11,   12,   13,   14,   14,   15,   16,    4,   17,
@@ -479,91 +479,91 @@ static tao_yyconst short int tao_yy_nxt[799] =
        18,   18,    4,    4,   21,   22,   23,   24,   25,   26,
        18,   18,   27,   28,   29,   30,   31,   32,   18,   33,
        34,   35,   36,   37,   38,   18,   18,   39,   41,   43,
-       47,   41,   48,   49,   49,   50,   50,   50,   51,  384,
+       47,   41,   48,   49,   49,   50,   50,   50,   51,  385,
        87,   40,   52,   53,   88,   54,   54,   55,   53,   65,
-       58,   58,   58,   82,   69,   56,   44,   75,  386,   66,
-       56,   70,   83,   57,  379,   67,   71,   76,   73,   84,
+       58,   58,   58,   82,   69,   56,   44,   75,  387,   66,
+       56,   70,   83,   57,  380,   67,   71,   76,   73,   84,
 
-       56,   85,   72,   43,   86,   56,   74,   89,   94,  384,
+       56,   85,   72,   43,   86,   56,   74,   89,   94,  385,
        90,   99,   97,   41,  162,   95,   41,   57,  121,  122,
        91,   92,  163,   93,   98,  100,  101,  102,  102,  103,
        44,   50,   50,   50,  360,  112,  122,  360,  104,  104,
       104,  113,  113,  168,   53,  102,  115,  115,   55,   53,
-       43,  117,  117,  117,  142,  382,   56,  385,  143,  114,
-      385,   56,  381,  144,  116,  189,  190,  105,  106,  121,
+       43,  117,  117,  117,  142,  383,   56,  386,  143,  114,
+      386,   56,  382,  144,  116,  189,  190,  105,  106,  121,
       122,   56,  107,  123,  123,  123,   56,   44,  125,  125,
-      125,  391,   53,  114,   54,   54,   55,  122,  116,   50,
+      125,  392,   53,  114,   54,   54,   55,  122,  116,   50,
        50,   50,  359,   53,   56,   55,   55,   55,  211,  118,
 
       119,  278,  119,  372,  371,   56,  124,  124,  212,   56,
       125,  125,  125,  370,  118,  119,  102,  102,  169,  119,
        56,   53,  369,   58,   58,   58,  368,  104,  104,  104,
-      175,  121,  122,   56,  102,  367,  176,  176,   53,  391,
+      175,  121,  122,   56,  102,  367,  176,  176,   53,  392,
       115,  115,   55,   53,  363,  117,  117,  117,   56,  122,
-       56,  359,  179,  179,  357,   56,  180,  180,  180,  356,
-      125,  125,  125,  355,  354,   56,  337,  338,  235,  353,
-       56,  181,  352,  181,  236,  236,  180,  180,  180,  273,
-      273,  274,  351,  350,  338,  349,  181,  180,  180,  180,
-      181,  228,  229,  229,  230,  348,  347,  273,  119,  346,
-
-      119,  345,  316,  231,  231,  231,  342,  229,  229,  279,
-      229,  309,  309,  119,  335,  334,  333,  119,  231,  231,
-      231,  332,  310,  310,  310,  229,  331,  312,  330,  309,
-      312,  329,  232,  233,  309,  309,  328,  234,  327,  313,
-      313,  313,  326,  325,  324,  310,  310,  310,  312,  323,
-      322,  312,  309,  343,  343,  344,  337,  338,  321,  320,
-      313,  313,  313,  339,  340,  340,  339,  341,  337,  338,
-      319,  343,  318,  317,  338,  313,  313,  313,  278,  316,
-      340,  340,  340,  361,  361,  314,  338,  339,  340,  340,
-      339,  341,  311,  308,  362,  362,  362,  364,  340,  307,
-
-      365,  361,  374,  375,  361,  361,  340,  377,  378,  366,
-      366,  366,  306,  305,  304,  362,  362,  362,  364,  303,
-      375,  365,  361,  364,  302,  378,  365,  379,  301,  380,
-      366,  366,  366,  374,  375,  366,  366,  366,  366,  366,
-      366,  374,  375,  377,  378,  377,  378,  387,  387,  389,
-      390,  375,  389,  390,  389,  390,  300,  299,  298,  375,
-      297,  378,  296,  378,  295,  387,  294,  390,  293,  292,
-      390,  291,  390,   42,   42,   42,   42,   42,   42,   42,
-       42,   45,  290,   45,   45,   45,   45,   45,   45,   62,
-       62,   62,   62,  109,  109,  289,  288,  109,  109,  111,
-
-      287,  111,  111,  111,  111,  111,  111,  120,  120,  120,
-      120,  120,  120,  120,  120,  126,  286,  126,  177,  177,
-      285,  177,  178,  284,  178,  223,  223,  223,  223,  223,
-      223,  223,  223,  238,  238,  283,  238,  315,  315,  315,
-      315,  315,  315,  315,  315,  336,  336,  336,  336,  336,
-      336,  336,  336,  358,  358,  358,  358,  358,  358,  358,
-      358,  373,  373,  373,  373,  373,  373,  373,  373,  376,
-      376,  376,  376,  376,  376,  376,  376,  383,  383,  383,
-      383,  383,  383,  383,  383,  388,  388,  388,  388,  388,
-      388,  388,  388,  237,  235,  282,  281,  280,  391,  277,
-
-      276,  275,  224,  272,  271,  270,  269,  268,  267,  266,
-      265,  264,  263,  262,  261,  260,  259,  258,  257,  256,
-      255,  254,  253,  252,  251,  250,  249,  248,  247,  246,
-      245,  244,  243,  242,  241,  240,  239,  237,  227,  226,
-      225,  168,  224,  222,  221,  220,  219,  218,  217,  216,
-      215,  214,  213,  210,  209,  208,  207,  206,  205,  204,
-      203,  202,  201,  200,  199,  198,  197,  196,  195,  194,
-      193,  192,  191,  188,  187,  186,  185,  184,  183,  182,
-      174,  174,  174,  173,  172,  171,  170,  391,  167,  166,
-      165,  164,  161,  160,  159,  158,  157,  156,  155,  154,
-
-      153,  152,  151,  150,  149,  148,  147,  146,  145,  141,
-      140,  139,  138,  137,  136,  135,  134,  133,  132,  131,
-      130,  129,  128,  127,  110,  108,   96,   81,   80,   79,
-       78,   77,   68,   64,   63,   61,   60,   59,   46,  391,
-        3,  391,  391,  391,  391,  391,  391,  391,  391,  391,
-      391,  391,  391,  391,  391,  391,  391,  391,  391,  391,
-      391,  391,  391,  391,  391,  391,  391,  391,  391,  391,
-      391,  391,  391,  391,  391,  391,  391,  391,  391,  391,
-      391,  391,  391,  391,  391,  391,  391,  391,  391,  391,
-      391,  391,  391,  391,  391,  391,  391,  391
+       56,  340,  179,  179,  359,   56,  180,  180,  180,  357,
+      125,  125,  125,  356,  355,   56,  338,  339,  235,  354,
+       56,  181,  353,  181,  236,  236,  180,  180,  180,  273,
+      273,  274,  352,  351,  339,  350,  181,  180,  180,  180,
+      181,  228,  229,  229,  230,  349,  348,  273,  119,  347,
+
+      119,  346,  345,  231,  231,  231,  317,  229,  229,  279,
+      229,  309,  309,  119,  342,  336,  335,  119,  231,  231,
+      231,  334,  310,  310,  310,  229,  333,  312,  332,  309,
+      313,  331,  232,  233,  309,  309,  330,  234,  329,  314,
+      314,  314,  328,  327,  326,  310,  310,  310,  312,  325,
+      324,  313,  309,  312,  323,  322,  313,  340,  321,  341,
+      314,  314,  314,  338,  339,  314,  314,  314,  314,  314,
+      314,  343,  343,  344,  338,  339,  320,  319,  318,  278,
+      317,  339,  361,  361,  364,  373,  373,  365,  315,  343,
+      375,  376,  339,  362,  362,  362,  366,  366,  366,  311,
+
+      361,  361,  361,  373,  378,  379,  308,  307,  376,  306,
+      305,  304,  362,  362,  362,  364,  303,  302,  365,  361,
+      364,  301,  379,  365,  380,  300,  381,  366,  366,  366,
+      375,  376,  366,  366,  366,  366,  366,  366,  375,  376,
+      378,  379,  378,  379,  388,  388,  390,  391,  376,  390,
+      391,  390,  391,  299,  298,  297,  376,  296,  379,  295,
+      379,  294,  388,  293,  391,  292,  291,  391,  290,  391,
+       42,   42,   42,   42,   42,   42,   42,   42,   45,  289,
+       45,   45,   45,   45,   45,   45,   62,   62,   62,   62,
+      109,  109,  288,  287,  109,  109,  111,  286,  111,  111,
+
+      111,  111,  111,  111,  120,  120,  120,  120,  120,  120,
+      120,  120,  126,  285,  126,  177,  177,  284,  177,  178,
+      283,  178,  223,  223,  223,  223,  223,  223,  223,  223,
+      238,  238,  237,  238,  316,  316,  316,  316,  316,  316,
+      316,  316,  337,  337,  337,  337,  337,  337,  337,  337,
+      358,  358,  358,  358,  358,  358,  358,  358,  374,  374,
+      374,  374,  374,  374,  374,  374,  377,  377,  377,  377,
+      377,  377,  377,  377,  384,  384,  384,  384,  384,  384,
+      384,  384,  389,  389,  389,  389,  389,  389,  389,  389,
+      235,  282,  281,  280,  392,  277,  276,  275,  224,  272,
+
+      271,  270,  269,  268,  267,  266,  265,  264,  263,  262,
+      261,  260,  259,  258,  257,  256,  255,  254,  253,  252,
+      251,  250,  249,  248,  247,  246,  245,  244,  243,  242,
+      241,  240,  239,  237,  227,  226,  225,  168,  224,  222,
+      221,  220,  219,  218,  217,  216,  215,  214,  213,  210,
+      209,  208,  207,  206,  205,  204,  203,  202,  201,  200,
+      199,  198,  197,  196,  195,  194,  193,  192,  191,  188,
+      187,  186,  185,  184,  183,  182,  174,  174,  174,  173,
+      172,  171,  170,  392,  167,  166,  165,  164,  161,  160,
+      159,  158,  157,  156,  155,  154,  153,  152,  151,  150,
+
+      149,  148,  147,  146,  145,  141,  140,  139,  138,  137,
+      136,  135,  134,  133,  132,  131,  130,  129,  128,  127,
+      110,  108,   96,   81,   80,   79,   78,   77,   68,   64,
+       63,   61,   60,   59,   46,  392,    3,  392,  392,  392,
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392
 
     } ;
 
-static tao_yyconst short int tao_yy_chk[799] =
+static tao_yyconst short int tao_yy_chk[795] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -571,18 +571,18 @@ static tao_yyconst short int tao_yy_chk[799] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    2,    5,    8,
-       10,    5,   10,   10,   10,   11,   11,   11,   12,  383,
+       10,    5,   10,   10,   10,   11,   11,   11,   12,  384,
        33,    2,   12,   13,   33,   13,   13,   13,   14,   21,
-       14,   14,   14,   31,   23,   13,    8,   25,  382,   21,
-       14,   23,   31,   13,  380,   21,   23,   25,   24,   31,
+       14,   14,   14,   31,   23,   13,    8,   25,  383,   21,
+       14,   23,   31,   13,  381,   21,   23,   25,   24,   31,
 
-       13,   32,   23,   42,   32,   14,   24,   34,   35,  379,
+       13,   32,   23,   42,   32,   14,   24,   34,   35,  380,
        34,   38,   37,   41,   96,   35,   41,   13,   52,   52,
        34,   34,   96,   34,   37,   38,   39,   39,   39,   39,
        42,   47,   47,   47,  342,   46,   52,  342,   39,   39,
        39,   46,   46,  103,   48,   39,   48,   48,   48,   49,
-      109,   49,   49,   49,   78,  371,   48,  381,   78,   46,
-      381,   49,  367,   78,   48,  135,  135,   39,   39,  120,
+      109,   49,   49,   49,   78,  371,   48,  382,   78,   46,
+      382,   49,  367,   78,   48,  135,  135,   39,   39,  120,
       120,   48,   39,   53,   53,   53,   49,  109,  124,  124,
       124,  103,   54,   46,   54,   54,   54,  120,   48,   50,
        50,   50,  358,   55,   54,   55,   55,   55,  157,   50,
@@ -592,66 +592,66 @@ static tao_yyconst short int tao_yy_chk[799] =
        55,   58,  350,   58,   58,   58,  349,  104,  104,  104,
       113,  122,  122,   58,  104,  347,  113,  113,  115,  230,
       115,  115,  115,  117,  345,  117,  117,  117,   58,  122,
-      115,  341,  118,  118,  334,  117,  118,  118,  118,  333,
-      125,  125,  125,  331,  330,  115,  311,  311,  176,  329,
-      117,  125,  328,  125,  176,  176,  179,  179,  179,  224,
-      224,  224,  326,  325,  311,  321,  125,  180,  180,  180,
-      125,  173,  173,  173,  173,  320,  319,  224,  180,  318,
-
-      180,  317,  315,  173,  173,  173,  314,  231,  231,  231,
-      173,  274,  274,  180,  308,  307,  306,  180,  231,  231,
-      231,  305,  274,  274,  274,  231,  304,  276,  302,  274,
-      276,  299,  173,  173,  310,  310,  298,  173,  295,  276,
-      276,  276,  291,  290,  288,  310,  310,  310,  312,  286,
-      285,  312,  310,  316,  316,  316,  336,  336,  284,  283,
-      312,  312,  312,  313,  313,  313,  313,  313,  338,  338,
-      282,  316,  281,  280,  336,  313,  313,  313,  279,  278,
-      359,  359,  313,  344,  344,  277,  338,  339,  339,  339,
-      339,  339,  275,  272,  344,  344,  344,  346,  359,  270,
-
-      346,  344,  360,  360,  362,  362,  339,  363,  363,  346,
-      346,  346,  269,  267,  266,  362,  362,  362,  364,  265,
-      360,  364,  362,  365,  264,  363,  365,  365,  263,  366,
-      364,  364,  364,  373,  373,  365,  365,  365,  366,  366,
-      366,  375,  375,  376,  376,  378,  378,  384,  384,  385,
-      385,  373,  388,  388,  390,  390,  262,  260,  259,  375,
-      258,  376,  257,  378,  256,  384,  255,  385,  253,  252,
-      388,  251,  390,  392,  392,  392,  392,  392,  392,  392,
-      392,  393,  248,  393,  393,  393,  393,  393,  393,  394,
-      394,  394,  394,  395,  395,  247,  246,  395,  395,  396,
-
-      245,  396,  396,  396,  396,  396,  396,  397,  397,  397,
-      397,  397,  397,  397,  397,  398,  244,  398,  399,  399,
-      242,  399,  400,  241,  400,  401,  401,  401,  401,  401,
-      401,  401,  401,  402,  402,  240,  402,  403,  403,  403,
-      403,  403,  403,  403,  403,  404,  404,  404,  404,  404,
-      404,  404,  404,  405,  405,  405,  405,  405,  405,  405,
-      405,  406,  406,  406,  406,  406,  406,  406,  406,  407,
-      407,  407,  407,  407,  407,  407,  407,  408,  408,  408,
-      408,  408,  408,  408,  408,  409,  409,  409,  409,  409,
-      409,  409,  409,  238,  236,  234,  233,  232,  228,  227,
-
-      226,  225,  223,  222,  221,  219,  218,  217,  216,  215,
-      214,  213,  212,  211,  210,  209,  208,  207,  206,  205,
-      204,  203,  202,  201,  199,  198,  196,  195,  193,  192,
-      191,  190,  189,  186,  185,  184,  182,  177,  172,  171,
-      170,  169,  168,  167,  166,  165,  164,  163,  162,  161,
-      160,  159,  158,  156,  155,  154,  153,  152,  151,  149,
-      148,  147,  146,  145,  144,  143,  142,  141,  140,  139,
-      138,  137,  136,  134,  133,  132,  131,  129,  128,  127,
-      114,  112,  111,  108,  107,  106,  105,  101,  100,   99,
-       98,   97,   95,   94,   93,   92,   91,   90,   89,   88,
-
-       87,   86,   85,   84,   83,   82,   81,   80,   79,   77,
-       76,   75,   74,   73,   72,   71,   70,   69,   68,   67,
-       66,   65,   64,   63,   45,   40,   36,   30,   29,   28,
-       27,   26,   22,   20,   19,   17,   16,   15,    9,    3,
-      391,  391,  391,  391,  391,  391,  391,  391,  391,  391,
-      391,  391,  391,  391,  391,  391,  391,  391,  391,  391,
-      391,  391,  391,  391,  391,  391,  391,  391,  391,  391,
-      391,  391,  391,  391,  391,  391,  391,  391,  391,  391,
-      391,  391,  391,  391,  391,  391,  391,  391,  391,  391,
-      391,  391,  391,  391,  391,  391,  391,  391
+      115,  341,  118,  118,  340,  117,  118,  118,  118,  335,
+      125,  125,  125,  334,  332,  115,  311,  311,  176,  331,
+      117,  125,  330,  125,  176,  176,  179,  179,  179,  224,
+      224,  224,  329,  327,  311,  326,  125,  180,  180,  180,
+      125,  173,  173,  173,  173,  322,  321,  224,  180,  320,
+
+      180,  319,  318,  173,  173,  173,  316,  231,  231,  231,
+      173,  274,  274,  180,  315,  308,  307,  180,  231,  231,
+      231,  306,  274,  274,  274,  231,  305,  276,  304,  274,
+      276,  302,  173,  173,  310,  310,  299,  173,  298,  276,
+      276,  276,  295,  291,  290,  310,  310,  310,  312,  288,
+      286,  312,  310,  313,  285,  284,  313,  313,  283,  314,
+      312,  312,  312,  337,  337,  313,  313,  313,  314,  314,
+      314,  317,  317,  317,  339,  339,  282,  281,  280,  279,
+      278,  337,  344,  344,  346,  359,  359,  346,  277,  317,
+      360,  360,  339,  344,  344,  344,  346,  346,  346,  275,
+
+      344,  362,  362,  359,  363,  363,  272,  270,  360,  269,
+      267,  266,  362,  362,  362,  364,  265,  264,  364,  362,
+      365,  263,  363,  365,  365,  262,  366,  364,  364,  364,
+      374,  374,  365,  365,  365,  366,  366,  366,  376,  376,
+      377,  377,  379,  379,  385,  385,  386,  386,  374,  389,
+      389,  391,  391,  260,  259,  258,  376,  257,  377,  256,
+      379,  255,  385,  253,  386,  252,  251,  389,  248,  391,
+      393,  393,  393,  393,  393,  393,  393,  393,  394,  247,
+      394,  394,  394,  394,  394,  394,  395,  395,  395,  395,
+      396,  396,  246,  245,  396,  396,  397,  244,  397,  397,
+
+      397,  397,  397,  397,  398,  398,  398,  398,  398,  398,
+      398,  398,  399,  242,  399,  400,  400,  241,  400,  401,
+      240,  401,  402,  402,  402,  402,  402,  402,  402,  402,
+      403,  403,  238,  403,  404,  404,  404,  404,  404,  404,
+      404,  404,  405,  405,  405,  405,  405,  405,  405,  405,
+      406,  406,  406,  406,  406,  406,  406,  406,  407,  407,
+      407,  407,  407,  407,  407,  407,  408,  408,  408,  408,
+      408,  408,  408,  408,  409,  409,  409,  409,  409,  409,
+      409,  409,  410,  410,  410,  410,  410,  410,  410,  410,
+      236,  234,  233,  232,  228,  227,  226,  225,  223,  222,
+
+      221,  219,  218,  217,  216,  215,  214,  213,  212,  211,
+      210,  209,  208,  207,  206,  205,  204,  203,  202,  201,
+      199,  198,  196,  195,  193,  192,  191,  190,  189,  186,
+      185,  184,  182,  177,  172,  171,  170,  169,  168,  167,
+      166,  165,  164,  163,  162,  161,  160,  159,  158,  156,
+      155,  154,  153,  152,  151,  149,  148,  147,  146,  145,
+      144,  143,  142,  141,  140,  139,  138,  137,  136,  134,
+      133,  132,  131,  129,  128,  127,  114,  112,  111,  108,
+      107,  106,  105,  101,  100,   99,   98,   97,   95,   94,
+       93,   92,   91,   90,   89,   88,   87,   86,   85,   84,
+
+       83,   82,   81,   80,   79,   77,   76,   75,   74,   73,
+       72,   71,   70,   69,   68,   67,   66,   65,   64,   63,
+       45,   40,   36,   30,   29,   28,   27,   26,   22,   20,
+       19,   17,   16,   15,    9,    3,  392,  392,  392,  392,
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      392,  392,  392,  392
 
     } ;
 
@@ -996,13 +996,13 @@ tao_yy_match:
 			while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
 				{
 				tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-				if ( tao_yy_current_state >= 392 )
+				if ( tao_yy_current_state >= 393 )
 					tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
 				}
 			tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
 			++tao_yy_cp;
 			}
-		while ( tao_yy_base[tao_yy_current_state] != 741 );
+		while ( tao_yy_base[tao_yy_current_state] != 737 );
 
 tao_yy_find_action:
 		tao_yy_act = tao_yy_accept[tao_yy_current_state];
@@ -1792,7 +1792,7 @@ static tao_yy_state_type tao_yy_get_previous_state()
 		while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
 			{
 			tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-			if ( tao_yy_current_state >= 392 )
+			if ( tao_yy_current_state >= 393 )
 				tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
 			}
 		tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
@@ -1827,11 +1827,11 @@ tao_yy_state_type tao_yy_current_state;
 	while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
 		{
 		tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-		if ( tao_yy_current_state >= 392 )
+		if ( tao_yy_current_state >= 393 )
 			tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
 		}
 	tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-	tao_yy_is_jam = (tao_yy_current_state == 391);
+	tao_yy_is_jam = (tao_yy_current_state == 392);
 
 	return tao_yy_is_jam ? 0 : tao_yy_current_state;
 	}
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index ef14aa5a441..a455914f445 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -86,9 +86,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include        "utl_scoped_name.h"
 #include        "utl_string.h"
 
-// This is for AIX w/IBM C++
-class Identifier;
-
 // This class is needed (only for g++) to get around a bug in g++ which
 // causes virtual operations to not be looked up correctly if an operation
 // is defined in more than one virtual public base class. This class makes
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index e49aa173ff2..7cf75626a5c 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -131,10 +131,6 @@ public:
   virtual void                  dump(ostream &o);
 
 private:
-  // Helper function for fwd_redefinition_helper.
-  static idl_bool compare_names (AST_Interface *that,
-                                 AST_Interface *other);
-
   // Data
   AST_Interface                 **pd_inherits;  // Inherited interfaces
                                                 // This is an array of pointers
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index be05997ff50..d852679038f 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -370,35 +370,19 @@ public:
   static const char *be_get_server_template_inline (UTL_String *idl_file_name,
                                                     int base_name_only = 0);
 
-  virtual const char* skel_export_macro (void) const;
-  // returns the macro name for exporting server side classes in Win32
-  // DLL.
+  virtual const char* export_macro (void) const;
+  // returns the macro name for exporting classes in Win32 DLL.
 
-  virtual void skel_export_macro (const char* s);
-  // set the macro name for export server side classes in Win32 DLL.
+  virtual void export_macro (const char* s);
+  // set the macro name for export classes in Win32 DLL.
 
-  virtual const char* skel_export_include (void) const;
-  // returns the name of the include file that contains the server
-  // side export macro definition.
+  virtual const char* export_include (void) const;
+  // returns the name of the include file that contains the export
+  // macro definition.
 
-  virtual void skel_export_include (const char* s);
-  // set the name of the include file that contains the server side
-  // export macro definition.
-
-  virtual const char* stub_export_macro (void) const;
-  // returns the macro name for exporting client side classes in Win32
-  // DLL.
-
-  virtual void stub_export_macro (const char* s);
-  // set the macro name for export client side classes in Win32 DLL.
-
-  virtual const char* stub_export_include (void) const;
-  // returns the name of the include file that contains the client
-  // side export macro definition.
-
-  virtual void stub_export_include (const char* s);
-  // set the name of the include file that contains the client side
-  // export macro definition.
+  virtual void export_include (const char* s);
+  // set the name of the include file that contains the export
+  // macro definition.
 
   virtual const char* pch_include (void) const;
   // returns the name of the include file to be used for precompiled
@@ -649,10 +633,8 @@ private:
   // files (e.g. tao/corba.h)  so that #include statements can be
   // generated with ""s or <>s respectively.
 
-  char* skel_export_macro_;
-  char* skel_export_include_;
-  char* stub_export_macro_;
-  char* stub_export_include_;
+  char* export_macro_;
+  char* export_include_;
   char* pch_include_;
 
   // Client's header file name ending. Default is "C.h".
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index 4c81734ce0f..ddb8f63312b 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -95,9 +95,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include        "ast_expression.h"
 #include        "utl_scoped_name.h"
 
-// This is for AIX w/IBM C++
-class Identifier;
-
 // Forward declaration of active iterator for UTL_Scope
 class UTL_ScopeActiveIterator;
 
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 289c045e94b..b8783829f18 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -108,10 +108,8 @@ IDL_GlobalData::IDL_GlobalData (void)
       pd_parse_state (PS_NoState),
       pd_idl_src_file (0),
       changing_standard_include_files_ (1),
-      skel_export_macro_ (0),
-      skel_export_include_ (0),
-      stub_export_macro_ (0),
-      stub_export_include_ (0),
+      export_macro_ (0),
+      export_include_ (0),
       pch_include_ (0),
       client_hdr_ending_ (ACE::strnew ("C.h")),
       client_stub_ending_ (ACE::strnew ("C.cpp")),
@@ -1012,62 +1010,30 @@ IDL_GlobalData::be_get_server_template_inline_fname (int base_name_only)
 }
 
 const char*
-IDL_GlobalData::skel_export_macro (void) const
+IDL_GlobalData::export_macro (void) const
 {
-  if (this->skel_export_macro_ == 0)
+  if (this->export_macro_ == 0)
     return "";
-  return this->skel_export_macro_;
+  return this->export_macro_;
 }
 
 void
-IDL_GlobalData::skel_export_macro (const char *s)
+IDL_GlobalData::export_macro (const char *s)
 {
-  this->skel_export_macro_ = ACE_OS::strdup (s);
+  this->export_macro_ = ACE_OS::strdup (s);
 }
 
 const char*
-IDL_GlobalData::skel_export_include (void) const
+IDL_GlobalData::export_include (void) const
 {
-  return this->skel_export_include_;
-}
-
-void
-IDL_GlobalData::skel_export_include (const char *s)
-{
-  this->skel_export_include_ = ACE_OS::strdup (s);
-}
-
-const char*
-IDL_GlobalData::stub_export_macro (void) const
-{
-  if (this->stub_export_macro_ == 0)
-    return "";
-  return this->stub_export_macro_;
-}
-
-void
-IDL_GlobalData::stub_export_macro (const char *s)
-{
-  this->stub_export_macro_ = ACE_OS::strdup (s);
-}
-
-const char*
-IDL_GlobalData::stub_export_include (void) const
-{
-  return this->stub_export_include_;
-}
-
-void
-IDL_GlobalData::stub_export_include (const char *s)
-{
-  this->stub_export_include_ = ACE_OS::strdup (s);
+  return this->export_include_;
 }
 
 const char*
 IDL_GlobalData::pch_include (void) const
 {
   return this->pch_include_;
-}
+}  
 
 void
 IDL_GlobalData::pch_include (const char *s)
@@ -1075,6 +1041,12 @@ IDL_GlobalData::pch_include (const char *s)
   this->pch_include_ = ACE_OS::strdup (s);
 }
 
+void
+IDL_GlobalData::export_include (const char *s)
+{
+  this->export_include_ = ACE_OS::strdup (s);
+}
+
 // Set the client_hdr_ending.
 void
 IDL_GlobalData::client_hdr_ending (const char* s)
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index 12711646731..fd948268d18 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -878,7 +878,7 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
           continue;
         }
 
-      long equal = 0;
+      long equal;
 
       if (scope_offset == 0)
         {
@@ -886,13 +886,7 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
         }
       else
         {
-          // If d is an argument in some other scope,
-          // whether or not it matches e is irrelevant,
-          // and can only cause problems if it does.
-          if (d->node_type () != AST_Decl::NT_argument)
-            {
-              equal = item_name->compare (e);
-            }
+          equal = item_name->compare (e);
         }
 
       if (equal) 
@@ -937,11 +931,11 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
  * Implements lookup by name for scoped names
  */
 AST_Decl *
-UTL_Scope::lookup_by_name (UTL_ScopedName *e, 
-                           idl_bool treat_as_ref,
-                           idl_bool in_parent,
-                           long start_index,
-                           long scope_offset)
+UTL_Scope::lookup_by_name(UTL_ScopedName *e, 
+                          idl_bool treat_as_ref,
+                          idl_bool in_parent,
+                          long start_index,
+                          long scope_offset)
 {
   AST_Decl *d;
   UTL_Scope *t = NULL;
@@ -998,15 +992,12 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
 
   while (1) 
     {
-      d = lookup_by_name_local (e->head (), 
-                                treat_as_ref, 
-                                index, 
-                                scope_offset);
+      d = lookup_by_name_local(e->head(), treat_as_ref, index, scope_offset);
 
       // If we have popped up to a parent scope, we
       // must check the other children, if we haven't 
       // had any luck so far.
-      if (d == NULL && scope_offset > 1)
+      if (d == NULL && scope_offset > 0)
         {
           UTL_ScopeActiveIterator *iter = 
             new UTL_ScopeActiveIterator (this,
@@ -1016,11 +1007,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
             {
               d = iter->item ();
               UTL_Scope *t = DeclAsScope (d);
-              if (t == NULL)
-                {
-                  d = NULL;
-                }
-              else
+              if (t != NULL)
                 {
                   AST_Interface *i = 
                     AST_Interface::narrow_from_scope (t);
@@ -1030,7 +1017,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
                                              treat_as_ref,
                                              0,
                                              0,
-                                             scope_offset - 1);
+                                             --scope_offset);
                     }
                   else
                     {
@@ -1081,7 +1068,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
                                              treat_as_ref, 
                                              in_parent, 
                                              0, 
-                                             scope_offset + 1);
+                                             ++scope_offset);
                     }
                 }
             }
diff --git a/TAO/VERSION b/TAO/VERSION
index 4afba02f1b2..99e38aec3ae 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 0.4.3, released Mon Jul 26 12:37:20 1999.
+This is TAO version 0.4, released Thu Jul 01 21:14:56 1999.
 
 If you have any problems with or questions about TAO, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 66dff6ace8e..4dd589018e0 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -170,8 +170,6 @@ merged with <a href="#-ORBCollocation"><code>-ORBCollocation</code></a>.
         -ORBEndpoint uiop://
         </CODE></blockquote>
         then a default endpoint will be created for the specified protocol.
-        <P>
-        This is a server side option.
     </TD>
   </TR>
 
@@ -280,10 +278,7 @@ merged with <a href="#-ORBCollocation"><code>-ORBCollocation</code></a>.
         The <CODE>-ORBPreconnect</CODE> option uses the same endpoint format as the
         <CODE>-ORBEndpoint</CODE> option.  Specifying IIOP endpoints using a comma
         delimited list of <EM>host<STRONG>:</STRONG>port</EM> pairs is deprecated
-        and will not be supported in the future.
-        <P>
-        This is a client side option.
-    </TD>
+        and will not be supported in the future.</TD>
   </TR>
   <TR>
     <TD><CODE>-ORBCDRTradeoff</CODE> <EM>maxsize</EM></TD>
@@ -317,20 +312,18 @@ merged with <a href="#-ORBCollocation"><code>-ORBCollocation</code></a>.
     <TD><CODE>-ORBInitRef</CODE> <EM>ObjectId=IOR</EM></TD>
     <TD><A name="-ORBInitRef"></a> Allows specification of an arbitrary
         object reference for an initial service. The IOR could be in any
-        one of the following formats : OMG IOR, URL, iioploc (including
-        uioploc) or file. iioploc is a multiple end-point IOR understood by
-        the string_to_object () method and used as a boot-strapping
-        mechanism by the resolve_initial_references () method. The mappings
-        specified through this argument override the orb-install-time
-        defaults. The file://<I>pathname</I> interprets the contents of the
-        <I>pathname</I> file as an object reference in any of the above
-        formats.
-    </TD>
+        one of the following formats : OMG IOR, URL, iioploc or
+        file. iioploc is a multiple end-point IOR understood by the
+        string_to_object () and used as a boot-strapping mechanism by the
+        resolve_initial_references (). The mappings specified through this
+        argument override the orb-install-time defaults. The
+        file://<I>pathname</I> interprets the contents of the <I>pathname</I> file
+        as an object reference in any of the above formats. </TD>
   </TR>
 
   <TR>
     <TD><CODE>-ORBDefaultInitRef</CODE> <EM>IOR prefix</EM></TD>
-    <TD><A name="-ORBDefaultInitRef"></a> This argument allows resolution of initial references not explicitly specified with -ORBInitRef. It requires a URL prefix that, after appending a slash '/' ('|' for UIOP pluggable protocol) and a simple object key, forms a new URL to identify an initial object reference. The URL prefix format currently supported is iioploc.</TD>
+    <TD><A name="-ORBDefaultInitRef"></a> This argument allows resolution of initial references not explicitly specified with -ORBInitRef. It requires a URL prefix that, after appending a slash '/' and a simple object key, forms a new URL to identify an initial object reference. The URL prefix format currently supported is iioploc.</TD>
   </TR>
 
   <TR>
@@ -472,8 +465,7 @@ The default is <code>select_mt</code></TD>
   </TR>
   <TR>
 
-    <TD><a name="orb_concurrency"><CODE>-ORBConcurrency</CODE></a>
-        <EM>which</EM></TD>
+    <TD><CODE>-ORBConcurrency</CODE> <EM>which</EM></TD>
     <TD>Specify which
         concurrency strategy to use.  Range of values is <code>reactive</code>
         for a purely Reactor-driven concurrency strategy or
@@ -607,8 +599,12 @@ The default is <code>select_mt</code></TD>
 -->
     <TD><CODE>-ORBConnectorLock</CODE> <EM>lock type</EM></TD>
     <TD><a
-        name="-ORBConnectorLock"></a>This option has been moved to the 
-	    client strategy factory.</TD>
+        name="-ORBConnectorLock"></a>Specify the type of lock to be used by
+        the connector.  Possible values for <em>lock type</em> are
+        <code>thread</code>, which specifies that an inter-thread mutex is
+        used to guarantee exclusive acccess, and <code>null</code>, which
+        specifies that no locking be performed.  The default is
+        <code>thread</code>.</TD>
   </TR>
 
 </TABLE>
@@ -624,7 +620,7 @@ The default is <code>select_mt</code></TD>
     <TH>Description</TH>
   </TR>
   <TR>
-    <TD><CODE><a name="#-ORBProfileLock">-ORBProfileLock</a></CODE> <EM>which</EM></TD>
+    <TD><CODE>-ORBProfileLock</CODE> <EM>which</EM></TD>
     <TD>
         Specify the kind of synchronization primitive for the
         Profiles.
@@ -684,19 +680,6 @@ The default is <code>select_mt</code></TD>
 
     </TD>
   </TR>
-
-  <TR>
-    <TD><CODE>-ORBConnectorLock</CODE> <EM>lock type</EM></TD>
-    <TD><a
-        name="-ORBConnectorLock"></a>Specify the type of lock to be used by
-        the connector.  Possible values for <em>lock type</em> are
-        <code>thread</code>, which specifies that an inter-thread mutex is
-        used to guarantee exclusive acccess, and <code>null</code>, which
-        specifies that no locking be performed.  The default is
-        <code>thread</code>.
-    </TD>
-  </TR>
-
 </TABLE>
 </P>
 </BLOCKQUOTE>
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 1793931c943..669f8ba8931 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -66,12 +66,6 @@ Two flags that won't get overwritten by the environment variable are
 <code>-DIDL</code> and <code>-I.</code>.  They are always passed to
 the preprocessor.
 
-If your IDLs need to include <code>&lt;orb.idl&gt;</code>, then you need to
-define either/both <code>ACE_ROOT</code> or/and <code>TAO_ROOT</code>.  If you
-already have <CODE>ACE_ROOT</CODE> defined, TAO_IDL can figure
-<CODE>TAO_ROOT</CODE> out if your ACE/TAO was installed using default directory
-structure, otherwise, you'll need to define <code>TAO_ROOT</code>.
-
 <HR><P>
 <h3>Operation Demuxing Strategies</h3>
 
@@ -90,20 +84,20 @@ To configure TAO's IDL compiler to support perfect hashing please do
 the following:
 
 <ul>
-  <LI>Enable <CODE>ACE_HAS_GPERF</CODE> when building ACE and TAO.
+  <LI> Enable <CODE>ACE_HAS_GPERF</CODE> when building ACE and TAO.
       This macro has been defined for the platforms where <CODE>gperf</CODE>
       has been tested, which includes most <A
       HREF="http://www.cs.wustl.edu/~schmidt/ACE-versions-i.html">platforms</A>
       that ACE runs on. <P>
 
-  <li>Build the <CODE>gperf</CODE> in $ACE_ROOT/apps/gperf.  This build
+  <li> Build the <CODE>gperf</CODE> in $ACE_ROOT/apps/gperf.  This build
       also leaves a copy/link of the gperf program at the $ACE_ROOT/bin
       directory.<P>
 
-  <li>Set the environment variable $ACE_ROOT appropriately or add
+  <li> Set the environment variable $ACE_ROOT appropriately or add
       $ACE_ROOT/bin to your search path. <P>
 
-  <li>Use the <CODE>-g</CODE> option for the TAO IDL compiler or set
+  <li> Use the <CODE>-g</CODE> option for the TAO IDL compiler or set
       your search path accordingly to install <CODE>gperf</CODE> in a
       directory other than $ACE_ROOT/bin.
 </ul>
@@ -169,73 +163,27 @@ also receives other options that are specific to it. <P>
     <td>&nbsp;</td>
   </tr>
 
-  <tr><a name="skel_export_macro">
+  <tr><a name="export_macro">
     <td></td>
 
-    <td><tt>skel_export_macro=</tt><i>macro_name</i></td>
+    <td><tt>export_macro=</tt><i>macro_name</i></td>
 
     <td>The compiler will emit <i>macro_name</i> right after each <tt>class</tt>
-        or <tt>extern</tt> keyword in the generated skeleton code (S
-        files,) this is needed for Windows/NT that requires
+        or <tt>extern</tt> keyword, this is needed for Windows/NT that requires
         special directives to export symbols from DLLs, usually the definition
         is just a space on unix platforms.&nbsp;</td>
   </tr>
 
-  <tr><a name="skel_export_include">
-    <td></td>
-
-    <td><tt>skel_export_include=</tt><i>include_path</i></td>
-
-    <td>The compiler will generate code to include <i>include_path</i> at the
-        top of the generated server header, this is usually a good
-        place to define the server side export macro.</td>
-  </tr>
-
-  <tr><a name="stub_export_macro">
-    <td></td>
-
-    <td><tt>stub_export_macro=</tt><i>macro_name</i></td>
-
-    <td>The compiler will emit <i>macro_name</i> right after each <tt>class</tt>
-        or <tt>extern</tt> keyword in the generated stub code, this is
-        needed for Windows/NT that requires special directives to
-        export symbols from DLLs, usually the definition is just a
-        space on unix platforms.&nbsp;</td>
-  </tr>
-
-  <tr><a name="stub_export_include">
+  <tr><a name="export_include">
     <td></td>
 
-    <td><tt>stub_export_include=</tt><i>include_path</i></td>
+    <td><tt>export_include=</tt><i>include_path</i></td>
 
     <td>The compiler will generate code to include <i>include_path</i> at the
         top of the client header, this is usually a good place to define the export
         macro.</td>
   </tr>
 
-  <tr><a name="export_macro">
-    <td></td>
-
-    <td><tt>export_macro=</tt><i>macro_name</i></td>
-
-    <td>This option has the same effect as issuing
-        <tt>-Wb,skel_export_macro=</tt><i>macro_name</i>
-        <tt>-Wb,stub_export_macro=</tt><i>macro_name</i>.  This option
-        is useful when building a DLL containing both stubs and
-        skeletons.</td>
-  </tr>
-
-  <tr><a name="export_include">
-    <td></td>
-
-    <td><tt>export_include=</tt><i>include_path</i></td>
-
-    <td>This option has the same effect as specifying
-        <tt>-Wb,stub_export_include=</tt><i>include_path</i>.  This
-        option goes with the previous option to build DLL containing
-        both stubs and skeletons.</td>
-  </tr>
-
   <tr><a name="pch_include">
     <td></td>
 
@@ -561,7 +509,7 @@ also receives other options that are specific to it. <P>
   </tr>
 
   <tr><a name="Sp">
-    <td><tt>-Sp</tt></td>
+    <td><tt>-Sa</tt></td>
 
     <td>Suppress generation of collocated stubs that use <code>Thru_POA</code> collocation strategy</td>
     <td>&nbsp;</td>
diff --git a/TAO/docs/configurations.html b/TAO/docs/configurations.html
index 13776d795fa..d065ef10807 100644
--- a/TAO/docs/configurations.html
+++ b/TAO/docs/configurations.html
@@ -28,7 +28,7 @@ model</a>.  </p>
 href="http://www.cs.wustl.edu/~schmidt/Svc-Conf.ps.gz">ACE
 Service Configurator</a> framework. Thus, options are specified in the
 familiar <tt>svc.conf</tt> file (if you want to use a different file
-name, use the <tt><a href="Options.html#svcfonf">-ORBSvcConf</a></tt>
+name, use the <tt><a href="Options.html#svcfonf">-ORBsvcconf</a></tt>
 option).  You can also setup default configurations for your programs.
 Please see the <a href="#programming">Programming Considerations</a>
 for more detailed discussion on this.</p>
@@ -134,44 +134,47 @@ Roadmap</h3>
 <h3>
 <a NAME="comp"></a>Configuring Key ORB Components</h3>
 
+<!-- Nanbor, can you please give a brief 1 or 2 sentence overview -->
+<!-- explaining that the following configurations are supported by TAO -->
+<!-- using command-line options, svc.conf options, and general usage -->
+<!-- patterns.  In particular, can you please clarify which of the -->
+<!-- following component configurations is controlled by options -->
+<!-- vs. controlled by applying certain patterns. -->
+
 <ul>
   <li><a name="orb"><b>Number of ORBs</b> -- </a></li>
       TAO can assign multiple endpoints to an ORB.  Therefore,
       it is not necessary to create multiple ORBs to accept
       requests from multiple endpoints.  However, multiple ORBs can be
       used to support different policies within the same process,
-      <EM>e.g.</EM>, handling requests in different thread
-      priorities.  Multiple ORBs are most commonly used in the "ORB
-      per-priority" pattern to avoid priority inversion in real-time
-      system. <p>
+      <EM>e.g.</EM>, handling requests in different thread priorities.<p>
 
   <li><a NAME="concurrency"></a><b>Server concurrency strategy</b> --
-      The default server strategy factory provided by down support two
-      different concurrency strategy.  It can be specified by adding
-      the <tt>-ORBConcurrency</tt> flag in the <code><a
-      href="Options.html#orb_concurrency"> Server_Strategy_Factory
-      </a></code> entry of the <code>svc.conf</code> file. This
-      specifies the concurrency strategy an ORB uses.  This strategy
-      is orthogonal the the number of ORBs or threads that are
-      configured in a server process.  </li><P>
+      This specifies
+      the concurrency strategy an ORB uses.  This strategy is
+      orthogonal the the number of ORBs or threads that are configured
+      in a server process.</li><P> 
 
       <ul>
         <li><tt>reactive</tt>: The ORB handles requests reactively,
             i.e., the ORB runs in one thread and service multiple
             requests/connections simultaneously using the
             <A
-            HREF="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#reactor">
-            ACE_Reactor</A>, which uses <tt>select</TT> or a similar
-            event demultiplexing mechanism supported by the
-            platform. </li> <P>
+HREF="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#reactor">ACE_Reactor</A>,
+which uses <tt>select</TT> or a similar event demultiplexing
+            mechanism supported by the platform. </li> <P>
 
         <li><tt>thread-per-connection</tt>: The ORB handles new
             connections by spawning a new thread whose job is to
-            service requests coming from the connection.</li>
+            service requests coming from the connection. The new
+            thread inherits all properties from the ORB threads 
+<!-- Nanbor, since this is an HTML document please put a link to the -->
+<!-- material below, rather than just saying "see below! -->
+     (see below.)</li>
       </UL><P>
 
   <li><a name="orb"><b>Thread Pools</b></a></li> --
-      TAO supports several types of thread pools. <P>
+  TAO supports several types of thread pools. <P>
 
       <ul>
         <li><tt>reactive</tt>: In this approach, each thread
@@ -183,7 +186,7 @@ Roadmap</h3>
 	  <CODE>ORB::run</CODE>, the ORB will select one of the threads
 	  to wait for incoming requests.
 	  This thread is called the leader thread and will process the
-	  first request that arrives to the ORB, but before
+	  first request that arrives to the ORB, but before 
 	  doing so the ORB will selects another thread in the pool to
 	  become the leader.
 	  In other words the threads in the pool take turns to
@@ -196,7 +199,7 @@ Roadmap</h3>
 	  configuration file.
 	</p>
 	</li>
-
+	
       </UL><P>
 
   <!--
@@ -220,10 +223,10 @@ Roadmap</h3>
       process and a global collocation table is used, then all objects
       in the same process are considered collocated.  If not, only
       objects reside in the same <em>ORB</em> are considered
-      collocated.  You can control the usage of global collocation
-      table by passing the <code><a href="Options.html#-ORBCollocation">
-      -ORBCollocation </a></code> flag as an argument of <code>
-      ORB_init </code> (most often thru the command line flags.) <p>
+      collocated.<p>
+      <!-- Nanbor, this is an example of a discussion that should -->
+      <!-- point to the relevant options that controls the user's -->
+      <!-- choice -->
 
   <li> <a NAME="profile"></a><b>Forwarding Profile</b> --
       When multiple threads using the same
@@ -232,9 +235,8 @@ Roadmap</h3>
       CORBA::Object, against multiple access. Therefore a mutex lock
       is used by default to ensure proper access. <P>
 
-      Using the switch <tt><a href="Options.html#-ORBProfileLock">
-      -ORBProfileLock </a></tt> this policy can be deactivated
-      specifying <tt>-ORBProfileLock null</tt>.
+      Using the switch <tt>-ORBprofilelock</tt> this policy can be deactivated
+      specifying <tt>-ORBprofilelock null</tt>.
       The primary reason for doing this is to improve performance
       when no forwarding is used or no multithreading with access to
       shared <tt>CORBA::Object</tt>'s.  Using a null mutex reduces
@@ -277,7 +279,7 @@ The following are common ORB configurations used by TAO applications.<P>
 
 <ul>
   <li>
-      <a NAME="reactive"></a>Single-threaded, reactive model.</li> <P>
+      <a NAME="reactive"></a>Single-threaded, reactive model.</li><P>
 
       <table BORDER=2 CELLSPACING=2 CELLPADDING=0 WIDTH="90%" >
         <tr>
@@ -318,10 +320,7 @@ The following are common ORB configurations used by TAO applications.<P>
               select_st</tt>, <tt>-ORBInputCDRAllocator null</tt>
               <br><tt>TAO_Server_Strategy_Factory</tt>:
               <tt>-ORBconcurrency reactive</tt> (default),
-              <tt>-ORBPOALock null</tt>
-              <br><tt>TAO_Client_Strategy_Factory</tt>:
-              <tt>-ORBConnectorLock null</tt></td>
-          </td>
+              <tt>-ORBPOALock null</tt>, <tt>-ORBConnectorLock null</tt></td>
         </tr>
       </table>
 
@@ -373,7 +372,7 @@ The following are common ORB configurations used by TAO applications.<P>
             select_mt</tt> (default) or other thread-safe platform specific
             reactors.<br>
             <br><tt>TAO_Server_Strategy_Factory</tt>:
-            <tt>-ORBConcurrency thread-per-connection</tt></td>
+            <tt>-ORBconcurrency thread-per-connection</tt></td>
       </tr>
     </table>
     <P>
@@ -419,7 +418,7 @@ The following are common ORB configurations used by TAO applications.<P>
             select_mt</tt> (default) or other thread-safe platform specific
             reactors.<br>
             <br><tt>TAO_Server_Strategy_Factory</tt>:
-            <tt>-ORBConcurrency reactive</tt></td>
+            <tt>-ORBconcurrency reactive</tt></td>
       </tr>
 </table>
 <P>
@@ -464,7 +463,7 @@ The following are common ORB configurations used by TAO applications.<P>
             select_mt</tt> (default) or other thread-safe platform specific
             reactors.<br>
           <br><tt>TAO_Server_Strategy_Factory</tt>:
-          <tt>-ORBConcurrency thread-per-connection</tt></td>
+          <tt>-ORBconcurrency thread-per-connection</tt></td>
     </tr>
 </table>
 
@@ -512,7 +511,7 @@ multiple ORBs, and thread-per-connection</i> configuration.<P>
         <td><tt>TAO_Resource_Factory</tt>: <tt>-ORBReactorType
             tp</tt>.<br>
             <br><tt>TAO_Server_Strategy_Factory</tt>:
-            <tt>-ORBConcurrency reactive</tt></td>
+            <tt>-ORBconcurrency reactive</tt></td>
       </tr>
     </table>
 
@@ -553,7 +552,7 @@ multiple ORBs, and thread-per-connection</i> configuration.<P>
         <td><tt>TAO_Resource_Factory</tt>: <tt>-ORBReactorType
             tp</tt>.<br>
             <br><tt>TAO_Server_Strategy_Factory</tt>:
-            <tt>-ORBConcurrency reactive</tt></td>
+            <tt>-ORBconcurrency reactive</tt></td>
       </tr>
 </table>
 </ul>
@@ -577,9 +576,9 @@ components. <P>
       this approach is you always need a <code>svc.conf</code> file if
       you want to do use non-default configuration.</p>
 
-  <li><p>You can use <code>-ORBSvcConf <em>filename</em></code> to use
+  <li><p>You can use <code>-ORBsvcconf <em>filename</em></code> to use
       a config file that is not called <code>svc.conf</code>.
-      Specifying <code>-ORBSvcConf</code> exclude the reading of
+      Specifying <code>-ORBsvcconf</code> exclude the reading of
       default <code>svc.conf</code> file.</p>
 
   <li><p>If you don't want the application users to worry about
@@ -589,14 +588,14 @@ components. <P>
       to set up the default svc.conf entries.  In this case, if a TAO
       application cannot find a svc.conf file, it will configure TAO's
       components using the default settings.  You can still use a
-      <code>svc.conf</code> file or use <code>-ORBSvcConf</code>
+      <code>svc.conf</code> file or use <code>-ORBsvcconf</code>
       option to tune the program.<P>
 
   <li><p>TAO programs evaluate the configuration settings in the following
       order,</p>
 
       <ol>
-        <li>File specified in <code>-ORBSvcConf</code> command-line
+        <li>File specified in <code>-ORBsvcconf</code> command-line
             option, if one exist.  Otherwise, the
             <code>svc.conf</code> in the start-up directory will be
             evaluated, if one exist.
@@ -625,7 +624,7 @@ components. <P>
       in your ACE <code>config.h</code> file and recompile TAO
       library.  In this case, a TAO program will not try to search for
       the default <code>svc.conf</code> file.  However, if platform
-      support, you can still use <code>-ORBSvcConf</code> to change
+      support, you can still use <code>-ORBsvcconf</code> to change
       the program behavior temporarily.</p>
 
       <p>On these platform, you can alter the default settings for
@@ -671,24 +670,13 @@ Configuration for homogenous systems<a NAME="homogenous"></a></h3>
       <p>
   <LI><b>Run-time options</b><a NAME="homogenous_runtime"></a>
       <p>If the only ORB running is TAO and there is no need to be IIOP interoperable
-      the option <tt>-ORBGIOPlite</tt> can be used to reduce the message size
+      the option <tt>-ORBgioplite</tt> can be used to reduce the message size
       and the processing time.
-      <p>Unix systems that support local IPC (formerly known as Unix domain
-      sockets) can take advantage of TAO's UIOP pluggable transport protocol
-      to improve performance considerably.  To use TAO's UIOP pluggable
-      protocol, simply specify a UIOP endpoint on the command line using
-      the <tt>-ORBEndpoint</tt> option described in the
-      <A HREF="Options.html">options</A> documentation.  Further performance
-      improvement can be achieved by using the UIOP protocol in combination
-      with the <tt>-ORBGIOPlite</tt> option.  Additional information about
-      TAO's UIOP pluggable protocol can be found in the
-      <A HREF="releasenotes/index.html#pp">release notes</A>.
       <p>Some embedded systems run without the benefit of a DNS server, in that
-      case they can use the <tt>-ORBDottedDecimalAddresses</tt> option; the ORB
+      case they can use the <tt>-ORBdotteddecimaladdresses</tt> option; the ORB
       will avoid the use of hostnames in the profiles it generates, thus clients
-      don't need to do any name resolution. Use the compile-time define
-      <tt>TAO_USES_DOTTED_DECIMAL_ADDRESSES</tt> in
-      <tt>$TAO_ROOT/tao/orbconf.h</tt> to make this the default behavior.
+      don't need to do any name resolution. The compile-time define <tt>TAO_USES_DOTTED_DECIMAL_ADDRESSES</tt>
+      in <tt>$TAO_ROOT/tao/orbconf.h</tt> to make this the default behavior.
 </ul>
 
 <hr>
@@ -739,7 +727,7 @@ choice of your configuration options.
       reactor for several concurrent requests; sometimes this configuration
       can be an overkill, if only one thread is using a reactor at the same
       time a lighter weight implementation can be used.  <p>This
-      configuration is controlled by the <tt>-ORBClientConnectionHandler</tt>
+      configuration is controled by the <tt>-ORBclientconnectionhandler</tt>
       option, good opportunities to use this option are:<P>
 
       <ul>
@@ -754,7 +742,7 @@ choice of your configuration options.
 <li>
     <b>Allocator for input CDR streams</b> -- Normally the application has no
     access to this buffer, and it is only used on the demarshaling of arguments
-    (or results). It is almost always better to use the "<tt>-ORBInputCDRAllocator
+    (or results). It is almost always better to use the "<tt>-ORBinputcdrallocator
     null</tt>" option since it will allocate memory from a thread specific allocator
     and it will not need locks to manage that memory.</li>
 
diff --git a/TAO/docs/releasenotes/TODO.html b/TAO/docs/releasenotes/TODO.html
index 2ca311cc36a..dfa7657dea7 100644
--- a/TAO/docs/releasenotes/TODO.html
+++ b/TAO/docs/releasenotes/TODO.html
@@ -28,6 +28,38 @@
     </P>
 
     <OL>
+      <LI><P>The ORB should support server side and client side
+	  interceptors
+	  <BR>[ASSIGNED TO:] Nanbor
+	</P>
+      </LI>
+      
+      <LI><P>Implement an Implementation Repository for TAO.
+	  <BR>[ASSIGNED TO:] Darrell.
+	</P>
+      </LI>
+
+      <LI><P>Implement a nice example of the COS Event Channel,
+          showing how it can provide filtering when combined with the
+          real-time Event Channel.
+          <BR>[ASSIGNED TO:] Pradeep
+        </P>
+      </LI>
+
+      <LI><P><B>EC:</B> Complete the implementation of the new EC,
+	  specially generate the strategies and changes required to
+	  support hard real-time behavior.
+	</P>
+	<P>The new EC does not update the dependencies in
+	  the scheduling service. We should be able to strategize this 
+	  by the appropiate use of a <CODE>Filter_Builder</CODE> and
+	  decorators for the regular filters.
+          <BR>[ASSIGNED TO:] Carlos
+	  <BR>[STATUS] All the pieces are in place, but I have to
+	  continue debugging it.
+        </P>
+      </LI>
+
       <LI><P>Implement the Interoperable Naming Service spec,
 	  specially the new standard features to bootstrap the initial 
 	  object references in the ORB.
@@ -68,6 +100,15 @@
 	</P>
       </LI>
 
+      <LI><P>Add support for timeouts and protocol attributes to the
+	  ORB.
+          <BR>[ASSIGNED TO:] Carlos
+	  <BR>[STATUS] Support for the Policy objects is present, but
+	  we haven't implemented any of the Policy objects and, of
+	  course, we don't use them.
+	</P>
+      </LI>
+
     </OL>
 
     <HR>
@@ -219,6 +260,25 @@
 
     <H4>New features and Bug fixes</H4>
     <OL>
+      <LI><P><B>EC:</B>The <CODE>Priority_Dispatching</CODE> strategy
+	  is incomplete.
+	  <BR>[STATUS] The latest round of changes completed the
+	  implementation, but more testing is required before dropping 
+	  this task
+        </P>
+      </LI>
+      <LI><P><B>EC:</B>Implement a dispatching strategy that uses the
+	  current thread priority or ID to dispatch the event.  This
+	  will let us use multiple queues at different priorities but
+	  without any scheduling service.
+        </P>
+      </LI>
+      <LI><P><B>EC:</B>Implement a null filter for consumers that
+	  correctly matches the events, this can be used to do all the 
+	  filtering on the suppliers for applications that do not
+	  require correlation.
+        </P>
+      </LI>
       <LI><P><B>EC:</B>Several tests must be added to the event
 	  channel testsuite, for example:
 	  <UL>
@@ -260,6 +320,23 @@
         </P>
       </LI>
 
+      <LI><P><B>EC:</B> We need some strategy in the EC to periodically 
+	  flush out misbehaving suppliers and consumers. Examples of
+	  misbehavior include: suppliers flooding the EC;
+	  consumers or suppliers that are destroyed, but were not
+	  disconnected;
+	  consumers that are not accepting events (risking a
+	  dead-lock);
+	  etc.
+        </P>
+      </LI>
+
+      <LI><P><B>IDL Compiler:</B> Support for the <CODE>version</CODE> 
+	  pragma, this also requires some changes in the
+	  <CODE>_is_a()</CODE> implementation.
+	</P>
+      </LI>
+
       <LI><P><B>ORB: </B> Stress test the ORB in the presence of
 	  exceptions, verifying that no resources are leaked, all
 	  locks are released, etc.
@@ -304,6 +381,14 @@
 	</P>
       </LI>
 
+      <LI><P><B>ORB: </B> Use the IIOP 1.1 profile info to pass QoS
+	  info and use it to preserve end-to-end QoS.
+	  <BR>[STATUS] The tagged component for encoding QoS
+	  information was created, but the server does not create it,
+	  neither does the client use that information.
+	</P>
+      </LI>
+
       <LI>The size of pre-allocated buffer for the outgoing CDR
 	streams is defined at compilation time; but if we use an
 	efficient enough allocator we could make its size configurable
@@ -472,6 +557,16 @@
 	</P>
       </LI>
 
+      <LI><P><B>ORB:</B>
+	  By default TAO disables Nagle's algorithm, this should be
+	  an optional feature, otherwise TAO will perform poorly over
+	  WANs.
+	  <BR>[STATUS] An alternative: this could be fixed as part of
+	  the real-time spec that introduces transport specific
+	  policies.
+	</P>
+      </LI>
+
       <LI><P>Check that system calls like <CODE>recv()</CODE> and
           <CODE>send()</CODE> are restarted if a signal is received by
           the process while they are executing.
@@ -714,17 +809,6 @@ encapsulation format.
       <H3>Completed Tasks</H3>
 
     <OL> 
-      <LI><P>Add support for timeouts and protocol attributes to the
-	  ORB.
-          <BR>[ASSIGNED TO:] Carlos
-	  <BR>[STATUS] Support for the Policy objects is present, but
-	  we haven't implemented any of the Policy objects and, of
-	  course, we don't use them.
-	  <BR>[DONE] Protocol attributes is deferred until the
-	  real-time spec is implemented.
-	</P>
-      </LI>
-
       <LI><P>The current implementation of collocation is optimal for
 	  hard-real-time 
 	  applications, but in some cases it may be desirable to follow
diff --git a/TAO/examples/AMI/FL_Callback/Makefile b/TAO/examples/AMI/FL_Callback/Makefile
new file mode 100644
index 00000000000..d9cd3cb5bb0
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/Makefile
@@ -0,0 +1,1664 @@
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#       Local macros
+#----------------------------------------------------------------------------
+
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+LDLIBS = -lTAO
+
+IDLFILES = testC testS
+BIN = progress peer
+
+SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) Peer_i Progress_i)
+
+PROGRESS_OBJS = progress.o Progress_i.o $(addsuffix .o, $(IDLFILES))
+PEER_OBJS = peer.o Peer_i.o $(addsuffix .o, $(IDLFILES))
+
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
+TAO_IDLFLAGS += -Ge 1 -GC
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/taoconfig.mk
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
+.PRECIOUS: testC.h testC.i testC.cpp
+.PRECIOUS: testS.h testS.i testS.cpp
+.PRECIOUS: testS_T.h testS_T.i testS_T.cpp
+
+progress: $(addprefix $(VDIR),$(PROGRESS_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+peer: $(addprefix $(VDIR),$(PEER_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+realclean: clean
+	-$(RM) testC.* testS.* testS_T.*
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+.obj/progress.o .obj/progress.so .shobj/progress.o .shobj/progress.so: progress.cpp Progress_i.h testS.h testC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i Progress_i.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+.obj/peer.o .obj/peer.so .shobj/peer.o .shobj/peer.so: peer.cpp Peer_i.h testS.h testC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ Peer_i.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i
+.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ testC.i
+.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i
+.obj/Peer_i.o .obj/Peer_i.so .shobj/Peer_i.o .shobj/Peer_i.so: Peer_i.cpp Peer_i.h testS.h testC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ Peer_i.i
+.obj/Progress_i.o .obj/Progress_i.so .shobj/Progress_i.o .shobj/Progress_i.so: Progress_i.cpp Progress_i.h testS.h testC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i Progress_i.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
new file mode 100644
index 00000000000..2f4aed8abff
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -0,0 +1,159 @@
+// $Id$
+
+#include "Peer_i.h"
+
+#if !defined(__ACE_INLINE__)
+#include "Peer_i.i"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(FL_Callback, Peer_i, "$Id$")
+
+Peer_Handler_i::Peer_Handler_i (Peer_i *peer)
+  : peer_ (peer)
+{
+}
+
+void
+Peer_Handler_i::request (CORBA::Long retval, 
+                         CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  static int i = 0;
+  i++;
+  if (i % 100 == 0)
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t) %d replies received\n", i));
+  this->peer_->reply (retval, ACE_TRY_ENV);
+}
+
+void
+Peer_Handler_i::start (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+}
+
+void
+Peer_Handler_i::shutdown (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+
+{
+}
+
+Peer_i::Peer_i (void)
+  :  reply_handler_ (this)
+{
+}
+
+Peer_i::~Peer_i (void)
+{
+}
+
+void
+Peer_i::init (CORBA::ORB_ptr orb,
+              Progress_ptr progress,
+              const ACE_Time_Value &delay,
+              CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->orb_ = CORBA::ORB::_duplicate (orb);
+  this->progress_ = Progress::_duplicate (progress);
+  this->delay_ = delay;
+
+  Peer_var peer = this->_this (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  ACE_DEBUG ((LM_DEBUG, "Peer (%P|%t) - binding\n"));
+  this->id_ = this->progress_->bind (peer.in (), ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+Peer_i::reply (CORBA::Long result,
+               CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->progress_->recv_reply (result, ACE_TRY_ENV);
+}
+
+CORBA::Long
+Peer_i::request (CORBA::Long id,
+                 CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_Time_Value tv  = this->delay_;
+  ACE_OS::sleep (tv);
+
+  return id;
+}
+
+void
+Peer_i::start (const PeerSet &the_peers,
+               CORBA::Long iterations,
+               CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  AMI_Peer_Handler_var handler =
+    this->reply_handler_._this (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  // @@ Report errors as exceptions...
+  Peer_Task *task;
+  ACE_NEW (task, Peer_Task (the_peers,
+                            iterations,
+                            this->progress_.in (),
+                            handler.in (),
+                            this->id_));
+  task->activate ();
+}
+
+void
+Peer_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->orb_->shutdown (0, ACE_TRY_ENV);
+}
+
+// ****************************************************************
+
+Peer_Task::Peer_Task (const PeerSet& the_peers,
+                      CORBA::Long iterations,
+                      Progress_ptr progress,
+                      AMI_Peer_Handler_ptr handler,
+                      CORBA::Long id)
+  :  the_peers_ (the_peers),
+     iterations_ (iterations),
+     progress_ (Progress::_duplicate (progress)),
+     handler_ (AMI_Peer_Handler::_duplicate (handler)),
+     id_ (id)
+{
+}
+
+int
+Peer_Task::svc (void)
+{
+  for (int i = 0; i != this->iterations_; ++i)
+    {
+      CORBA::ULong l = this->the_peers_.length ();
+      for (CORBA::ULong j = 0; j != l; ++j)
+        {
+          ACE_DECLARE_NEW_CORBA_ENV;
+          ACE_TRY
+            {
+              this->the_peers_[j]->sendc_request (this->handler_.in (),
+                                                  this->id_,
+                                                  ACE_TRY_ENV);
+              ACE_TRY_CHECK;
+
+              this->progress_->sent_request (this->id_,
+                                             ACE_TRY_ENV);
+              ACE_TRY_CHECK;
+            }
+          ACE_CATCHANY
+            {
+              // Ignore exceptions;
+            }
+          ACE_ENDTRY;
+        }
+      if (i % 100 == 0)
+        ACE_DEBUG ((LM_DEBUG, "(%P|%t) %d requests sent\n", i));
+    }
+  return 0;
+}
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h
new file mode 100644
index 00000000000..c8d7fba80f9
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.h
@@ -0,0 +1,128 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//   TAO/examples/AMI/FL_Callback
+//
+// = FILENAME
+//   Peer_i.h
+//
+// = AUTHOR
+//   Carlos O'Ryan
+//
+// ============================================================================
+
+#ifndef PEER_I_H
+#define PEER_I_H
+
+#include "testS.h"
+#include "ace/Task.h"
+
+class Peer_i;
+
+class Peer_Handler_i : public POA_AMI_Peer_Handler
+{
+public:
+  Peer_Handler_i (Peer_i *peer);
+  // The peer
+
+  virtual void request (CORBA::Long retval, 
+                         CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void start (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+private:
+  Peer_i *peer_;
+  // The real implementation
+};
+
+class Peer_i : public POA_Peer
+{
+public:
+  Peer_i (void);
+  // Constructor
+
+  virtual ~Peer_i (void);
+  // Destructor
+
+  void init (CORBA::ORB_ptr orb,
+             Progress_ptr progress,
+             const ACE_Time_Value &delay,
+             CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void reply (CORBA::Long result,
+              CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Used by the Reply_Handler to indicate that a reply has been
+  // received.
+
+  // = See test.idl for an explanation of these methods.
+  CORBA::Long request (CORBA::Long id,
+                       CORBA::Environment& ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  void start (const PeerSet& the_peers,
+              CORBA::Long iterations,
+              CORBA::Environment& ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void shutdown (CORBA::Environment& ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+private:
+  Peer_Handler_i reply_handler_;
+  // The reply_handler
+
+  CORBA::ORB_var orb_;
+  // The orb
+
+  Progress_var progress_;
+  // The interface to report back progress.
+
+  ACE_Time_Value delay_;
+  // The delay on each request
+
+  CORBA::Long id_;
+  // The id assigned by the progress interface
+};
+
+class Peer_Task : public ACE_Task_Base
+{
+  // = DESCRIPTION
+  //   Run a "start" request on a separate thread.
+public:
+  Peer_Task (const PeerSet& the_peers,
+             CORBA::Long iterations,
+             Progress_ptr progress,
+             AMI_Peer_Handler_ptr handler,
+             CORBA::Long id);
+
+  virtual int svc (void);
+  // The thread entry point
+
+private:
+  PeerSet the_peers_;
+  // The peers
+
+  CORBA::Long iterations_;
+  // The number of iterations
+
+  Progress_var progress_;
+  // To report progress
+
+  AMI_Peer_Handler_var handler_;
+  // To issue async requests
+
+  CORBA::Long id_;
+  // Our id
+};
+
+#if defined(__ACE_INLINE__)
+#include "Peer_i.i"
+#endif /* __ACE_INLINE__ */
+
+#endif /* PEER_I_H */
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.i b/TAO/examples/AMI/FL_Callback/Peer_i.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
new file mode 100644
index 00000000000..c25c334b12f
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -0,0 +1,177 @@
+// $Id$
+
+#include "Progress_i.h"
+
+#include <FL/Fl_Slider.h>
+#include <FL/Fl_Button.h>
+
+#if defined(ACE_HAS_FL)
+
+#if !defined(__ACE_INLINE__)
+#include "test_i.i"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(FL_Cube, test_i, "$Id$")
+
+Progress_i::Progress_i (Progress_Window *window)
+  :  window_ (window)
+{
+}
+
+void
+Progress_i::sent_request (CORBA::Long id,
+                     CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{ 
+  //ACE_DEBUG ((LM_DEBUG, "Progress (%t) - sent request %d\n", id));
+  this->window_->sent_request (id);
+}
+
+void
+Progress_i::recv_reply (CORBA::Long id,
+                        CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->window_->recv_reply (id);
+}
+
+CORBA::Long
+Progress_i::bind (Peer_ptr a_peer,
+                  CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_DEBUG ((LM_DEBUG, "Progress (%t) - peer bound\n"));
+  return this->window_->bind (a_peer, ACE_TRY_ENV);
+}
+
+// ****************************************************************
+
+Progress_Window::Progress_Window (int n_peers,
+                                  int n_iterations,
+                                  int x, int y,
+                                  int w, int h,
+                                  const char* l)
+  :  Fl_Box (x, y, w, h, l),
+     n_peers_ (n_peers),
+     peers_ (n_peers),
+     n_iterations_ (n_iterations)
+{
+  ACE_NEW (this->request_progress_, Fl_Widget*[this->n_peers_]);
+  ACE_NEW (this->reply_progress_, Fl_Widget*[this->n_peers_]);
+
+  // @@ leak...
+  Fl_Widget *button = new Fl_Button (x + 5, y + 5,
+                                     50, h - 10,
+                                     "Start");
+  button->callback (Progress_Window::start_callback, this);
+
+  // Compute the slider height, leaving a little margin...
+  int sh = h / ( 2 * this->n_peers_);
+  sh = sh - 5;
+
+  // The initial position, with margin...
+  int sy = y + 5;
+
+  // Set the width of the sliders...
+  int sx = x + 60;
+  int sw = w - 65;
+  int max = this->n_peers_ * this->n_iterations_;
+  for (int i = 0; i < this->n_peers_; ++i)
+    {
+      Fl_Slider *obj;
+
+      this->request_progress_[i] = obj =
+        new Fl_Slider (FL_HOR_FILL_SLIDER, sx, sy, sw, sh, "");
+      obj->color (FL_BLACK);
+      obj->selection_color (FL_RED);
+      obj->bounds (0, max);
+      obj->precision (0);
+      obj->value (0);
+      sy += sh + 5;
+
+      this->reply_progress_[i] = obj =
+        new Fl_Slider (FL_HOR_FILL_SLIDER, sx, sy, sw, sh, "");
+      obj->color (FL_BLACK);
+      obj->selection_color (FL_GREEN);
+      obj->bounds (0, max);
+      obj->precision (0);
+      obj->value (0);
+      sy += sh + 5;
+    }
+}
+
+void
+Progress_Window::sent_request (CORBA::Long id)
+{
+  if (id < 0 || id >= this->n_peers_)
+    return;
+  Fl_Slider *obj =
+    ACE_dynamic_cast (Fl_Slider*,this->request_progress_[id]);
+  obj->value (obj->value () + 1);
+  obj->redraw ();
+
+  int i = obj->value ();
+  if (i % 100 == 0)
+    ACE_DEBUG ((LM_DEBUG, "Progress (%t) - recv reply %d\n", i));
+}
+
+void
+Progress_Window::recv_reply (CORBA::Long id)
+{
+  if (id < 0 || id >= this->n_peers_)
+    return;
+  Fl_Slider *obj =
+    ACE_dynamic_cast (Fl_Slider*,this->reply_progress_[id]);
+  obj->value (obj->value () + 1);
+  obj->redraw ();
+
+  int i = obj->value ();
+  if (i % 100 == 0)
+    ACE_DEBUG ((LM_DEBUG, "Progress (%t) - recv reply %d\n", i));
+}
+
+CORBA::Long
+Progress_Window::bind (Peer_ptr a_peer,
+                       CORBA::Environment &)
+{
+  CORBA::ULong l = this->peers_.length ();
+  this->peers_.length (l + 1);
+  this->peers_[l] = Peer::_duplicate (a_peer);
+
+  return l;
+}
+
+void
+Progress_Window::start_callback (Fl_Widget* /* widget */,
+                                 void *data)
+{
+  Progress_Window *self = ACE_static_cast (Progress_Window*, data);
+  self->start ();
+}
+
+void
+Progress_Window::start ()
+{
+  if (this->peers_.length () < CORBA::ULong (this->n_peers_))
+    return;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  for (CORBA::ULong i = 0; i != this->peers_.length (); ++i)
+    {
+      ACE_TRY
+        {
+          this->peers_[i]->start (this->peers_,
+                                  this->n_iterations_,
+                                  ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          // Ignore exceptions
+        }
+      ACE_ENDTRY;
+    }
+}
+
+
+#endif /* ACE_HAS_FL */
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
new file mode 100644
index 00000000000..9066b6833e6
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -0,0 +1,100 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//   TAO/examples/AMI/FL_Callback
+//
+// = FILENAME
+//   Progress_i.h
+//
+// = AUTHOR
+//   Carlos O'Ryan
+//
+// ============================================================================
+
+#ifndef PROGRESS_I_H
+#define PROGRESS_I_H
+
+#include "testS.h"
+
+#if defined(ACE_HAS_FL)
+
+#include <FL/Fl_Box.h>
+
+class Progress_Window : public Fl_Box
+{
+public:
+  Progress_Window (int n_peers,
+                   int n_iterations,
+                   int x, int y,
+                   int w, int h,
+                   const char* l = 0);
+  // Constructor
+
+  void sent_request (CORBA::Long id);
+  void recv_reply (CORBA::Long id);
+  // Keep track of the progress on each peer
+
+  CORBA::Long bind (Peer_ptr a_peer,
+                    CORBA::Environment &ACE_TRY_ENV);
+  // One of the peers has bound to the server
+
+  void start (void);
+  // Start the peers...
+
+private:
+  static void start_callback (Fl_Widget* widget, void *data);
+  // The callback method
+
+private:
+  int n_peers_;
+  // The total number of peers
+
+  PeerSet peers_;
+  // The peers
+
+  int n_iterations_;
+  // The number of iterations;
+
+  Fl_Widget** request_progress_;
+  Fl_Widget** reply_progress_;
+  // The set of sliders where we keep track of each client
+};
+
+class Progress_i : public POA_Progress
+{
+  // = TITLE
+  //   Progress server implementation
+  //
+  // = DESCRIPTION
+  //   Implements the Progress interface in test.idl, forward the
+  //   calls to the Progress_Window class
+  //
+public:
+  Progress_i (Progress_Window* window);
+  // ctor
+
+  // = The Progress methods.
+  void sent_request (CORBA::Long id,
+                     CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  void recv_reply (CORBA::Long id,
+                   CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long bind (Peer_ptr a_peer,
+                    CORBA::Environment&)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+private:
+  Progress_Window* window_;
+  // Display the graphics...
+};
+
+#if defined(__ACE_INLINE__)
+#include "Progress_i.i"
+#endif /* __ACE_INLINE__ */
+
+#endif /* ACE_HAS_FL */
+
+#endif /* PROGRESS_I_H */
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.i b/TAO/examples/AMI/FL_Callback/Progress_i.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/examples/AMI/FL_Callback/README b/TAO/examples/AMI/FL_Callback/README
new file mode 100644
index 00000000000..f2352ecdde5
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/README
@@ -0,0 +1,14 @@
+# $Id$
+
+	A demo of the AMI callback model, using the FL toolkit for the
+GUI components.
+
+	Run as:
+
+$ ./progress -p 4 -i 10000 -ORBSvcConf svc.conf
+$ ./peer -n 1 -t 10000 -ORBSvcConf peer.conf
+$ ./peer -n 2 -t 10000 -ORBSvcConf peer.conf
+$ ./peer -n 4 -t 10000 -ORBSvcConf peer.conf
+$ ./peer -n 8 -t 10000 -ORBSvcConf peer.conf
+
+	then press "start" in the progress window.
diff --git a/TAO/examples/AMI/FL_Callback/peer.conf b/TAO/examples/AMI/FL_Callback/peer.conf
new file mode 100644
index 00000000000..688fd7715c1
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/peer.conf
@@ -0,0 +1,4 @@
+# $Id$
+#
+static Resource_Factory "-ORBReactorType tp"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED"
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
new file mode 100644
index 00000000000..e59159d401f
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -0,0 +1,178 @@
+// $Id$
+
+#include "Peer_i.h"
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+#include "ace/Sched_Params.h"
+
+ACE_RCSID(FL_Callback, peer, "$Id$")
+
+const char *ior = "file://progress.ior";
+int nthreads = 4;
+int interval = 0; // microseconds
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "k:n:t:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+
+      case 'n':
+        nthreads = ACE_OS::atoi (get_opts.optarg);
+        break;
+
+      case 't':
+        interval = ACE_OS::atoi (get_opts.optarg);
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "-n <threads>"
+                           "-t <microseconds>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+class Worker : public ACE_Task_Base
+{
+  // = TITLE
+  //   Run a server thread
+  //
+  // = DESCRIPTION
+  //   Use the ACE_Task_Base class to run server threads
+  //
+public:
+  Worker (CORBA::ORB_ptr orb);
+  // ctor
+
+  virtual int svc (void);
+  // The thread entry point.
+
+private:
+  CORBA::ORB_var orb_;
+  // The orb
+};
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                              priority);
+  
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                              priority);
+
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var progress_object =
+        orb->string_to_object (ior, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Progress_var progress =
+        Progress::_narrow (progress_object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      ACE_Time_Value delay (0, interval);
+
+      Peer_i peer;
+      peer.init (orb.in (),
+                 progress.in (),
+                 delay,
+                 ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Worker worker (orb.in ());
+      if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
+                           nthreads) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot activate client threads\n"),
+                          1);
+
+      worker.thr_mgr ()->wait ();
+
+      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Catched exception:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+// ****************************************************************
+
+Worker::Worker (CORBA::ORB_ptr orb)
+  :  orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+int
+Worker::svc (void)
+{
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting event loop\n"));
+  this->orb_->run ();
+  return 0;
+}
diff --git a/TAO/performance-tests/Latency/st_server.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index 16155056bc7..14c38bf9a13 100644
--- a/TAO/performance-tests/Latency/st_server.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -1,18 +1,32 @@
 // $Id$
 
-#include "test_i.h"
+#include "Progress_i.h"
 #include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
 
-ACE_RCSID(Latency, st_server, "$Id$")
+ACE_RCSID(FL_Callback, progress, "$Id$")
 
-const char *ior_output_file = "test.ior";
-int workload = 0;
+#if !defined (ACE_HAS_FL)
+
+int main (int, char *[])
+{
+  ACE_ERROR ((LM_INFO,
+              "This example requires FL support\n"));
+  return 0;
+}
+
+#else
+
+#include <FL/Fl.h>
+#include <FL/Fl_Window.h>
+
+const char *ior_output_file = "progress.ior";
+int n_iterations = 1000;
+int n_peers = 1;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:w:");
+  ACE_Get_Opt get_opts (argc, argv, "o:p:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -22,8 +36,12 @@ parse_args (int argc, char *argv[])
 	ior_output_file = get_opts.optarg;
 	break;
 
-      case 'w':
-	workload = ACE_OS::atoi (get_opts.optarg);
+      case 'p':
+	n_peers = ACE_OS::atoi (get_opts.optarg);
+	break;
+
+      case 'i':
+	n_iterations = ACE_OS::atoi (get_opts.optarg);
 	break;
 
       case '?':
@@ -31,7 +49,8 @@ parse_args (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
 			   "-o <iorfile>"
-			   "-w <workload>"
+			   "-p <peers>"
+			   "-i <iterations>"
                            "\n",
                            argv [0]),
                           -1);
@@ -43,34 +62,34 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      int w = 320;
+      int h = 30 * n_peers + 20;
+      Fl_Window window(w, h);
+      
+      Progress_Window sw (n_peers, n_iterations,
+                          10,
+                          10,
+                          window.w () - 20,
+                          window.h () - 20);
+      window.resizable (&sw);
+      
+      window.end ();
+
+      char* targv[] = { argv[0] };
+      window.show (1, targv);
+
+      sw.show ();
+
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (poa_object.in ()))
@@ -86,12 +105,12 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
-        return 1;
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-      Test_i server_impl (orb.in (), workload);
+      Progress_i server_impl (&sw);
 
-      Test_var server =
+      Progress_var server =
         server_impl._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -114,11 +133,8 @@ main (int argc, char *argv[])
 	  ACE_OS::fclose (output_file);
 	}
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      orb->run ();
-
+      if (Fl::run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Fl::run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
   ACE_CATCHANY
@@ -128,6 +144,7 @@ main (int argc, char *argv[])
       return 1;
     }
   ACE_ENDTRY;
-
   return 0;
 }
+
+#endif /* ACE_HAS_FL */
diff --git a/TAO/examples/AMI/FL_Callback/svc.conf b/TAO/examples/AMI/FL_Callback/svc.conf
new file mode 100644
index 00000000000..be6fb27be83
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/svc.conf
@@ -0,0 +1,3 @@
+# $Id$
+#
+static Resource_Factory "-ORBReactorType fl"
diff --git a/TAO/examples/AMI/FL_Callback/test.idl b/TAO/examples/AMI/FL_Callback/test.idl
new file mode 100644
index 00000000000..87dead7906d
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/test.idl
@@ -0,0 +1,41 @@
+//
+// $Id$
+//
+
+interface Peer;
+typedef sequence<Peer> PeerSet;
+
+interface Peer
+{
+  // = DESCRIPTION
+  //   A simple interface to demo the AMI implementation.
+  //   A set of "peers" run in the network, each one binds to the
+  //   progress server, when all the peers are bound the server
+  //   requests that each one send multiple "request" messages to each
+  //   other, using AMI. The progress is reported back to the progress
+  //   server for display.
+
+  long request (in long id);
+  // A simple request, sends back the number in <id>.
+
+  oneway void start (in PeerSet the_peers,
+                     in long iterations);
+  // Start the demo in one Peer
+
+  oneway void shutdown ();
+  // Shutdown the ORB
+};
+
+interface Progress
+{
+  // = DESCRIPTION
+  //   This interface is used to report progress, multiple
+  //   applications identified by an <id> run in parallel, each one
+  //   reports as the asynchronous requests are sent and received.
+
+  oneway void sent_request (in long id);
+  oneway void recv_reply (in long id);
+
+  long bind (in Peer a_peer);
+  // Bind one of the peers.
+};
diff --git a/TAO/examples/AMI/Makefile b/TAO/examples/AMI/Makefile
new file mode 100644
index 00000000000..50ffadd7cdc
--- /dev/null
+++ b/TAO/examples/AMI/Makefile
@@ -0,0 +1,23 @@
+#----------------------------------------------------------------------------
+#
+#	$Id$
+#
+#	Makefile for the TAO examples
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+DIRS  = FL_Callback
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include	$(ACE_ROOT)/include/makeinclude/macros.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/examples/Borland/ChatClientWnd.cpp b/TAO/examples/Borland/ChatClientWnd.cpp
index 5a4f2f3dae3..5a841a5407f 100644
--- a/TAO/examples/Borland/ChatClientWnd.cpp
+++ b/TAO/examples/Borland/ChatClientWnd.cpp
@@ -68,7 +68,7 @@ void __fastcall TChatClientWindow::WMMessageReceived (TMessage& Message)
 {
   String* str = (String*)Message.WParam;
   for (int i = 1; i <= str->Length (); i++)
-    if (isspace ((*str)[i]))
+    if (std::isspace ( (*str)[i]))
       (*str)[i] = ' ';
   OutputMemo->Lines->Append (str->Trim ());
   delete str;
diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile
index 376cf7a6855..0615a632aa0 100644
--- a/TAO/examples/Callback_Quoter/Makefile
+++ b/TAO/examples/Callback_Quoter/Makefile
@@ -61,6 +61,8 @@ SIMPLE_SVR_OBJS = \
                 ConsumerS.o\
                 notifier.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = notifier \
        consumer\
        supplier
@@ -78,7 +80,6 @@ TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp
index d3bcc01538d..9fcae9f9eec 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp
@@ -70,9 +70,9 @@ Notifier_i::register_callback (const char *stock_name,
        ACE_THROW ( Callback_Quoter::Invalid_Stock ("Insertion failed! Invalid Stock!\n"));
      else
       ACE_DEBUG ((LM_DEBUG,
-                  "Inserted map entry: stockname %s threshold %d",
-                  stock_name,
-                  threshold_value));
+		  "Inserted map entry: stockname %s threshold %d",
+		  stock_name,
+		  threshold_value));
     }
   else
     {
@@ -86,12 +86,12 @@ Notifier_i::register_callback (const char *stock_name,
       // fails an exception is raised.
       if (consumers->insert (consumer_data) == -1)
         ACE_THROW ( Callback_Quoter::Invalid_Stock ("Insertion failed! Invalid Stock!\n"));
-
+       
       // The bond between the stockname <hash_key> and the consumers <hash_value>
       // is fused.
       if (this->consumer_map_.bind (stock_name, consumers) == -1)
          ACE_ERROR ((LM_ERROR,
-                   "register_callback: Bind failed!/n"));
+		   "register_callback: Bind failed!/n"));
       else
         ACE_DEBUG ((LM_DEBUG,
                     "new map entry: stockname %s threshold %d\n",
@@ -149,7 +149,7 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer,
          ACE_THROW (Callback_Quoter::Invalid_Handle ( "Unregistration failed! Invalid Consumer Handle!\n"));
        else
         ACE_DEBUG ((LM_DEBUG,
-                    "unregister_callback:consumer removed\n"));
+		    "unregister_callback:consumer removed\n"));
     }
 }
 
@@ -163,8 +163,8 @@ Notifier_i::market_status (const char *stock_name,
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Notifier_i:: The stockname is %s with price %d\n",
-              stock_name,
+	      "Notifier_i:: The stockname is %s with price %d\n",
+	      stock_name,
               stock_value));
 
   CONSUMERS *consumers;
@@ -185,17 +185,17 @@ Notifier_i::market_status (const char *stock_name,
               Callback_Quoter::Info interested_consumer_data;
 
               interested_consumer_data.stock_name =
-                CORBA::string_dup (stock_name);
+		CORBA::string_dup (stock_name);
               interested_consumer_data.value =
-                stock_value;
+		stock_value;
 
-              ACE_DEBUG ((LM_DEBUG,
-                          "pushing information to consumer\n"));
+	      ACE_DEBUG ((LM_DEBUG,
+			  "pushing information to consumer\n"));
 
-              // The status desired by the consumer is then passed to
-              // it.
+	      // The status desired by the consumer is then passed to
+	      // it.
               (*iter).consumer_->push (interested_consumer_data);
-            }
+	    }
         }
     }
   else
@@ -212,14 +212,14 @@ Notifier_i::shutdown (CORBA::Environment &)
 {
   if ( this->consumer_map_.close () > 0)
     ACE_ERROR ((LM_ERROR,
-                "Consumer_map_close error!\n"));
+		"Consumer_map_close error!\n"));
   else
   // This marks the exit of the notifier. This should be taken care of
   // before the consumer tries to unregister after the notifier quits.
   notifier_exited_ = 1;
 
   ACE_DEBUG ((LM_DEBUG,
-              "The Callback Quoter server is shutting down...\n"));
+	      "The Callback Quoter server is shutting down...\n"));
 
 
   // Instruct the ORB to shutdown.
@@ -245,6 +245,8 @@ template class ACE_Unbounded_Set<Notifier_i::Consumer_Data>;
 template class ACE_Unbounded_Set_Iterator<Notifier_i::Consumer_Data>;
 
 template class ACE_Hash_Map_Entry<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*>;
+template class ACE_Hash<ACE_CString>;
+template class ACE_Equal_To<ACE_CString>;
 template class ACE_Hash_Map_Manager<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
@@ -260,6 +262,8 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_Unbounded_Set<N
 #pragma instantiate ACE_Unbounded_Set_Iterator<Notifier_i::Consumer_Data>
 
 #pragma instantiate ACE_Hash_Map_Entry<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*>
+#pragma instantiate ACE_Hash<ACE_CString>
+#pragma instantiate ACE_Equal_To<ACE_CString>
 #pragma instantiate ACE_Hash_Map_Manager<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
diff --git a/TAO/examples/Event_Comm/Consumer.dsp b/TAO/examples/Event_Comm/Consumer.dsp
index 0d7ae8ede86..ecbb0bfdf51 100644
--- a/TAO/examples/Event_Comm/Consumer.dsp
+++ b/TAO/examples/Event_Comm/Consumer.dsp
@@ -17,13 +17,12 @@ CFG=Event_Comm Consumer - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Event_Comm Consumer - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Event_Comm Consumer - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Event_Comm Consumer - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Event_Comm Consumer - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -152,7 +151,7 @@ InputPath=.\Event_Comm.idl
 InputName=Event_Comm

 

 BuildCmds= \

-	..\..\..\bin\Relese\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index 64b85560795..27ee3dc1e89 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -63,6 +63,7 @@ Consumer_Handler::init (int argc,
       this->notifier_->subscribe (this->receiver_,
 				  filtering_criteria,
 				  ACE_TRY_ENV);
+      return 0;
     }
   ACE_CATCHANY
    {
@@ -72,7 +73,7 @@ Consumer_Handler::init (int argc,
    }
   ACE_ENDTRY;
 
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
diff --git a/TAO/examples/Event_Comm/Event_Comm.idl b/TAO/examples/Event_Comm/Event_Comm.idl
index fbef2f30f67..5c04344ea9a 100644
--- a/TAO/examples/Event_Comm/Event_Comm.idl
+++ b/TAO/examples/Event_Comm/Event_Comm.idl
@@ -93,14 +93,14 @@ module Event_Comm
     // = The following operations are intended for Consumers.
 
     void subscribe (in Consumer Consumer,
-                    in string filtering_criteria) raises (CannotSubscribe);
+                    in string filtering_criteria);
     // Subscribe the <Consumer> to receive events that match the
     // regular expresssion <filtering_criteria> applied by the
     // <Notifier>.  If <filtering_criteria> is "" then all events are
     // matched.
 
     void unsubscribe (in Consumer Consumer,
-                      in string filtering_criteria) raises (CannotUnsubscribe);
+                      in string filtering_criteria);
     // Unsubscribe the <Consumer> that matches the filtering criteria.
     // If <filtering_criteria> is "" then all <Consumers> with the
     // matching object reference are removed.
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index 367c96d2d73..e9cda34c173 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -158,10 +158,7 @@ void
 Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
 		       const char *filtering_criteria,
 		       CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   Event_Comm::Notifier::CannotSubscribe
-                   ))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
 	      "in Notifier_i::subscribe for %x with filtering criteria \"%s\"\n",
@@ -220,10 +217,7 @@ void
 Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
 			 const char *filtering_criteria,
 			 CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   Event_Comm::Notifier::CannotUnsubscribe
-                   ))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "in Notifier_i::unsubscribe for %x\n",
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h
index 3477437422c..b5d469f630a 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.h
+++ b/TAO/examples/Event_Comm/Event_Comm_i.h
@@ -58,7 +58,7 @@ public:
 
   virtual void push (const Event_Comm::Event & event,
                      CORBA::Environment &TAO_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    ACE_THROW_SPEC ((CORBA::SystemException));  
   // Pass the <event> to the <Consumer>.
 
   virtual void disconnect (const char * reason,
@@ -107,20 +107,14 @@ public:
    virtual void subscribe (Event_Comm::Consumer_ptr Consumer,
                            const char * filtering_criteria,
                            CORBA::Environment &TAO_TRY_ENV)
-     ACE_THROW_SPEC ((
-                      CORBA::SystemException,
-                      Event_Comm::Notifier::CannotSubscribe
-                      ));
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // Subscribe the <Consumer> to receive events that match
   // <filtering_criteria> applied by the <Notifier>.
 
  void unsubscribe (Event_Comm::Consumer *consumer,
                     const char *filtering_criteria,
                     CORBA::Environment &TAO_TRY_ENV)
-   ACE_THROW_SPEC ((
-                    CORBA::SystemException,
-                    Event_Comm::Notifier::CannotUnsubscribe
-                    ));
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // Unsubscribe the <Consumer>.
 
 private:
diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile
index 5ba27725b37..9b1b165201e 100644
--- a/TAO/examples/Event_Comm/Makefile
+++ b/TAO/examples/Event_Comm/Makefile
@@ -47,6 +47,8 @@ NOTIFIER_OBJS = Event_CommC.o \
                 Event_Comm_i.o \
                 notifier.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = supplier \
        notifier \
        consumer
diff --git a/TAO/examples/Event_Comm/Notifier.dsp b/TAO/examples/Event_Comm/Notifier.dsp
index 780903b2ebf..20bfb331149 100644
--- a/TAO/examples/Event_Comm/Notifier.dsp
+++ b/TAO/examples/Event_Comm/Notifier.dsp
@@ -17,13 +17,12 @@ CFG=Event_Comm Notifier - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Event_Comm Notifier - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Event_Comm Notifier - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Event_Comm Notifier - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Event_Comm Notifier - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -136,7 +135,7 @@ InputPath=.\Event_Comm.idl
 InputName=Event_Comm

 

 BuildCmds= \

-	..\..\..\bin\Relese\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -169,13 +168,12 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "Event_Comm Notifier - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__EVENT="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Event_Comm.idl

 InputName=Event_Comm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+	tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp
index 0511f768150..f39c84037a6 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp
@@ -115,6 +115,9 @@ Notifier_Handler::init (int argc,
          Event_Comm::Notifier::_narrow (notifier_obj.in (),
 					ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      return 0;
+
   }
  ACE_CATCHANY
    {
@@ -124,5 +127,5 @@ Notifier_Handler::init (int argc,
    }
  ACE_ENDTRY;
 
- return 0;
+ ACE_NOTREACHED (return 0;)
 }
diff --git a/TAO/examples/Event_Comm/Supplier.dsp b/TAO/examples/Event_Comm/Supplier.dsp
index b114c1e5afc..be08ad599e3 100644
--- a/TAO/examples/Event_Comm/Supplier.dsp
+++ b/TAO/examples/Event_Comm/Supplier.dsp
@@ -17,13 +17,12 @@ CFG=Event_Comm Supplier - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Event_Comm Supplier - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Event_Comm Supplier - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Event_Comm Supplier - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Event_Comm Supplier - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -152,7 +151,7 @@ InputPath=.\Event_Comm.idl
 InputName=Event_Comm

 

 BuildCmds= \

-	..\..\..\bin\Relese\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -185,13 +184,12 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "Event_Comm Supplier - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__EVENT="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Event_Comm.idl

 InputName=Event_Comm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+	tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/examples/Makefile b/TAO/examples/Makefile
index 73f9ead9771..860701655e0 100644
--- a/TAO/examples/Makefile
+++ b/TAO/examples/Makefile
@@ -16,7 +16,8 @@ DIRS  = Callback_Quoter \
 	Quoter \
 	Simple \
 	Event_Comm \
-	OBV
+	OBV \
+	AMI
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/examples/OBV/Typed_Events/Makefile b/TAO/examples/OBV/Typed_Events/Makefile
index 4d09c0a9116..1d9829bc856 100644
--- a/TAO/examples/OBV/Typed_Events/Makefile
+++ b/TAO/examples/OBV/Typed_Events/Makefile
@@ -44,6 +44,9 @@ SIMPLE_SVR_OBJS = \
 BIN = server \
       client
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
 TAO_IDLFLAGS += -Ge 1
 
 #----------------------------------------------------------------------------
diff --git a/TAO/examples/POA/Adapter_Activator/Makefile b/TAO/examples/POA/Adapter_Activator/Makefile
index aa564488783..60444945ed6 100644
--- a/TAO/examples/POA/Adapter_Activator/Makefile
+++ b/TAO/examples/POA/Adapter_Activator/Makefile
@@ -11,6 +11,10 @@ CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
 LDLIBS     =   -lGeneric_Servant -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+BUILD = $(VBIN)
+
 INSTALL =
 
 #TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/examples/POA/DSI/Makefile b/TAO/examples/POA/DSI/Makefile
index 8b885b351a2..3f788cfc943 100644
--- a/TAO/examples/POA/DSI/Makefile
+++ b/TAO/examples/POA/DSI/Makefile
@@ -23,6 +23,9 @@ FILE_SVR_OBJS = DatabaseC.o DatabaseS.o server.o Database_i.o
 FILE_CLT_OBJS = DatabaseC.o DatabaseS.o client.o
 
 BIN = server client
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/examples/POA/Default_Servant/Makefile b/TAO/examples/POA/Default_Servant/Makefile
index c2e9943b753..21ae6bbb59d 100644
--- a/TAO/examples/POA/Default_Servant/Makefile
+++ b/TAO/examples/POA/Default_Servant/Makefile
@@ -23,7 +23,9 @@ FILE_SVR_OBJS = FileC.o FileS.o server.o File_i.o
 FILE_CLT_OBJS = FileC.o FileS.o client.o
 
 BIN = server client
-
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/examples/POA/Explicit_Activation/Makefile b/TAO/examples/POA/Explicit_Activation/Makefile
index 6c5d8811e76..a63b245298c 100644
--- a/TAO/examples/POA/Explicit_Activation/Makefile
+++ b/TAO/examples/POA/Explicit_Activation/Makefile
@@ -11,6 +11,10 @@ CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
 LDLIBS     =   -lGeneric_Servant -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+BUILD = $(VBIN)
+
 INSTALL =
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/examples/POA/FindPOA/Makefile b/TAO/examples/POA/FindPOA/Makefile
index 1ce932da8f8..4aa0505ee2a 100644
--- a/TAO/examples/POA/FindPOA/Makefile
+++ b/TAO/examples/POA/FindPOA/Makefile
@@ -15,6 +15,10 @@ CPPFLAGS += -I$(TAO_ROOT)
 LDLIBS     =  -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+BUILD = $(VBIN)
+
 INSTALL =
 
 TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/examples/POA/Forwarding/Makefile b/TAO/examples/POA/Forwarding/Makefile
index c853a407f25..28dd8b5b783 100644
--- a/TAO/examples/POA/Forwarding/Makefile
+++ b/TAO/examples/POA/Forwarding/Makefile
@@ -24,7 +24,9 @@ SVR_OBJS = FooC.o FooS.o server.o MyFooServant.o Servant_Locator.o
 CLT_OBJS = FooC.o FooS.o client.o
 
 BIN = server client
-
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/examples/POA/Forwarding/MyFooServant.cpp b/TAO/examples/POA/Forwarding/MyFooServant.cpp
index 2a64431cba6..3f085028b17 100644
--- a/TAO/examples/POA/Forwarding/MyFooServant.cpp
+++ b/TAO/examples/POA/Forwarding/MyFooServant.cpp
@@ -46,7 +46,6 @@ MyFirstFooServant::MyFirstFooServant (CORBA::ORB_ptr orb_ptr,
   int result = this->orb_->orb_core ()->reactor ()->
     register_handler (this->handle_, this, mask);
   ACE_ASSERT (result == 0);
-  ACE_UNUSED_ARG (result);
 }
 
 // Destructor
@@ -56,7 +55,6 @@ MyFirstFooServant::~MyFirstFooServant (void)
   int result = this->orb_->orb_core ()->reactor ()->
     remove_handler (this->handle_, mask);
   ACE_ASSERT (result == 0);
-  ACE_UNUSED_ARG (result);
 }
 
 // Return the Default POA of this Servant
@@ -99,11 +97,10 @@ MyFirstFooServant::forward (CORBA::Environment &ACE_TRY_ENV)
       //
 
       int result = this->orb_->orb_core ()->reactor ()->ready_ops
-        (this->handle_,
+	(this->handle_,
          ACE_Event_Handler::READ_MASK,
          ACE_Reactor::ADD_MASK);
       ACE_ASSERT (result != -1);
-      ACE_UNUSED_ARG (result);
     }
   else
     {
diff --git a/TAO/examples/POA/Generic_Servant/Makefile b/TAO/examples/POA/Generic_Servant/Makefile
index 1efa8599e79..70a00d29b70 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile
+++ b/TAO/examples/POA/Generic_Servant/Makefile
@@ -33,6 +33,12 @@ POA_CLT_OBJS = $(addprefix $(VDIR),$(addsuffix .o,$(BINFILES)))
 
 BIN = client
 
+BUILD = $(VOBJS) $(VLIB) $(BIN)
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+VBIN = $(BIN:%=%$(VAR))
+
 LIBS = -lTAO
 LSRC = $(addsuffix .cpp,$(SHLIB_SRC))
 LOBJ = $(addsuffix .o,$(SHLIB_SRC))
diff --git a/TAO/examples/POA/Loader/Makefile b/TAO/examples/POA/Loader/Makefile
index 1b2f3ef794d..bb802913130 100644
--- a/TAO/examples/POA/Loader/Makefile
+++ b/TAO/examples/POA/Loader/Makefile
@@ -14,6 +14,10 @@ CPPFLAGS += -I$(TAO_ROOT)
 LDLIBS = -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+BUILD = $(VBIN)
+
 INSTALL =
 
 #----------------------------------------------------------------------------
diff --git a/TAO/examples/POA/NewPOA/Makefile b/TAO/examples/POA/NewPOA/Makefile
index 24279c705c6..ceda2634492 100644
--- a/TAO/examples/POA/NewPOA/Makefile
+++ b/TAO/examples/POA/NewPOA/Makefile
@@ -15,6 +15,10 @@ CPPFLAGS += -I$(TAO_ROOT)
 LDLIBS     =  -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+BUILD = $(VBIN)
+
 INSTALL =
 
 #----------------------------------------------------------------------------
diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile b/TAO/examples/POA/On_Demand_Activation/Makefile
index aad170eac5c..1bd3f3d4540 100644
--- a/TAO/examples/POA/On_Demand_Activation/Makefile
+++ b/TAO/examples/POA/On_Demand_Activation/Makefile
@@ -14,6 +14,10 @@ CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
 LDLIBS     =   -lGeneric_Servant -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+BUILD = $(VBIN)
+
 INSTALL =
 
 #----------------------------------------------------------------------------
diff --git a/TAO/examples/POA/On_Demand_Activation/run_test.pl b/TAO/examples/POA/On_Demand_Activation/run_test.pl
index 4ecc0919225..06851386ac1 100755
--- a/TAO/examples/POA/On_Demand_Activation/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl
@@ -59,13 +59,13 @@ unlink $iorfile_2;
 
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args");
 
-if (ACE::waitforfile_timed ($iorfile_1, 15) == -1) {
+if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
   print STDERR "ERROR: cannot find file <$iorfile_1>\n";
   $SV->Kill (); $SV->TimedWait (1);
   exit 1;
 }
 
-if (ACE::waitforfile_timed ($iorfile_2, 15) == -1) {
+if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
   print STDERR "ERROR: cannot find file <$iorfile_2>\n";
   $SV->Kill (); $SV->TimedWait (1);
   exit 1;
diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile b/TAO/examples/POA/On_Demand_Loading/Makefile
index 18d8d6097b5..91c487ad3f0 100644
--- a/TAO/examples/POA/On_Demand_Loading/Makefile
+++ b/TAO/examples/POA/On_Demand_Loading/Makefile
@@ -17,6 +17,10 @@ CPPFLAGS += -I$(TAO_ROOT)
 LDLIBS = -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+BUILD = $(VBIN)
+
 INSTALL =
 
 #----------------------------------------------------------------------------
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index b21ee5ad8af..bf85c60de93 100755
--- a/TAO/examples/POA/On_Demand_Loading/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl
@@ -59,13 +59,13 @@ unlink $iorfile_2;
 
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args");
 
-if (ACE::waitforfile_timed ($iorfile_1, 15) == -1) {
+if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
   print STDERR "ERROR: cannot find file <$iorfile_1>\n";
   $SV->Kill (); $SV->TimedWait (1);
   exit 1;
 }
 
-if (ACE::waitforfile_timed ($iorfile_2, 15) == -1) {
+if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
   print STDERR "ERROR: cannot find file <$iorfile_2>\n";
   $SV->Kill (); $SV->TimedWait (1);
   exit 1;
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile b/TAO/examples/POA/Reference_Counted_Servant/Makefile
index e9bd3b34178..990273b45b8 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Makefile
+++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile
@@ -9,6 +9,10 @@ endif
 BIN = server
 SERVER_OBJS = server.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+BUILD = $(VBIN)
+
 CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
 
 LDLIBS  =  -lGeneric_Servant -lTAO
diff --git a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
index dcdcbfa92ac..d8a11cac826 100755
--- a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
+++ b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
@@ -55,7 +55,7 @@ unlink $iorfile;
 
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args");
 
-if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
   print STDERR "ERROR: cannot find file <$iorfile>\n";
   $SV->Kill (); $SV->TimedWait (1);
   exit 1;
diff --git a/TAO/examples/POA/RootPOA/Makefile b/TAO/examples/POA/RootPOA/Makefile
index e5dd6cb6a39..e73b05f5043 100644
--- a/TAO/examples/POA/RootPOA/Makefile
+++ b/TAO/examples/POA/RootPOA/Makefile
@@ -11,6 +11,10 @@ CPPFLAGS += -I$(TAO_ROOT)
 LDLIBS     =  -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+BUILD = $(VBIN)
+
 INSTALL =
 
 #----------------------------------------------------------------------------
diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp
index f2a5382636d..53730bb4bab 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.cpp
+++ b/TAO/examples/POA/RootPOA/RootPOA.cpp
@@ -36,8 +36,7 @@ main (int argc, char **argv)
       // Resolve the initial references for the name RootPOA thus getting
       // an object of type CORBA::Object.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // apply _narrow on the object of type CORBA::Object, to make it a
       // POA class Object.
diff --git a/TAO/examples/POA/TIE/Makefile b/TAO/examples/POA/TIE/Makefile
index f2d14fd7e7c..14e4947db34 100644
--- a/TAO/examples/POA/TIE/Makefile
+++ b/TAO/examples/POA/TIE/Makefile
@@ -23,9 +23,11 @@ FILE_SVR_OBJS = FooC.o FooS.o server.o Foo_i.o
 FILE_CLT_OBJS = FooC.o FooS.o client.o
 
 BIN = server client
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -34,28 +36,12 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
 
-  # Because older g++ cannot handle nested classes properly, this test
+  # Since older g++ cannot handle nested classes properly, this test
   # will not build on g++ prior to 2.8.0.
   all clean realclean:
 	@echo POA/TIE is not built with older versions of g++
 
 else # ! ACE_HAS_GNUG_PRE_2_8
-ifeq (cxvx,$(findstring cxvx,$(CXX)))
-
-  # Green Hills for VxWorks can't build this test.  It runs into
-  # trouble with template instantiations.
-  all clean realclean:
-	@echo POA/TIE is not built with Green Hills $(CXX).
-
-else # ! ACE_HAS_GNUG_PRE_2_8  &&  ! ghs/VxWorks
-ifeq (gcx,$(findstring gcx,$(CXX)))
-
-  # Green Hills for Solaris can't build this test.  It runs into
-  # trouble with template instantiations.
-  all clean realclean:
-	@echo POA/TIE is not built with Green Hills $(CXX).
-
-else # ! ACE_HAS_GNUG_PRE_2_8  &&  ! ghs
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
@@ -76,14 +62,8 @@ client: $(addprefix $(VDIR),$(FILE_CLT_OBJS))
 realclean: clean
 	-$(RM) FooC.* FooS.* FooS_T.*
 
-endif # ! ghs/Solaris
-endif # ! ghs/VxWorks
 endif # ! ACE_HAS_GNUG_PRE_2_8
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
diff --git a/TAO/examples/Persistent_Grid/Makefile b/TAO/examples/Persistent_Grid/Makefile
index b9dcbd82b8e..76f23c97fdd 100644
--- a/TAO/examples/Persistent_Grid/Makefile
+++ b/TAO/examples/Persistent_Grid/Makefile
@@ -45,6 +45,8 @@ SIMPLE_SVR_OBJS = \
                 server.o \
                 Simple_util.o 
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = 	server \
 	client \
 	persistent_client 
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index 6de2d000699..5e9a2d38cc7 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -12,12 +12,6 @@ AccountManager_i::AccountManager_i (void)
   // no-op
 }
 
-AccountManager_i::AccountManager_i (AccountManager_i &foo)
-  : POA_Bank::AccountManager (foo)
-{
-  // old g++ fooler.
-}
-
 // Destructor
 
 AccountManager_i::~AccountManager_i (void)
@@ -121,7 +115,7 @@ AccountManager_i::close (Bank::Account_ptr account,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
                            "Unable to close Account\n");
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index bb40b237ab2..b1cfb0d7fcf 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -45,9 +45,6 @@ public:
   AccountManager_i (void);
   // Constructor.
 
-  AccountManager_i (AccountManager_i&);
-  // Copy constructor for old g++.
-
   ~AccountManager_i (void);
   // Destructor.
 
diff --git a/TAO/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile
index 165b7d1c865..e8fcf27555b 100644
--- a/TAO/examples/Simple/bank/Makefile
+++ b/TAO/examples/Simple/bank/Makefile
@@ -40,6 +40,8 @@ SIMPLE_SVR_OBJS = \
                 ../Simple_util.o \
                 server.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = server \
        client
 
diff --git a/TAO/examples/Simple/chat/Makefile b/TAO/examples/Simple/chat/Makefile
index e6e0e8e1433..695f9ac3c97 100644
--- a/TAO/examples/Simple/chat/Makefile
+++ b/TAO/examples/Simple/chat/Makefile
@@ -43,6 +43,9 @@ SIMPLE_SVR_OBJS = \
 
 BIN = server \
       client
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index 4ccb450bbfe..50cbc84bdd0 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -10,12 +10,6 @@ Echo_i::Echo_i (void)
 {
 }
 
-// Old g++ fooler.
-Echo_i::Echo_i (Echo_i &foo)
-  : POA_Echo (foo)
-{
-}
-
 // Destructor.
 
 Echo_i::~Echo_i (void)
@@ -40,7 +34,7 @@ Echo_i::echo_list (const char *message,
   ACE_UNUSED_ARG (message);
 
   Echo::List *list;
-
+  
   ACE_NEW_RETURN (list,
                   Echo::List (3),
                   0);
@@ -84,7 +78,7 @@ Echo_i::echo_string (const char *mesg,
 
 // Shutdown the server application.
 
-void
+void 
 Echo_i::shutdown (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h
index 9966f31f3f8..7e71d9277ee 100644
--- a/TAO/examples/Simple/echo/Echo_i.h
+++ b/TAO/examples/Simple/echo/Echo_i.h
@@ -37,9 +37,6 @@ public:
   Echo_i (void);
   // Constructor.
 
-  Echo_i (Echo_i &);
-  // Copy constructor for old gcc.
-
   ~Echo_i (void);
   // Destructor.
 
diff --git a/TAO/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile
index 77b65ef77da..e6f81721987 100644
--- a/TAO/examples/Simple/echo/Makefile
+++ b/TAO/examples/Simple/echo/Makefile
@@ -38,6 +38,8 @@ SIMPLE_SVR_OBJS = \
                 ../Simple_util.o \
                 server.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = server \
        client
 
diff --git a/TAO/examples/Simple/echo/run_test.pl b/TAO/examples/Simple/echo/run_test.pl
index 3be6c7823be..d5853ba10b8 100755
--- a/TAO/examples/Simple/echo/run_test.pl
+++ b/TAO/examples/Simple/echo/run_test.pl
@@ -12,7 +12,7 @@ require Process;
 $status = 0;
 $iorfile = "echo.ior";
 
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile ");
+$SV = Process::Create ("server$EXE_EXT", "-o $iorfile ");
 if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
   print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
   $SV->Kill (); $SV->TimedWait (1);
diff --git a/TAO/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile
index cc7fe81556f..1bcd6f88adc 100644
--- a/TAO/examples/Simple/grid/Makefile
+++ b/TAO/examples/Simple/grid/Makefile
@@ -38,6 +38,8 @@ SIMPLE_SVR_OBJS = \
                 server.o \
                 ../Simple_util.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = server \
        client
 
diff --git a/TAO/examples/Simple/grid/client.dsp b/TAO/examples/Simple/grid/client.dsp
index ef7428c6c19..6e51ab12c5d 100644
--- a/TAO/examples/Simple/grid/client.dsp
+++ b/TAO/examples/Simple/grid/client.dsp
@@ -125,14 +125,13 @@ SOURCE=.\Grid.idl
 

 !IF  "$(CFG)" == "Simple Grid Client - Win32 Release"

 

-# PROP Ignore_Default_Tool 1

 USERDEP__GRID_="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

 InputPath=.\Grid.idl

 InputName=Grid

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Ge 1 -Gd $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -164,14 +163,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Simple Grid Client - Win32 Debug"

 

-# PROP Ignore_Default_Tool 1

 USERDEP__GRID_="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

 InputPath=.\Grid.idl

 InputName=Grid

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 -Gd $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/examples/Simple/grid/server.dsp b/TAO/examples/Simple/grid/server.dsp
index 1e0ea7ab05d..3a6abcaa877 100644
--- a/TAO/examples/Simple/grid/server.dsp
+++ b/TAO/examples/Simple/grid/server.dsp
@@ -125,14 +125,13 @@ SOURCE=.\Grid.idl
 

 !IF  "$(CFG)" == "Simple Grid Server - Win32 Release"

 

-# PROP Ignore_Default_Tool 1

 USERDEP__GRID_="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

 InputPath=.\Grid.idl

 InputName=Grid

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Ge 1 -Gd $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -164,14 +163,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Simple Grid Server - Win32 Debug"

 

-# PROP Ignore_Default_Tool 1

 USERDEP__GRID_="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

 InputPath=.\Grid.idl

 InputName=Grid

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 -Gd $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/examples/Simple/time-date/Makefile b/TAO/examples/Simple/time-date/Makefile
index c32181be0fd..a8531bca24b 100644
--- a/TAO/examples/Simple/time-date/Makefile
+++ b/TAO/examples/Simple/time-date/Makefile
@@ -37,8 +37,12 @@ SIMPLE_CLT_OBJS = Time_DateC.o \
                   client.o \
                   ../Simple_util.o \
                   Time_Date_Client_i.o
-SIMPLE_SVR_OBJS = server.o \
+SIMPLE_SVR_OBJS = Time_DateC.o \
+                  Time_DateS.o \
+                  Time_Date_i.o \
+                  server.o \
                   ../Simple_util.o
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BIN2 = server \
        client
diff --git a/TAO/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile
index 2339ddbe623..43dd4327d32 100644
--- a/TAO/examples/Simple/time/Makefile
+++ b/TAO/examples/Simple/time/Makefile
@@ -38,6 +38,8 @@ SIMPLE_SVR_OBJS = \
                 server.o \
                 ../Simple_util.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = server \
        client
 
diff --git a/TAO/examples/Simulator/DOVEMIB/Makefile b/TAO/examples/Simulator/DOVEMIB/Makefile
index 39ef41ad47d..92b4fc9299f 100644
--- a/TAO/examples/Simulator/DOVEMIB/Makefile
+++ b/TAO/examples/Simulator/DOVEMIB/Makefile
@@ -17,6 +17,7 @@ LSRC = $(PROG_SRCS)
 MIB_OBJS = DOVEMIB.o NavWeapC.o Node.o PrintVisitor.o AnyAnalyser.o
 
 LDLIBS = -lorbsvcs -lTAO
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BIN2 = DOVEMIB
 
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile
index 45c229e65ea..4076ae993a2 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile
@@ -11,6 +11,7 @@
 SRC = Concurrency_Service.cpp
 
 LDLIBS  = -lorbsvcs -lTAO
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BIN2 = Concurrency_Service
 
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index 156a4cbb257..40f789a8585 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -18,7 +18,7 @@ CosEvent_Service::~CosEvent_Service (void)
 }
 
 void
-CosEvent_Service::init_ORB  (int& argc, char *argv [],
+CosEvent_Service::init_ORB  (int argc, char *argv [],
                              CORBA::Environment &ACE_TRY_ENV)
 {
   this->orb_ = CORBA::ORB_init (argc,
@@ -110,9 +110,6 @@ CosEvent_Service::startup (int argc, char *argv[],
                   ACE_TRY_ENV);
   ACE_CHECK;
 
-  if (this->parse_args (argc, argv) == -1)
-    ACE_THROW (CORBA::BAD_PARAM ());
-
   this->resolve_naming_service (ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -272,6 +269,10 @@ main (int argc, char *argv[])
 
   CosEvent_Service service;
 
+  // check command line args.
+  if (service.parse_args (argc, argv) == -1)
+    return 1;
+
   ACE_TRY_NEW_ENV
     {
       service.startup (argc,
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
index 8ebec0dad84..cba9e9956a4 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
@@ -64,7 +64,7 @@ protected:
   virtual void deactivate_rtec (CORBA::Environment &ACE_TRY_ENV);
   // Deactivates the rtec.
 
-  void init_ORB (int& argc, char *argv [],
+  void init_ORB (int argc, char *argv [],
                  CORBA::Environment &ACE_TRY_ENV);
   // initialize the ORB.
 
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile
index 78cc65607c4..0cbb299afdf 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile
@@ -7,6 +7,7 @@ SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 DUMP_OBJS = $(DUMP_SRCS:.cpp=.o)
 
 LDLIBS  = -lorbsvcs -lTAO
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BIN2 = Dump_Schedule
 
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index 3ffaf01b67c..428a032e308 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -40,18 +40,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 #----------------------------------------------------------------------------
-#       Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-ifeq ($(LYNXTARGET),ppc)
-#### Event_Service.cpp raises internal compiler error with LynxOS 3.0.0 g++,
-#### but only when -O2 optimization is enabled.  Disable it . . .
-.obj/Event_Service.o .obj/Event_Service.so .shobj/Event_Service.o .shobj/Event_Service.so: Event_Service.cpp
-	@echo NOTE: compiling Event_Service.cpp with -O instead of -O2, see Makefile.
-	$(subst $(OCFLAGS) ,-O ,$(COMPILE.cc)) -o $@ $<
-endif # LYNXTARGET == ppc
-
-#----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 0b70ec188db..96047089eec 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -383,8 +383,6 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_TRY
     {
-      int retval = 0;
-
       // Call the init of <TAO_ORB_Manager> to initialize the ORB and
       // create a child POA under the root POA.
       if (this->orb_manager_.init_child_poa (argc,
@@ -397,7 +395,7 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
                           -1);
       ACE_TRY_CHECK;
 
-      retval = OPTIONS::instance()->parse_args (argc, argv);
+      int retval = OPTIONS::instance()->parse_args (argc, argv);
 
       if (retval != 0)
         return retval;
@@ -573,13 +571,17 @@ ImplRepo_i::list (CORBA::ULong how_many,
   ACE_NEW_THROW_EX (server_list,
                     ImplementationRepository::ServerInformationList (0),
                     CORBA::NO_MEMORY ());
+  ACE_CHECK;
 
   // Get a new iterator
   auto_ptr<Server_Repository::HASH_IR_ITER> server_iter (this->repository_.new_iterator ());
 
   // Check for a memory error.
   if (server_iter.get () == 0)
+  {
     ACE_THROW (CORBA::NO_MEMORY ());
+    ACE_CHECK;
+  }
   
   // Number of servers that will go into the server_list.
   CORBA::ULong n;
@@ -633,6 +635,7 @@ ImplRepo_i::list (CORBA::ULong how_many,
       ACE_NEW_THROW_EX (ir_iter,
                         IR_Iterator (server_iter.release (), this->orb_manager_.root_poa ()),
                         CORBA::NO_MEMORY ());
+      ACE_CHECK;
 
       ACE_TRY
         {
@@ -855,8 +858,6 @@ IR_Forwarder::invoke (CORBA::ServerRequest_ptr ,
   CORBA_Object_ptr forward_object =
     this->orb_var_->key_to_object (poa_current_impl->object_key (),
                                    0,
-                                   0,
-                                   0,
                                    ACE_TRY_ENV);
   ACE_CHECK;
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile b/TAO/orbsvcs/ImplRepo_Service/Makefile
index ff011988d2e..0d842fd46a0 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile
@@ -34,6 +34,8 @@ TAO_IR_OBJS = \
 	tao_ir.o \
 	tao_ir_i.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = ImplRepo_Service \
 	tao_ir
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
index 76b6387f676..10da79c6d87 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
@@ -228,14 +228,8 @@ template class ACE_Hash_Map_Manager_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_C
 template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-
-#if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)
-// This template is already defined in TAO, but Sun/CC 5.0 is broken
+// The ACE_CString case is covered in TAO
 template class ACE_Equal_To<ACE_CString>;
-#endif /* __SUNPRO_CC */
-// Instantiate for ACE_WString because ACE_TString can be either
-// ACE_CString or ACE_WString.
-template class ACE_Equal_To<ACE_WString>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -244,13 +238,7 @@ template class ACE_Equal_To<ACE_WString>;
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-
-#if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)
-// This template is already defined in TAO, but Sun/CC 5.0 is broken
+// The ACE_CString case is covered in TAO
 #pragma instantiate ACE_Equal_To<ACE_CString>
-#endif /* __SUNPRO_CC */
-// Instantiate for ACE_WString because ACE_TString can be either
-// ACE_CString or ACE_WString.
-#pragma instantiate ACE_Equal_To<ACE_WString>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index 8a14dafdbac..c0aa2f883ca 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -8,10 +8,12 @@
 #       Local macros
 #----------------------------------------------------------------------------
 
-SRC = Naming_Server.cpp Naming_Service.cpp
+SRC = $(addsuffix .cpp, $(BIN))
 
 LDLIBS  = -lorbsvcs -lTAO
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = Naming_Service
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
@@ -37,11 +39,11 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
+#TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
+
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
-#TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
@@ -49,299 +51,11 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/Naming_Server.o .obj/Naming_Server.so .shobj/Naming_Server.o .shobj/Naming_Server.so: Naming_Server.cpp Naming_Service.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.7.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i
 .obj/Naming_Service.o .obj/Naming_Service.so .shobj/Naming_Service.o .shobj/Naming_Service.so: Naming_Service.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.7.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -427,9 +141,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
@@ -490,6 +201,9 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
@@ -549,7 +263,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
deleted file mode 100644
index 113054c51f9..00000000000
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-#include "Naming_Service.h"
-
-// Driver function for the TAO Naming Service.
-
-int
-main (int argc, char *argv[])
-{
-  TAO_Naming_Service naming_service;
-
-  if (naming_service.init (argc, argv) == -1)
-    return -1;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      naming_service.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NamingService");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 07c51e4ddc8..1a369687b8c 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -185,3 +185,29 @@ TAO_Naming_Service::~TAO_Naming_Service (void)
 {
 }
 
+int
+main (int argc, char *argv[])
+{
+  TAO_Naming_Service naming_service;
+
+  int init_result = naming_service.init (argc, argv);
+
+  if (init_result == -1)
+    return -1;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      naming_service.run (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NamingService");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (1);
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
index f39619017ec..4b5cb666629 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
@@ -154,21 +154,6 @@ LINK32=link.exe
 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\Naming_Server.cpp

-

-!IF  "$(CFG)" == "Naming_Service - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "Naming_Service - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "Naming_Service - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "Naming_Service - Win32 Alpha Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\Naming_Service.cpp

 

 !IF  "$(CFG)" == "Naming_Service - Win32 Release"

@@ -334,12 +319,14 @@ DEP_CPP_NAMIN=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\align.h"\

 	"..\..\tao\any.h"\

 	"..\..\tao\any.i"\

 	"..\..\tao\cdr.h"\

 	"..\..\tao\cdr.i"\

-	"..\..\tao\CDR_Interpreter.h"\

 	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

@@ -354,6 +341,11 @@ DEP_CPP_NAMIN=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -369,6 +361,9 @@ DEP_CPP_NAMIN=\
 	"..\..\tao\ORB.i"\

 	"..\..\tao\orb_core.h"\

 	"..\..\tao\orb_core.i"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

 	"..\..\tao\orbconf.h"\

 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

@@ -413,6 +408,7 @@ DEP_CPP_NAMIN=\
 	"..\orbsvcs\CosNamingS_T.h"\

 	"..\orbsvcs\CosNamingS_T.i"\

 	"..\orbsvcs\IOR_Multicast.h"\

+	"..\orbsvcs\Naming\CosNaming_i.h"\

 	"..\orbsvcs\Naming\Entries.h"\

 	"..\orbsvcs\Naming\Naming_Utils.h"\

 	"..\orbsvcs\orbsvcs_export.h"\

@@ -420,18 +416,7 @@ DEP_CPP_NAMIN=\
 	

 NODEP_CPP_NAMIN=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\connect.h"\

-	"..\..\tao\connect.i"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

-	"..\..\tao\ORB_Strategies_T.cpp"\

-	"..\..\tao\ORB_Strategies_T.h"\

-	"..\..\tao\ORB_Strategies_T.i"\

-	"..\orbsvcs\Naming\CosNaming_i.h"\

 	

 

 !ELSEIF  "$(CFG)" == "Naming_Service - Win32 Alpha Release"

diff --git a/TAO/orbsvcs/Naming_Service/README b/TAO/orbsvcs/Naming_Service/README
index f309d51bc0f..55db915353a 100644
--- a/TAO/orbsvcs/Naming_Service/README
+++ b/TAO/orbsvcs/Naming_Service/README
@@ -1,17 +1,18 @@
 // $Id$
 
-This directory contains the files that implement a server for the TAO
-Naming Service.
+This directory contains the files that implement the TAO
+Naming server.
+
 
 To Run:
 ======
 
-% Naming_Server [-ORBnameserviceport nsport]
-                [-o ior_output_file]
-                [-p pid_file_name]
-                [-s context_size]
-                [-t time]
-                [-f persitence_file_name]
+% Naming_Service [-ORBnameserviceport nsport]
+                 [-o ior_output_file]
+                 [-p pid_file_name]
+                 [-s context_size]
+                 [-t time]
+                 [-f persitence_file_name]
 
 Optional Command-line Arguments:
 ===============================
@@ -24,7 +25,7 @@ Optional Command-line Arguments:
                 The name of the file, in which to store the IOR of the
                 root Naming Service context.
 
-        pid_file_name
+       pid_file_name
                 The name of the file, in which to store the process id
                 of the Naming Service server.
 
@@ -51,9 +52,9 @@ Environment Variables:
                 clients trying to bootstrap to a Naming Service
                 through the use of multicast.
 
+
 Persistence:
 ===========
-
 TAO Naming Service has an optional persistence capability.  By
 default, the Naming Service is started in a non-persistent mode.
 Supplying "-f" command-line option to the server causes a persistent
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index b71f6db494d..c67e0d10799 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile
@@ -6,6 +6,7 @@ LSRC =  $(SCHEDULE_SRCS)
 SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 
 LDLIBS  = -lorbsvcs -lTAO
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BIN2 = Scheduling_Service
 
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index d0896e7e994..a80fb4611c6 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -101,7 +101,7 @@ Clerk_i::read_ior (const char *filename)
 int
 Clerk_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "dt:u:f:o:");
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, "dt:f:o:");
 
   int c, result;
 
@@ -112,16 +112,10 @@ Clerk_i::parse_args (void)
         TAO_debug_level++;
         break;
 
-      case 't':  // time in secs after which the clerk should update time.
+      case 't':  // time after which the clerk should update time.
         this->timer_value_ = atoi (get_opts.optarg);
         break;
 
-      case 'u': 
-        // time in usecs after which the clerk should update time.
-        // Continues the precision of the -t option.
-        this->timer_value_usecs_ = atoi (get_opts.optarg);
-        break;
-
       case 'f':  // read the server IORs from a file.
         result = this->read_ior (get_opts.optarg);
 
@@ -149,8 +143,7 @@ Clerk_i::parse_args (void)
                            "[SERVER] Process/Thread Id : (%P/%t)"
                            "usage:  %s"
                            " [-d]"
-                           " [-t] <Timer value inn Secs>"
-                           " [-u] <Timer value in uSecs>"
+                           " [-t] <Timer value>"
                            " [-f] <ior_input_file>"
                            " [-o] <ior_output_file>"
                            "\n",
@@ -354,7 +347,6 @@ Clerk_i::create_clerk (void)
       // of server IORs and the no. of servers.
       ACE_NEW_RETURN (this->time_service_clerk_impl_,
                       TAO_Time_Service_Clerk (this->timer_value_,
-                                              this->timer_value_usecs_,
                                               this->server_),
                       0);
 
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index fed64f2e4cd..8c826d4872c 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -122,12 +122,9 @@ private:
   // My orb.
   
   int timer_value_ ;
-  // Clerk seeks time periodically after this interval in secs. from the
+  // Clerk seeks time periodically after this interval from the
   // servers in the network.
 
-  int timer_value_usecs_;
-  // Continues the precision of timer_value_ in microseconds.
-
   //  IR_Helper *ir_helper_;
   // Helper class for using the IR.
 
diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile
index 95a3f3aa90e..cadedc7e8e8 100644
--- a/TAO/orbsvcs/Time_Service/Makefile
+++ b/TAO/orbsvcs/Time_Service/Makefile
@@ -28,6 +28,8 @@ SIMPLE_SVR_OBJS = Server_i.o \
 SIMPLE_CRK_OBJS = Clerk_i.o \
         Time_Service_Clerk.o \
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = Time_Service_Server \
        Time_Service_Clerk
 
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index 581a6f0b48c..8a1f78f6fa4 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -54,6 +54,7 @@ Server_i::parse_args (void)
                            " [-d]"
                            " [-o] <ior_output_file>"
                            " [-i] <Use the Implementation Repository>"
+                           " [-r] <Register with the Implementation Repository>"
                            "\n",
                            argv_ [0]),
                           1);
@@ -74,10 +75,10 @@ Server_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
       // Initialize the POA.
       this->orb_manager_.init_child_poa (this->argc_,
                                          this->argv_,
-                                         "child_poa",
+                                         "time_server",
                                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       PortableServer::POA_ptr child_poa
         = this->orb_manager_.child_poa ();
 
@@ -95,7 +96,6 @@ Server_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "(%P|%t) Exception from init_naming_service ()\n");
-      
       return -1;
     }
   ACE_ENDTRY;
@@ -172,7 +172,13 @@ Server_i::create_server (void)
                       TAO_Time_Service_Server(this->use_ir_),
                       0);
 
+      // Generate IOR of the <TimeService Server> and register with
+      // POA.
+      //this->time_service_server_ =
+      //time_service_server_impl_->_this ();
+
       // Register a servant with the child poa.
+
       CORBA::String_var server_str =
         this->orb_manager_.activate_under_child_poa ("server",
                                                      this->time_service_server_impl_,
@@ -312,7 +318,7 @@ Server_i::register_server (void)
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Exception from Register Server ()\n");
+                           "(%P|%t) Exception from init_naming_service ()\n");
       return -1;
     }
   ACE_ENDTRY;
@@ -348,10 +354,6 @@ Server_i::init (int argc,
                                 -1);
       ACE_TRY_CHECK;
 
-      // Activate the POA Manager.
-      this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       int result = this->parse_args ();
 
       if (result != 0)
@@ -423,6 +425,3 @@ Server_i::run (CORBA::Environment &ACE_TRY_ENV)
 
   return 0;
 }
-
-
-
diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
index ee20e53f9af..73dc532d84f 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ b/TAO/orbsvcs/Trading_Service/Makefile
@@ -8,6 +8,8 @@
 
 LDLIBS  = -lorbsvcs -lTAO
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 SRC = $(addsuffix .cpp, $(BIN))
 
 BIN2 = Trading_Service
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
index 9e68302b882..0fc19f99056 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
@@ -52,12 +52,10 @@ module CosEventChannelFactory
 
     CosEventChannelAdmin::EventChannel create (
       in string channel_id,
-      in boolean store_in_naming_service) raises (DuplicateChannel, BindFailed);
+      in boolean store_in_naming_service) raises (DuplicateChannel);
     // Creates a CosEventChannel given a channel id.
     // The DuplicateChannel exception is raised if the channel
     // already exists.
-    // BindFailed is raised if we failed to register the newly created channel
-    // with the naming service.
 
     void destroy (
        in string channel_id,
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 599367d40b1..f01f4f49b99 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -55,14 +55,9 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
   policy_list [1] =
     PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy.in ());
 
-  PortableServer::POAManager_ptr manager =
-    poa->the_POAManager (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-  // @@ Pradeep : TODO - find a way to destroy the policy_list if we return here.
-
   // Create the child POA.
   this->poa_ = poa->create_POA (child_poa_name,
-                                manager,
+                                PortableServer::POAManager::_nil (),
                                 policy_list,
                                 ACE_TRY_ENV);
 
@@ -85,13 +80,13 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
                                       CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((
         CORBA::SystemException,
-        CosEventChannelFactory::DuplicateChannel,
-        CosEventChannelFactory::BindFailed
+        CosEventChannelFactory::DuplicateChannel
       ))
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
-  CosEventChannelAdmin::EventChannel_var ec_return;
+  CosEventChannelAdmin::EventChannel_ptr const ec_nil =
+    CosEventChannelAdmin::EventChannel::_nil ();
 
   ACE_TRY
     {
@@ -148,7 +143,7 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
 
       if (retval == -1)
         ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
-                          ec_return._retn ());
+                          ec_nil);
 
       ec.release (); // release the ownership from the auto_ptr.
 
@@ -169,52 +164,52 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
           ACE_TRY_CHECK;
         }
 
-      ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
+      return CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
     }
   ACE_CATCH (PortableServer::POA::ServantAlreadyActive, sa_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
-                        ec_return._retn ());
+                        ec_nil);
     }
   ACE_CATCH (PortableServer::POA::ObjectAlreadyActive, oaa_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
-                        ec_return._retn ());
+                        ec_nil);
     }
   ACE_CATCH (PortableServer::POA::WrongPolicy, wp_ex)
     {
       ACE_THROW_RETURN (CORBA::UNKNOWN (),
-                        ec_return._retn ());
+                        ec_nil);
     }
   ACE_CATCH (PortableServer::POA::ObjectNotActive, ona_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_return._retn ());
+                        ec_nil);
     }
   ACE_CATCH (CosNaming::NamingContext::NotFound, nf_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_return._retn ());
+                        ec_nil);
     }
   ACE_CATCH (CosNaming::NamingContext::CannotProceed, cp_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_return._retn ());
+                        ec_nil);
     }
   ACE_CATCH (CosNaming::NamingContext::InvalidName, in_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_return._retn ());
+                        ec_nil);
     }
   ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ab)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_return._retn ());
+                        ec_nil);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (ec_return._retn ());
+  ACE_CHECK_RETURN (ec_nil);
 
-  return ec_return._retn ();
+  ACE_NOTREACHED (return ec_nil);
 }
 
 void
@@ -296,7 +291,8 @@ TAO_CosEventChannelFactory_i::find
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
-  CosEventChannelAdmin::EventChannel_var ec_return;
+  CosEventChannelAdmin::EventChannel_ptr const ec_nil =
+    CosEventChannelAdmin::EventChannel::_nil ();
 
   ACE_TRY
     {
@@ -307,18 +303,17 @@ TAO_CosEventChannelFactory_i::find
         this->poa_->id_to_reference (oid.in (),
                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
+      return CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
     }
   ACE_CATCH (CORBA::UserException, ue) // Translate any user exception.
     {
       ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (),
-                        ec_return._retn ());
+                        ec_nil);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (ec_return._retn ());
+  ACE_CHECK_RETURN (ec_nil);
 
-  return ec_return._retn ();
+  ACE_NOTREACHED (return ec_nil);
 }
 
 char*
@@ -334,7 +329,6 @@ TAO_CosEventChannelFactory_i::find_channel_id
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
-  CORBA::String_var str_return;
   ACE_TRY
     {
       PortableServer::ObjectId_var oid =
@@ -342,17 +336,17 @@ TAO_CosEventChannelFactory_i::find_channel_id
                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      str_return = TAO_POA::ObjectId_to_string (oid.in ());
+      return TAO_POA::ObjectId_to_string (oid.in ());
     }
   ACE_CATCH (CORBA::UserException, ue) // Translate any user exception.
     {
       ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (),
-                        str_return._retn ());
+                        0);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (str_return._retn ());
+  ACE_CHECK_RETURN (0);
 
-  return str_return._retn ();
+  ACE_NOTREACHED (return 0);
 }
 
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
index 4ca3fab24fe..58a29c5ea16 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
@@ -66,8 +66,7 @@ class TAO_CosEventChannelFactory_i :
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
-        CosEventChannelFactory::DuplicateChannel,
-        CosEventChannelFactory::BindFailed
+        CosEventChannelFactory::DuplicateChannel
       ));
 
   virtual void destroy
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
index a3d6ba83543..93591bc8696 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
@@ -36,6 +36,8 @@ CLIENT_OBJS = \
         CosEventChannelFactoryC.o \
 	CosEventChannelFactoryS.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = factory \
 	factoryclient
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/README b/TAO/orbsvcs/examples/CosEC/Factory/README
deleted file mode 100644
index 75a929e46cd..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/README
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-                        CosEventChannelFactory
-        ======================================================
-
-The CosEventChannelFactory is a factory for creating COS Event
-Channels.  The ChannelFactory interface allows a client to create,
-destroy and locate factories.
-
-IMPLEMENTATION
-==============
-
-The TAO_CosEventChannelFactory_i class implements the C++ servant for
-the ChannelFactory interface.  The FactoryDriver class activates the
-ChannelFactory servant with the ORB.  During initialization the
-ChannelFactory creates a child POA which is used to activate all the
-CosEC servants.The ChannelFactory uses the CosEC_ServantBase class to
-create the CosEvent Channels.
-
-The Makefile in this directory generates 2 executables: factory and
-factoryclient.
-
-FACTORY
-=======
-
-To allow client applications to obtain a reference to the factory, a
-Naming service must be started prior to running the factory.
-
-The factory options are:
-
-        -r <FactoryName> : specifies under what name the factory should be
-
-registered with the Naming Service. The default is "CosEC_Factory"
-
-FACTORYCLIENT
-=============
-
-The factory client is a test driver for the factory. It excersises all
-the features of the factory.  A Naming Service and a factory must be
-running prior to running the factoryclient.  factoryclient does not
-take any command line options.
-
-AUTHOR
-======
-
-Pradeep Gore <pradeep@cs.wustl.edu>
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index c3bb4ff2714..7b45eafafc8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -479,30 +479,30 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CO
       ACE_TRY_CHECK;
       this->vdev_->_remove_ref (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      ACE_TRY_EX (bind)
-        {
-          // Register the vdev with the naming server.
-          this->naming_context_->bind (this->vdev_name_,
-                                       vdev_obj,
-                                       ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (bind);
-        }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
-        {
-          // If the object was already there, replace the older reference
-          // with this one
-          this->naming_context_->rebind (this->vdev_name_,
-                                         vdev_obj,
-                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::register_vdev");
-          return -1;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::register_vdev");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+  ACE_TRY_EX (bind)
+    {
+      // Register the vdev with the naming server.
+      this->naming_context_->bind (this->vdev_name_,
+                                   vdev_obj,
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK_EX (bind);
+    }
+  ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
+    {
+      // If the object was already there, replace the older reference
+      // with this one
+      this->naming_context_->rebind (this->vdev_name_,
+                                     vdev_obj,
+                                     ACE_TRY_ENV);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl b/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl
deleted file mode 100644
index 2f04c91261e..00000000000
--- a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl
+++ /dev/null
@@ -1,252 +0,0 @@
-// $Id$ 
-
-// IDL for Control and Management of Audio/Video Streams
-// Revised Submission
-
-// Additional IDL for full profile
-#include "AVStreams.idl"
-
-#pragma prefix "omg.org"
-
-module AVStreams_Full
-{
-  exception protocolNotSupported{};
-  exception formatNotSupported{};
-  exception formatMismatch{};
-  exception FEPMismatch{};
-  exception alreadyConnected{};
-  exception invalidSettings{string settings;};
-  exception notConnected{};
-  exception deviceQosMismatch{};
-  exception failedToConnect{string reason;};
-  exception failedToListen{string reason;};
-
-
-  interface FlowProducer;
-  interface FlowConsumer;
-  interface FlowEndPoint;
-  interface FDev;
-
-  interface FlowConnection : PropertyService::PropertySet
-    {
-      void stop();
-      void start();
-      void destroy();
-
-      boolean modify_QoS(
-		
-                         inout AVStreams::QoS new_qos)
-        raises (AVStreams::QoSRequestFailed);
-
-      boolean use_flow_protocol(
-                                in string fp_name,
-                                in any fp_settings)
-        raises (AVStreams::FPError, AVStreams::notSupported);
-
-      oneway void push_event(in AVStreams::streamEvent the_event);
-
-      boolean connect_devs(in FDev a_party, in FDev b_party,
-                           inout AVStreams::QoS the_qos)
-        raises (AVStreams::streamOpFailed, 
-                AVStreams::streamOpDenied, 
-                AVStreams::QoSRequestFailed);
-
-      boolean connect(
-                      in FlowProducer flow_producer,
-                      in FlowConsumer flow_consumer,
-                      inout AVStreams::QoS the_qos)
-        raises (formatMismatch, FEPMismatch, alreadyConnected);
-
-      boolean disconnect();
-
-      // The notSupported exception is raised where
-      // flow cannot have multiple producers
-      boolean add_producer(in FlowProducer flow_producer,
-                           inout AVStreams::QoS the_qos)
-        raises (alreadyConnected, AVStreams::notSupported);
-
-      boolean add_consumer(in FlowConsumer flow_consumer,
-                           inout AVStreams::QoS the_qos)
-        raises (alreadyConnected);
-
-      boolean drop(in FlowEndPoint target)
-        raises (notConnected);
-    };
-
-  interface FlowEndPoint : PropertyService::PropertySet
-    {
-      boolean lock();
-      void unlock();
-
-      void stop();
-      void start();
-      void destroy();
-
-      // Default is a nil object reference
-      attribute AVStreams::StreamEndPoint related_sep;
-      attribute FlowConnection related_flow_connection;
-
-      FlowEndPoint get_connected_fep()
-        raises (notConnected,
-                AVStreams::notSupported);
-
-      // syntax of fp_name is <flowProtocol>
-      boolean use_flow_protocol(in string fp_name,
-                                in any fp_settings)
-        raises (AVStreams::FPError, AVStreams::notSupported);
-
-      // set_format() initializes 'format' 
-      // as current media format e.g. MPEG.
-      void set_format(in string format)
-        raises (AVStreams::notSupported);
-
-      void set_dev_params(
-                          in PropertyService::Properties new_settings)
-        raises (PropertyService::PropertyException, 
-                AVStreams::streamOpFailed);
-
-      void set_protocol_restriction(in AVStreams::protocolSpec 
-                                    the_spec)
-        raises (AVStreams::notSupported);
-
-      boolean is_fep_compatible(in FlowEndPoint fep) 
-        raises (formatMismatch, deviceQosMismatch);
-
-      boolean set_peer(
-                       in FlowConnection the_fc,
-		
-                       in FlowEndPoint the_peer_fep,
-                       inout AVStreams::QoS the_qos)
-        raises (AVStreams::QoSRequestFailed,
-                AVStreams::streamOpFailed);
-
-      boolean set_Mcast_peer(
-                             in FlowConnection the_fc,
-                             in AVStreams::MCastConfigIf a_mcastconfigif,
-                             inout AVStreams::QoS the_qos)
-        raises (AVStreams::QoSRequestFailed);
-
-    };
-
-  interface FlowProducer : FlowEndPoint
-    {
-      boolean connect_to_peer(inout AVStreams::QoS the_qos,
-                              in string address,
-
-                              in string use_flow_protocol) // syntax <flowProtocol>
-        raises(failedToConnect,
-               AVStreams::FPError, AVStreams::QoSRequestFailed);
-
-      string connect_mcast(inout AVStreams::QoS the_qos,
-                           out boolean is_met,
-                           in string address,
-                           in string use_flow_protocol)
-        raises (failedToConnect,
-                AVStreams::notSupported,
-                AVStreams::FPError,
-                AVStreams::QoSRequestFailed);
-
-      string get_rev_channel(in string pcol_name);
-
-      void set_key(in AVStreams::key the_key);
-      void set_source_id(in long source_id);
-    };
-
-  interface FlowConsumer : FlowEndPoint
-    {
-
-
-      // Needs to know its peer to choose its protocol correctly
-      // Also to ask for a reverse channel for credit-based flow
-      // control, if one is required
-      string go_to_listen(
-                          inout AVStreams::QoS the_qos,
-                          in boolean is_mcast,
-                          in FlowProducer peer,
-                          inout string flowProtocol)// syntax <flowProtocol>
-        raises(failedToListen, AVStreams::FPError, 
-               AVStreams::QoSRequestFailed);
-    };
-
-  interface FDev : PropertyService::PropertySet {
-    FlowProducer create_producer(
-                                 in FlowConnection the_requester,
-                                 inout AVStreams::QoS the_qos,
-                                 out boolean met_qos,
-                                 inout string named_fdev)
-      raises(AVStreams::streamOpFailed,
-             AVStreams::streamOpDenied,
-             AVStreams::notSupported,
-             AVStreams::QoSRequestFailed);
-
-    FlowConsumer create_consumer(
-                                 in FlowConnection the_requester,
-                                 inout AVStreams::QoS the_qos,
-                                 out boolean met_qos,
-                                 inout string named_fdev)
-      raises(AVStreams::streamOpFailed,
-             AVStreams::streamOpDenied,
-             AVStreams::notSupported,
-             AVStreams::QoSRequestFailed);
-
-    FlowConnection bind(in FDev peer_device,
-                        inout AVStreams::QoS the_qos,
-                        out boolean is_met)
-      raises (AVStreams::streamOpFailed,
-              AVStreams::QoSRequestFailed);
-
-    FlowConnection bind_mcast(in FDev first_peer,
-                              inout AVStreams::QoS the_qos,
-                              out boolean is_met)
-      raises (AVStreams::streamOpFailed,
-              AVStreams::QoSRequestFailed);
-
-    void destroy(in FlowEndPoint the_ep, in string fdev_name)
-      // ie FDev not found
-      raises (AVStreams::notSupported);
-  };
-
-  enum PositionOrigin {
-    AbsolutePosition, RelativePosition, ModuloPosition
-  };
-
-  enum PositionKey {
-    ByteCount, SampleCount, MediaTime
-  };
-
-  struct Position {
-    PositionOrigin origin;
-    PositionKey key;
-    long value;
-  };
-
-  exception PostionKeyNotSupported { PositionKey key;};
-  exception InvalidPosition { PositionKey key;};
-
-  // MediaControl interface is similar to
-  // ControlledStream interface in MSS.
-  // It can be inherited by flow endpoints or
-  // FlowConnection interfaces.
-  interface MediaControl{
-
-    exception PostionKeyNotSupported { PositionKey key;};
-
-    Position get_media_position(
-                                in PositionOrigin an_origin,
-                                in PositionKey a_key)
-      raises (PostionKeyNotSupported);
-
-    void set_media_position(in Position a_position)
-      raises (PostionKeyNotSupported, InvalidPosition);
-
-    void start(in Position a_position)
-      raises(InvalidPosition);
-    void pause(in Position a_position)
-      raises(InvalidPosition);
-    void resume(in Position a_position)
-      raises(InvalidPosition);
-    void stop(in Position a_position)
-      raises(InvalidPosition);
-  };
-};
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index c4e7e348065..9349a960ba3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -59,7 +59,7 @@ TAO_EC_Conjunction_Filter::all_received (void) const
       if (*i != ACE_static_cast(Word,~0))
         return 0;
     }
-  return 1;
+  return 0;
 }
 
 TAO_EC_Filter::ChildrenIterator
@@ -108,7 +108,7 @@ TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
        i != end;
        ++i)
     {
-      int n = (*i)->filter_nocopy (event, qos_info, ACE_TRY_ENV);
+      int n = (*i)->filter (event, qos_info, ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
       if (n != 0)
         return n;
@@ -164,7 +164,7 @@ TAO_EC_Conjunction_Filter::clear (void)
       *j = 0;
     }
   int b = this->n_ % bits_per_word;
-  Word last = ~0 << b;
+  Word last = ~(~0 << b);
   *j = last;
 
   this->event_.length (0);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index 7dee4cee165..62375c387f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -39,8 +39,7 @@ TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier,
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        CORBA::INTERNAL ());
-    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i () == 0)
@@ -55,8 +54,7 @@ TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier,
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        CORBA::INTERNAL ());
-    // @@  RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
     filter->_decr_refcnt ();
   }
@@ -188,8 +186,7 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier (
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        CORBA::INTERNAL ());
-    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i ())
@@ -208,8 +205,7 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier (
         {
           ACE_GUARD_THROW_EX (
               TAO_EC_Unlock, ace_mon, reverse_lock,
-              CORBA::INTERNAL ());
-          // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+              RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
           this->event_channel_->disconnected (this, ACE_TRY_ENV);
@@ -242,8 +238,7 @@ TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event,
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        CORBA::INTERNAL ());
-    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i () == 0)
@@ -262,8 +257,7 @@ TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event,
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        CORBA::INTERNAL ());
-    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
     filter->_decr_refcnt ();
     this->refcount_--;
@@ -281,8 +275,7 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        CORBA::INTERNAL ());
-    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i () == 0)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index eba09ed9766..f6df18233df 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -142,8 +142,7 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        CORBA::INTERNAL ());
-    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i ())
@@ -174,8 +173,7 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
         {
           ACE_GUARD_THROW_EX (
               TAO_EC_Unlock, ace_mon, reverse_lock,
-              CORBA::INTERNAL ());
-          // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+              RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
           this->event_channel_->disconnected (this, ACE_TRY_ENV);
@@ -212,8 +210,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        CORBA::INTERNAL ());
-    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i () == 0)
@@ -237,8 +234,7 @@ TAO_EC_ProxyPushSupplier::suspend_connection (CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
-            CORBA::INTERNAL ());
-  // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
   ACE_CHECK;
 
   this->suspended_ = 1;
@@ -250,8 +246,7 @@ TAO_EC_ProxyPushSupplier::resume_connection (CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
-            CORBA::INTERNAL ());
-  // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
   ACE_CHECK;
 
   this->suspended_ = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 01aa455a3ff..5c81c125452 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -1444,8 +1444,7 @@ ACE_ES_Consumer_Module::obtain_push_supplier (
   {
     ACE_GUARD_THROW_EX (
         ACE_ES_MUTEX, ace_mon, this->lock_,
-        CORBA::INTERNAL ());
-    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
+        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
     ACE_CHECK_RETURN (proxy);
 
     if (all_consumers_.insert (new_consumer.get ()) == -1)
@@ -3352,8 +3351,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
   {
     ACE_GUARD_THROW_EX (
          ACE_ES_MUTEX, ace_mon, this->lock_,
-         CORBA::INTERNAL ());
-    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
+         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
     ACE_CHECK_RETURN (proxy);
 
     if (all_suppliers_.insert (new_supplier.get ()) == -1)
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index c7daca5cffd..78983c10989 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -46,29 +46,18 @@ TAO_IOR_Multicast::init (const char *ior,
                          TAO_Service_ID service_id)
 {
   this->service_id_ = service_id;
+  this->mcast_addr_.set (port, mcast_addr);
   this->ior_ = ior;
-  if (this->mcast_addr_.set (port,
-                             mcast_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "set"),
-                      -1);
-  else if (this->response_addr_.set ((u_short) 0) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "set"),
-                      -1);
-  else if (this->response_.open (this->response_addr_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "set"),
-                      -1);
+  this->response_addr_.set ((u_short) 0);
+  this->response_.open (this->response_addr_);
+
   // Use ACE_SOCK_Dgram_Mcast factory to subscribe to multicast group.
-  else if (this->mcast_dgram_.subscribe (this->mcast_addr_) == -1)
+  if (this->mcast_dgram_.subscribe (this->mcast_addr_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "subscribe"),
                       -1);
+
   return 0;
 }
 
@@ -82,8 +71,7 @@ TAO_IOR_Multicast::handle_timeout (const ACE_Time_Value &,
 int
 TAO_IOR_Multicast::handle_input (ACE_HANDLE)
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Entered TAO_IOR_Multicast::handle_input\n"));
+  ACE_DEBUG ((LM_DEBUG, "TAO_IOR_Multicast::Handle_input\n"));
 
   // The length of the service name string that follows.
   CORBA::Short header;
@@ -97,7 +85,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
   // Take a peek at the header to find out how long is the service
   // name string we should receive.
   ssize_t n = this->mcast_dgram_.recv (&header,
-                                       sizeof (header),
+                                       sizeof(header),
 				       remote_addr,
                                        MSG_PEEK);
   if (n <= 0)
@@ -105,6 +93,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
                        "TAO_IOR_Multicast::handle_input - peek %d\n",
 		       n),
 		      0);
+
   else if (ACE_NTOHS (header) <= 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Header value < 1\n"),
@@ -115,7 +104,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
   iovec iov[iovcnt];
 
   iov[0].iov_base = (char *) &header;
-  iov[0].iov_len  = sizeof (header);
+  iov[0].iov_len  = sizeof(header);
   iov[1].iov_base = (char *) &remote_port;
   iov[1].iov_len  = sizeof (ACE_UINT16);
   iov[2].iov_base = (char *) service_name;
@@ -163,7 +152,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
   // Reply to the multicast message.
   ACE_SOCK_Connector connector;
   ACE_INET_Addr peer_addr (ACE_NTOHS (remote_port),
-			   remote_addr.get_host_addr ());
+			   remote_addr.get_host_name ());
   ACE_SOCK_Stream stream;
 
   // Connect.
@@ -193,6 +182,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
 
   ssize_t result = stream.sendv_n (iovp,
                                    cnt);
+
   // Close the stream.
   stream.close ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index d1c1972aaed..eba72d3ce4e 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -54,11 +54,8 @@ ifndef TAO_ORBSVCS
                 Sched \
                 Event \
                 CosEvent \
-                Event2
-
-ifndef TEMPINCDIR # ! AIX
-  TAO_ORBSVCS += AV
-endif # TEMPINCDIR
+                Event2 \
+                AV
 
 # This services is not compiled by default, it is rarely used and it
 # is not prepared to deal with exceptions
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.bor b/TAO/orbsvcs/orbsvcs/Makefile.bor
index 57d0593fd65..bb6ea8f77f9 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.bor
+++ b/TAO/orbsvcs/orbsvcs/Makefile.bor
@@ -144,8 +144,6 @@ OBJFILES = \
 	$(OBJDIR)\Trader_Utils.obj \
 	$(OBJDIR)\Transient_Naming_Context.obj
 
-RESOURCE = $(OBJDIR)\orbsvcs.res
-
 CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_BUILD_CFLAGS) $(ORBSVCS_CFLAGS)
 
 CPPDIR = .;AV;Event;concurrency;Sched;Trader;Naming;CosEvent;Time;Property;Log
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index 37b28322386..eba715964bf 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -132,9 +132,18 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
               return -1;
             }
 
-          // Set the root Naming Context reference.
+          // Set the root Naming Context reference and ior.
+          this->naming_service_ior_= this->context_index_->root_ior ();
+
+          CORBA::Object_var obj =
+            orb->string_to_object (this->naming_service_ior_.in (),
+                                   ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
           this->naming_context_ =
-            this->context_index_->root_context ();
+            CosNaming::NamingContext::_narrow (obj.in (),
+                                               ACE_TRY_ENV);
+          ACE_TRY_CHECK;
         }
       else
         {
@@ -148,14 +157,13 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
                                                             ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
+          // Set the root Naming Context ior.
+          this->naming_service_ior_=
+            orb->object_to_string (this->naming_context_.in (),
+                                   ACE_TRY_ENV);
+          ACE_TRY_CHECK;
         }
 
-      // Set the ior of the root Naming Context.
-      this->naming_service_ior_=
-        orb->object_to_string (this->naming_context_.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       // Make the Naming Service locatable through iioploc.
       if (orb->_tao_add_to_IOR_table ("NameService",
                                       this->naming_context_.in ())
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index e72b7058052..97f8ecad34c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -95,10 +95,10 @@ TAO_Persistent_Context_Index::allocator (void)
   return allocator_;
 }
 
-CosNaming::NamingContext_ptr
-TAO_Persistent_Context_Index::root_context (void)
+char*
+TAO_Persistent_Context_Index::root_ior (void)
 {
-  return CosNaming::NamingContext::_duplicate (root_context_.in ());
+  return CORBA::string_dup (root_ior_.in ());
 }
 
 CORBA::ORB_ptr
@@ -136,13 +136,17 @@ TAO_Persistent_Context_Index::init (size_t context_size)
     {
       ACE_DECLARE_NEW_CORBA_ENV;
 
-      this->root_context_ =
+      CosNaming::NamingContext_var result =
         TAO_Persistent_Naming_Context::make_new_context (poa_.in (),
                                                          TAO_ROOT_NAMING_CONTEXT,
                                                          context_size,
                                                          this,
                                                          ACE_TRY_ENV);
       ACE_CHECK_RETURN (-1);
+
+      this->root_ior_=
+        orb_->object_to_string (result.in (), ACE_TRY_ENV);
+      ACE_CHECK_RETURN (-1);
     }
 
   else
@@ -221,8 +225,11 @@ TAO_Persistent_Context_Index::recreate_all (void)
 
       // If this is the root Naming Context, take a note of it.
       if (context_impl->root ())
-          this->root_context_= result._retn ();
-
+        {
+          this->root_ior_=
+            orb_->object_to_string (result.in (), ACE_TRY_ENV);
+          ACE_CHECK_RETURN (-1);
+        }
     } while (index_iter->advance ());
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
index f3d03911b75..2b60b3ede0f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -99,8 +99,8 @@ public:
   CORBA::ORB_ptr orb (void);
   // Return orb pointer.
 
-  CosNaming::NamingContext_ptr root_context (void);
-  // Return a pointer to the root Naming Context (returns a copy - must be
+  char *root_ior (void);
+  // Return ior of the root Naming Context (returns a copy - must be
   // deallocated by the user).
 
 private:
@@ -143,8 +143,8 @@ private:
   // POA under which to register Persistent Naming Context servants
   // during start-up.
 
-  CosNaming::NamingContext_var root_context_;
-  // The reference to the root Naming Context.
+  CORBA::String_var root_ior_;
+  // The ior of the root Naming Context.
 };
 
 #endif /* TAO_PERSISTENT_CONTEXT_INDEX_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 1716ec7d7dd..0eab7b9a2f4 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -1443,7 +1443,10 @@ ACE_DynScheduler::relate_task_entries_recurse (long &time, Task_Entry &entry)
       // same (see the definition of ptr_arith_t in ACE to grok how
       // this works portably).
       Task_Entry *dependency_entry_ptr =
-        ACE_LONGLONG_TO_PTR (Task_Entry *, dependency_info->volatile_token);
+        ACE_reinterpret_cast (Task_Entry *,
+                              ACE_static_cast (ptr_arith_t,
+                                               dependency_info->
+                                                 volatile_token));
 
       if (! dependency_entry_ptr)
       {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index c2ccc3136f3..6f5624c03bc 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -60,7 +60,7 @@ TAO_Reconfig_Scheduler_Entry (RtecScheduler::RT_Info &rt_info)
     effective_exec_multiplier_ (0),
     effective_period_ (0)
 {
-  // Store the RT_Info fields.
+  // Store the RT_Info fields.  
   this->orig_rt_info_data (*actual_rt_info_);
 }
 
@@ -389,46 +389,6 @@ TAO_RSE_Reset_Visitor::visit (TAO_Reconfig_Scheduler_Entry &rse)
 // class TAO_MUF_Reconfig_Sched_Strategy //
 ///////////////////////////////////////////
 
-// Ordering function to compare the DFS finish times of
-// two task entries, so qsort orders these in topological
-// order, with the higher times *first*
-int
-TAO_MUF_Reconfig_Sched_Strategy::comp_entry_finish_times (const void *first, const void *second)
-{
-  const TAO_Reconfig_Scheduler_Entry *first_entry =
-    * ACE_reinterpret_cast (const TAO_Reconfig_Scheduler_Entry *const *,
-                            first);
-
-  const TAO_Reconfig_Scheduler_Entry *second_entry =
-    * ACE_reinterpret_cast (const TAO_Reconfig_Scheduler_Entry *const *,
-                            second);
-
-  // sort blank entries to the end
-  if (! first_entry)
-  {
-    return (second_entry) ? 1 : 0;
-  }
-  else if (! second_entry)
-  {
-    return -1;
-  }
-
-  // Sort entries with higher forward DFS finishing times before those
-  // with lower forward DFS finishing times.
-  if (first_entry->fwd_finished () >
-      second_entry->fwd_finished ())
-  {
-    return -1;
-  }
-  else if (first_entry->fwd_finished () <
-           second_entry->fwd_finished ())
-  {
-    return 1;
-  }
-
-  return 0;
-}
-
 // Ordering function used to qsort an array of TAO_Reconfig_Scheduler_Entry
 // pointers into a total <priority, subpriority> ordering.  Returns -1 if the
 // first one is higher, 0 if they're the same, and 1 if the second one is higher.
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
index 472dc5f6cb1..de8ef81c5bb 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -238,11 +238,6 @@ class TAO_ORBSVCS_Export TAO_MUF_Reconfig_Sched_Strategy
 {
 public:
 
-  static int comp_entry_finish_times (const void *first, const void *second);
-  // Ordering function to compare the DFS finish times of
-  // two task entries, so qsort orders these in topological
-  // order, with the higher times *first*.
-
   static int total_priority_comp (const void *, const void *);
   // Ordering function used to qsort an array of
   // TAO_Reconfig_Scheduler_Entry pointers into a total <priority,
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index 6a5d3a3707b..c975930a12b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -45,7 +45,8 @@ ACE_RCSID(Sched, Reconfig_Sched_Utils_T, "$Id$")
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 TAO_RSE_Dependency_Visitor
-    (DEPENDENCY_SET_MAP & dependency_map, RT_INFO_MAP & rt_info_map)
+    (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
+     ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
   : dependency_map_ (dependency_map),
     rt_info_map_ (rt_info_map)
 {
@@ -87,17 +88,17 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
       // Call prefix action method, which performs any necessary
       // modifications on the node prior to visiting its successors.
       if (this->prefix_action (rse) < 0)
-        {
+	{
           ACE_ERROR_RETURN ((LM_ERROR,
                              "TAO_RSE_Dependency_Visitor::"
                              "visit: error from prefix action.\n"), -1);
-        }
+	}
 
       // Get the dependency set for the current entry.
       RtecScheduler::Dependency_Set *dependency_set = 0;
       if (dependency_map_.find (rse.actual_rt_info ()->handle,
                                 dependency_set) == 0)
-        {
+	{
           // Iterate over the set of dependencies for the current entry.
           TAO_Reconfig_Scheduler_Entry * next_rse = 0;
           RtecScheduler::RT_Info *next_rt_info;
@@ -114,7 +115,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
               // Extract a pointer to the scheduling entry from the RT_Info.
 
               if (next_rt_info == 0)
-                {
+	        {
                   ACE_ERROR_RETURN ((LM_ERROR, "RT_Info in map was null.\n"),
                                     -1);
                 }
@@ -123,11 +124,12 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
               // needed to ensure that the size of the pointer and the size of the
               // stored magic cookie are the same (see the definition of
               // ptr_arith_t in ACE to grok how this works portably).
-              next_rse =
-                ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
-                                     next_rt_info->volatile_token);
+              next_rse = ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry *,
+                                               ACE_static_cast (ptr_arith_t,
+                                                                next_rt_info->
+                                                                  volatile_token));
               if (next_rse == 0)
-                {
+	        {
                   ACE_ERROR_RETURN ((LM_ERROR,
                                      "Entry pointer in RT_Info was null.\n"),
                                     -1);
@@ -153,15 +155,15 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
                 }
             }
 
-        }
+	}
 
       // Call postfix action method, which performs any necessary
       // modifications on the node after visiting all its successors.
       if (this->postfix_action (rse) < 0)
-        {
+	{
           ACE_ERROR_RETURN ((LM_ERROR, "TAO_RSE_Dependency_Visitor::"
                              "visit: error from postfix action.\n"), -1);
-        }
+	}
     }
 
   return 0;
@@ -439,10 +441,10 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
        TAO_Reconfig_Scheduler_Entry::NOT_VISITED)
     {
       if (this->in_a_cycle () == 0)
-        {
+	{
           this->in_a_cycle (1);
           ++this->number_of_cycles_;
-        }
+	}
 
       ACE_DEBUG ((LM_ERROR,
                   "RT_Infos \"%s\" and \"%s\" are part of dependency cycle %d.\n",
@@ -751,7 +753,7 @@ TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_Reconfig_Scheduler
   else
     {
       if (RECONFIG_SCHED_STRATEGY::compare_priority (*previous_entry_, rse) == 0)
-        {
+	{
           // Subpriority is increased at each new node.
           ++subpriority_;
 
@@ -760,19 +762,19 @@ TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_Reconfig_Scheduler
           // subpriorities in the priority level, so the
           // subpriorities are assigned in decreasing order.
           rse.actual_rt_info ()->preemption_subpriority = - subpriority_;
-        }
+	}
       else
-        {
+	{
           // Indicate a new priority level was assigned.
           result = 1;
 
           // Iterate back through and adjust the subpriority levels.
           for (int i = 0; i <= subpriority_; ++i, ++first_subpriority_entry_)
-            {
+	    {
               (*first_subpriority_entry_)->
                 actual_rt_info ()->
                   preemption_subpriority += subpriority_;
-            }
+	    }
 
           subpriority_ = 0;
           rse.actual_rt_info ()->preemption_subpriority = subpriority_;
@@ -781,7 +783,7 @@ TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_Reconfig_Scheduler
           os_priority_ = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
                                                     os_priority_,
                                                     ACE_SCOPE_PROCESS);
-        }
+	}
     }
 
   // Assign the entry's priority and subpriority values
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index 9634fba1a4a..1c4976552d6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -51,14 +51,13 @@ typedef int (*COMP_FUNC) (const void*, const void*);
 // Default constructor.
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::TAO_Reconfig_Scheduler (int enforce_schedule_stability)
+TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::TAO_Reconfig_Scheduler ()
   : config_info_count_ (0),
     rt_info_count_ (0),
     next_handle_ (1),
     entry_ptr_array_ (0),
     entry_ptr_array_size_ (0),
     stability_flags_ (SCHED_NONE_STABLE),
-    enforce_schedule_stability_ (enforce_schedule_stability),
     dependency_count_ (0),
     last_scheduled_priority_ (0)
 {
@@ -75,13 +74,11 @@ TAO_Reconfig_Scheduler (int config_count,
                         ACE_Scheduler_Factory::POD_RT_Info rt_infos[],
                         int dependency_count,
                         ACE_Scheduler_Factory::POD_Dependency_Info dependency_infos[],
-                        u_long stability_flags,
-                        int enforce_schedule_stability)
+                        u_long stability_flags)
   : config_info_count_ (0),
     rt_info_count_ (0),
     next_handle_ (1),
     stability_flags_ (SCHED_ALL_STABLE),
-    enforce_schedule_stability_ (enforce_schedule_stability),
     dependency_count_ (0),
     last_scheduled_priority_ (0)
 {
@@ -147,11 +144,7 @@ init (int config_count,
       ACE_CHECK_RETURN (-1);
 
       // Make sure the new config info is cleaned up if we exit abruptly.
-      if (new_config_info != new_config_info_ptr.get ())
-        {
-          auto_ptr<RtecScheduler::Config_Info> tmp_config_info_ptr(new_config_info);
-          new_config_info_ptr = tmp_config_info_ptr;
-        }
+      new_config_info_ptr.reset (new_config_info);
 
       result = config_info_map_.bind (config_info [config_info_count_].preemption_priority,
                                       new_config_info);
@@ -440,9 +433,9 @@ set (RtecScheduler::handle_t handle,
   // stored magic cookie are the same (see the definition of
   // ptr_arith_t in ACE to grok how this works portably).
   TAO_Reconfig_Scheduler_Entry *sched_entry_ptr =
-    ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
-                         rt_info_ptr->volatile_token);
-
+    ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry *,
+                          ACE_static_cast (ptr_arith_t,
+                                           rt_info_ptr->volatile_token));
   if (0 == sched_entry_ptr)
     {
       ACE_THROW (RtecScheduler::INTERNAL ());
@@ -526,8 +519,7 @@ priority (RtecScheduler::handle_t handle,
   ACE_CHECK;
 
   // Check stability flags.
-  if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
-      && this->enforce_schedule_stability_)
+  if (this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
     {
       ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
     }
@@ -682,23 +674,18 @@ compute_scheduling (CORBA::Long minimum_priority,
   //          storing the maximum severity level recorded so far.
   if (anomalies.ptr () == 0)
     {
-      ACE_NEW_THROW_EX (anomalies,
-                        RtecScheduler::Scheduling_Anomaly_Set (0),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
+      anomalies =
+        new RtecScheduler::Scheduling_Anomaly_Set (0);
     }
 
   // return the set of scheduled RT_Infos
   if (infos.ptr () == 0)
     {
-      ACE_NEW_THROW_EX (infos,
-                        RtecScheduler::RT_Info_Set (this->rt_info_count_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
+      infos = new RtecScheduler::RT_Info_Set (this->rt_info_count_);
     }
   infos->length (this->rt_info_count_);
   RtecScheduler::RT_Info* rt_info = 0;
-  for (ACE_TYPENAME RT_INFO_MAP::iterator info_iter (this->rt_info_map_);
+  for (RT_INFO_MAP::iterator info_iter (this->rt_info_map_);
        info_iter.done () == 0;
        ++info_iter)
     {
@@ -709,15 +696,12 @@ compute_scheduling (CORBA::Long minimum_priority,
   // return the set of scheduled Config_Infos
   if (configs.ptr () == 0)
     {
-      ACE_NEW_THROW_EX (configs,
-                        RtecScheduler::Config_Info_Set(this->
-                                                         config_info_count_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
+      configs =
+        new RtecScheduler::Config_Info_Set(this->config_info_count_);
     }
   configs->length (this->config_info_count_);
   RtecScheduler::Config_Info* config_info = 0;
-  for (ACE_TYPENAME CONFIG_INFO_MAP::iterator config_iter (this->config_info_map_);
+  for (CONFIG_INFO_MAP::iterator config_iter (this->config_info_map_);
        config_iter.done () == 0;
        ++config_iter)
     {
@@ -757,8 +741,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
   ACE_CHECK;
 
   // Check stability flags
-  if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
-      && this->enforce_schedule_stability_)
+  if (this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
     {
       ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
     }
@@ -792,8 +775,7 @@ last_scheduled_priority (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK_RETURN (0);
 
   // Check schedule stability flags.
-  if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
-      && this->enforce_schedule_stability_)
+  if (this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
     {
       ACE_THROW_RETURN (RtecScheduler::NOT_SCHEDULED (),
                         (RtecScheduler::Preemption_Priority_t) -1);
@@ -1024,8 +1006,7 @@ priority_i (RtecScheduler::handle_t handle,
                       RtecScheduler::NOT_SCHEDULED))
 {
   // Check stability flags.
-  if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
-      && this->enforce_schedule_stability_)
+  if (this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
     {
       ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
     }
@@ -1197,6 +1178,46 @@ dfs_traverse_i (CORBA::Environment &ACE_TRY_ENV)
 }
 
 
+// Helper function to compare the DFS finish times of
+// two task entries, so qsort orders these in topological
+// order, with the higher times *first*
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
+TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
+comp_entry_finish_times (const void *first, const void *second)
+{
+  const TAO_Reconfig_Scheduler_Entry *first_entry =
+    * ACE_reinterpret_cast (const TAO_Reconfig_Scheduler_Entry *const *,
+                            first);
+
+  const TAO_Reconfig_Scheduler_Entry *second_entry =
+    * ACE_reinterpret_cast (const TAO_Reconfig_Scheduler_Entry *const *,
+                            second);
+
+  // sort blank entries to the end
+  if (! first_entry)
+  {
+    return (second_entry) ? 1 : 0;
+  }
+  else if (! second_entry)
+  {
+    return -1;
+  }
+
+  // Sort entries with higher forward DFS finishing times before those
+  // with lower forward DFS finishing times.
+  if (first_entry->fwd_finished () >
+      second_entry->fwd_finished ())
+  {
+    return -1;
+  }
+  else if (first_entry->fwd_finished () <
+           second_entry->fwd_finished ())
+  {
+    return 1;
+  }
+
+  return 0;
+}
 
 // Sorts an array of RT_info handles in topological order, then
 // checks for loops, marks unresolved remote dependencies.
@@ -1214,7 +1235,7 @@ detect_cycles_i (CORBA::Environment &ACE_TRY_ENV)
            this->rt_info_count_,
            sizeof (TAO_Reconfig_Scheduler_Entry *),
            ACE_reinterpret_cast (COMP_FUNC,
-                                 RECONFIG_SCHED_STRATEGY::comp_entry_finish_times));
+                                 TAO_Reconfig_Scheduler::comp_entry_finish_times));
 
   // Traverse entries in reverse topological order,
   // looking for strongly connected components (cycles).
@@ -1306,7 +1327,7 @@ assign_priorities_i (CORBA::Environment &ACE_TRY_ENV)
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
         }
     }
 
@@ -1344,11 +1365,7 @@ assign_priorities_i (CORBA::Environment &ACE_TRY_ENV)
           ACE_CHECK;
 
           // Make sure the new config info is cleaned up if we exit abruptly.
-          if (new_config_info != new_config_info_ptr.get ())
-            {
-              auto_ptr<RtecScheduler::Config_Info> tmp_config_info_ptr(new_config_info);
-              new_config_info_ptr = tmp_config_info_ptr;
-            }
+          new_config_info_ptr.reset (new_config_info);
 
           // Have the strategy fill in the new config info for that
           // priority level, using the representative scheduling entry.
@@ -1435,97 +1452,6 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::init_rt_info (RtecSch
   rt_info.volatile_token = 0;
 }
 
-
-// Accesses scheduling strategy for the reconfig scheduler.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RECONFIG_SCHED_STRATEGY &
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::sched_strategy ()
-{
-  return this->sched_strategy_;
-}
-
-
-// Accesses map for O(1) lookup of Config_Infos by priority level.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::CONFIG_INFO_MAP &
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::config_info_map ()
-{
-  return this->config_info_map_;
-}
-
-
-// Returns the number of config infos, which is also the number of
-// assigned priority levels.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> long
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::config_info_count ()
-{
-  return this->config_info_count_;
-}
-
-
-// Accesses map for O(1) lookup of RT_Infos by handle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP &
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::rt_info_map ()
-{
-  return this->rt_info_map_;
-}
-
-
-// Returns the number of registered RT_Infos.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> long
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::rt_info_count ()
-{
-  return this->rt_info_count_;
-}
-
-
-// Accesses tree for O(log n) lookup of RT_Infos by name.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_TREE &
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::rt_info_tree ()
-{
-  return this->rt_info_tree_;
-}
-
-
-// Accesses map for O(1) lookup of RT_Info dependency
-// set by the caller operation's handle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::calling_dependency_set_map ()
-{
-  return this->calling_dependency_set_map_;
-}
-
-
-// Accesses map for O(1) lookup of RT_Info dependency
-// set by the called operation's handle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::called_dependency_set_map ()
-{
-  return this->called_dependency_set_map_;
-}
-
-
-// Returns the number of dependencies in the dependency lists of all RT_Infos.
-// This is used when traversing the dependency graph.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::dependency_count ()
-{
-  return this->dependency_count_;
-}
-
-
 #endif /* __GNUC__ */
 
 #endif /* TAO_RECONFIG_SCHEDULER_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index caf527cf57f..72d36523840 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -49,35 +49,7 @@ class TAO_Reconfig_Scheduler :
 {
 public:
 
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
-	                              RtecScheduler::RT_Info*,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_LOCK> RT_INFO_MAP;
-  // Type of map used for O(1) lookup of RT_Infos by their handles.
-
-  typedef ACE_RB_Tree<const char *,
-                      RtecScheduler::RT_Info*,
-                      ACE_Less_Than<const char *>,
-                      ACE_LOCK> RT_INFO_TREE;
-  // Type of tree used for O(log n) lookup of RT_Infos by their names.
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::Preemption_Priority_t,
-                                  RtecScheduler::Config_Info*,
-                                  ACE_Hash<RtecScheduler::Preemption_Priority_t>,
-                                  ACE_Equal_To<RtecScheduler::Preemption_Priority_t>,
-                                  ACE_LOCK> CONFIG_INFO_MAP;
-  // Type of map used for O(1) lookup of Config_Infos by their priorities.
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
-                                  RtecScheduler::Dependency_Set*,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_LOCK> DEPENDENCY_SET_MAP;
-  // Type of map used for O(1) lookup of RT_Info
-  // dependency sets by caller or called handle.
-
-  TAO_Reconfig_Scheduler (int enforce_schedule_stability = 0);
+  TAO_Reconfig_Scheduler ();
   // Default constructor.
 
   TAO_Reconfig_Scheduler (int config_count,
@@ -86,8 +58,7 @@ public:
                           ACE_Scheduler_Factory::POD_RT_Info rt_info[],
                           int dependency_count,
                           ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-                          u_long stability_flags,
-                          int enforce_schedule_stability = 0);
+                          u_long stability_flags);
   // Constructor. Initialize the scheduler from POD_Config_Info, POD_RT_Info,
   // and POD_Dependency arrays, plus schedule stability flags.
 
@@ -226,39 +197,6 @@ public:
   // of scheduled priorities.  All scheduled priorities range from 0
   // to the number returned, inclusive.
 
-  // = Accessors that allow controlled relaxations of encapsulation.
-
-  RECONFIG_SCHED_STRATEGY & sched_strategy ();
-  // Accesses scheduling strategy for the reconfig scheduler.
-
-  CONFIG_INFO_MAP & config_info_map ();
-  // Accesses map for O(1) lookup of Config_Infos by priority level.
-
-  long config_info_count ();
-  // Returns the number of config infos, which is also the number of
-  // assigned priority levels.
-
-  RT_INFO_MAP & rt_info_map ();
-  // Accesses map for O(1) lookup of RT_Infos by handle.
-
-  long rt_info_count ();
-  // Returns the number of registered RT_Infos.
-
-  RT_INFO_TREE & rt_info_tree ();
-  // Accesses tree for O(log n) lookup of RT_Infos by name.
-
-  DEPENDENCY_SET_MAP & calling_dependency_set_map ();
-  // Accesses map for O(1) lookup of RT_Info dependency
-  // set by the caller operation's handle.
-
-  DEPENDENCY_SET_MAP & called_dependency_set_map ();
-  // Accesses map for O(1) lookup of RT_Info dependency
-  // set by the called operation's handle.
-
-  int dependency_count ();
-  // Returns the number of dependencies in the dependency lists of all RT_Infos.
-  // This is used when traversing the dependency graph.
-
 protected:
 
   // @@ TO DO: use a memento to save and restore scheduler state without
@@ -290,6 +228,34 @@ protected:
   };
   // Flags indicating stability conditions of schedule.
 
+  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
+	                              RtecScheduler::RT_Info*,
+                                  ACE_Hash<RtecScheduler::handle_t>,
+                                  ACE_Equal_To<RtecScheduler::handle_t>,
+                                  ACE_LOCK> RT_INFO_MAP;
+  // Type of map used for O(1) lookup of RT_Infos by their handles.
+
+  typedef ACE_RB_Tree<const char *,
+                      RtecScheduler::RT_Info*,
+                      ACE_Less_Than<const char *>,
+                      ACE_LOCK> RT_INFO_TREE;
+  // Type of tree used for O(log n) lookup of RT_Infos by their names.
+
+  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::Preemption_Priority_t,
+                                  RtecScheduler::Config_Info*,
+                                  ACE_Hash<RtecScheduler::Preemption_Priority_t>,
+                                  ACE_Equal_To<RtecScheduler::Preemption_Priority_t>,
+                                  ACE_LOCK> CONFIG_INFO_MAP;
+  // Type of map used for O(1) lookup of Config_Infos by their priorities.
+
+  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
+                                  RtecScheduler::Dependency_Set*,
+                                  ACE_Hash<RtecScheduler::handle_t>,
+                                  ACE_Equal_To<RtecScheduler::handle_t>,
+                                  ACE_LOCK> DEPENDENCY_SET_MAP;
+  // Type of map used for O(1) lookup of RT_Info
+  // dependency sets by caller or called handle.
+
   virtual RtecScheduler::RT_Info * create_i (const char * entry_point,
                                              RtecScheduler::handle_t handle,
                                              CORBA::Environment &_env)
@@ -360,6 +326,11 @@ protected:
   // Traverses dependency graph, assigning a topological ordering.
   // Resets DFS map entries, do DFS traversal, constructs DFS map.
 
+  static int comp_entry_finish_times (const void *first, const void *second);
+  // Helper function to compare the DFS finish times of
+  // two task entries, so qsort orders these in topological
+  // order, with the higher times *first*.
+
   virtual void detect_cycles_i (CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
@@ -392,9 +363,6 @@ protected:
   // Helper method to give an RT_Info some reasonable default values
 
 
-
-  // = Protected class members.
-
   RECONFIG_SCHED_STRATEGY sched_strategy_;
   // Scheduling strategy for the reconfig scheduler.
 
@@ -412,7 +380,7 @@ protected:
   // The number of registered RT_Infos.
 
   RT_INFO_TREE rt_info_tree_;
-  // Tree for O(log n) lookup of RT_Infos by name.
+  // Map for O(1) lookup of RT_Infos by handle.
 
   DEPENDENCY_SET_MAP calling_dependency_set_map_;
   // Map for O(1) lookup of RT_Info dependency
@@ -441,12 +409,6 @@ protected:
   // since the last addition or modification of information, and which
   // parts of the schedule are unstable.
 
-  int enforce_schedule_stability_;
-  // Indicates whether the scheduler should enforce stability by
-  // throwing an exception: otherwise for operations where this
-  // matters, it will simply return a default value if nothing
-  // has been generated.
-
   int dependency_count_;
   // The number of dependencies in the dependency lists of all RT_Infos.
   // This is used when traversing the dependency graph.
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index 555d249505b..75f03baa49d 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -7,7 +7,6 @@
 
 // Constructor.
 TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value,
-                                                int timer_value_usecs,
                                                 const IORS& servers)
   : server_ (servers),
     helper_ (this)
@@ -19,7 +18,7 @@ TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value,
       (&helper_,
        0,
        ACE_Time_Value::zero,
-       ACE_Time_Value(timer_value,timer_value_usecs)) == -1)
+       ACE_Time_Value (timer_value)) == -1)
     ACE_ERROR ((LM_ERROR,
                 "%p\n",
                 "schedule_timer ()"));
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index a33455bde0e..6805e8f844d 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -48,7 +48,6 @@ public:
 
   // = Initialization and termination methods.
   TAO_Time_Service_Clerk (int timer_value,
-                          int timer_value_usecs,
                           const IORS& server);
   // Constructor.
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index b7acb17250a..81d560396ac 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -26,23 +26,10 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_UTO *uto = 0;
 
-  // This is the difference in seconds between
-  // 15th October 1582 and 1st Jan 1970. It needs to be added to the system
-  // time to make the base time as 15th October 1582. The decimal value of
-  // the offset is 1.221929 * 10^10.
-
-#if defined (ACE_LACKS_LONGLONG_T)
-  CORBA::ULongLong TAO_Time_Base_Offset (0xD8539190, 2);
-  // (Lower 32 bits of the offset in hex, Upper 32 bits of the offset in hex)
-#else
-  CORBA::ULongLong TAO_Time_Base_Offset = ACE_UINT64_LITERAL(0x2D8539190);
-#endif
-
   // Return the local time of the system as a UTO.
   ACE_NEW_THROW_EX (uto,
-                    TAO_UTO ((TAO_Time_Base_Offset +
-                              ACE_static_cast(CORBA::ULongLong,
-                                              ACE_OS::gettimeofday ().sec ())) *
+                    TAO_UTO (ACE_static_cast(CORBA::ULongLong,
+                                             ACE_OS::gettimeofday ().sec ()) *
                              ACE_static_cast(ACE_UINT32,
                                              10000000) +
                              ACE_static_cast(CORBA::ULongLong,
@@ -58,6 +45,15 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
 
   return uto->_this ();
 
+  // In case we are using the IR.
+  //   if (this->shutdown_ != 0)
+  //       {
+  //    TAO_ORB_Core_instance ()->orb ()->shutdown ();
+
+  //    ACE_DEBUG ((LM_DEBUG,
+  //                "Shutting down the ORB\n"));
+  //       }
+
 }
 
 // This method returns the current time in a UTO only if the time can
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 2a5760d2407..bbdfa28cc33 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -15,7 +15,7 @@ TAO_Service_Type_Repository (ACE_Lock* lock)
   // kind of lock at all.
   if (this->lock_ == 0)
     ACE_NEW (this->lock_,
-             ACE_Lock_Adapter<ACE_Null_Mutex>);
+             ACE_Lock_Adapter<ACE_Null_Mutex> ());
 }
 
 TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
@@ -25,10 +25,10 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
     ACE_WRITE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
     for (Service_Type_Map_Iterator service_map_iterator (this->type_map_);
-         service_map_iterator.done () == 0;
+         ! service_map_iterator.done ();
          service_map_iterator++)
       {
-        Type_Info *type_info = (*service_map_iterator).int_id_;
+        Type_Info* type_info = (*service_map_iterator).int_id_;
         delete type_info;
       }
   }
@@ -41,7 +41,6 @@ TAO_Service_Type_Repository::incarnation (CORBA::Environment &)
       ACE_THROW_SPEC (())
 {
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num;
-
   if (this->lock_->acquire_read () == -1)
     {
       inc_num = this->incarnation_;
@@ -59,11 +58,11 @@ TAO_Service_Type_Repository::incarnation (CORBA::Environment &)
 
 CosTradingRepos::ServiceTypeRepository::IncarnationNumber
 TAO_Service_Type_Repository::
-add_type (const char *name,
-          const char *if_name,
-          const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-          const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-          CORBA::Environment &ACE_TRY_ENV)
+add_type (const char * name,
+          const char * if_name,
+          const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+          const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
+          CORBA::Environment& ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -80,34 +79,27 @@ add_type (const char *name,
 
   inc_num.low = 0;
   inc_num.high = 0;
-
-  // With exceptions enabled, inc_num isn't used.
-  ACE_UNUSED_ARG (inc_num); 
-
+  ACE_UNUSED_ARG (inc_num); // With exceptions enabled, inc_num isn't used.
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
   ACE_CHECK_RETURN (inc_num);
 
-  // Make sure Type name is valid.
-  if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
+  // make sure Type name is valid
+  if (! TAO_Trader_Base::is_valid_identifier_name (name))
     ACE_THROW_RETURN (CosTrading::IllegalServiceType (name),
                       this->incarnation_);
 
-  // Check if the service type already exists.
+  // check if the service type already exists.
   TAO_String_Hash_Key type_name (name);
   if (this->type_map_.find (type_name) == 0)
     ACE_THROW_RETURN (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists (),
                       this->incarnation_);
 
-  // Make sure all property names are valid and appear only once.
-  this->validate_properties (prop_map,
-                             props,
-                             ACE_TRY_ENV);
+  // make sure all property names are valid and appear only once.
+  this->validate_properties (prop_map, props, ACE_TRY_ENV);
   ACE_CHECK_RETURN (this->incarnation_);
 
-  // Check that all super_types exist, and none are duplicated.
-  this->validate_supertypes (super_map,
-                             super_types,
-                             ACE_TRY_ENV);
+  // check that all super_types exist, and none are duplicated.
+  this->validate_supertypes (super_map, super_types, ACE_TRY_ENV);
   ACE_CHECK_RETURN (this->incarnation_);
 
   // NOTE: I don't really know a way to do this without an Interface
@@ -124,7 +116,7 @@ add_type (const char *name,
     ACE_THROW_RETURN (CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch (),
                       this->incarnation_);
 
-  // Collect and make sure that properties of all supertypes and this
+  // collect and make sure that properties of all supertypes and this
   // type are compatible.  We can use prop_map and super_types_map for
   // the job.
   this->validate_inheritance (prop_map,
@@ -132,7 +124,7 @@ add_type (const char *name,
                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (this->incarnation_);
 
-  // We can now use prop_map to construct a sequence of all properties
+  // we can now use prop_map to construct a sequence of all properties
   // the this type.
   this->update_type_map (name,
                          if_name,
@@ -144,25 +136,25 @@ add_type (const char *name,
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber return_value =
     this->incarnation_;
 
-  // Increment incarnation number.
+  // increment incarnation number
   this->incarnation_.low++;
-
-  // If we wrapped around in lows...
+  // if we wrapped around in lows...
   if (this->incarnation_.low == 0)
     this->incarnation_.high++;
 
   return return_value;
 }
 
+
 void
-TAO_Service_Type_Repository::remove_type (const char *name,
-                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_Service_Type_Repository::remove_type (const char * name,
+                                          CORBA::Environment& ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::HasSubTypes))
 {
-  if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
+  if (! TAO_Trader_Base::is_valid_identifier_name (name))
     ACE_THROW (CosTrading::IllegalServiceType (name));
 
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
@@ -170,67 +162,58 @@ TAO_Service_Type_Repository::remove_type (const char *name,
 
   // Check if the type exists.
   Service_Type_Map::ENTRY* type_entry = 0; ;
-  if (this->type_map_.find (name,
-                            type_entry) == -1)
+  if (this->type_map_.find (name, type_entry) == -1)
     ACE_THROW (CosTrading::UnknownServiceType (name));
 
   // Check if it has any subtypes.
-  Type_Info *type_info = type_entry->int_id_;
+  Type_Info* type_info = type_entry->int_id_;
   if (type_info->has_subtypes_)
     ACE_THROW (CosTradingRepos::ServiceTypeRepository::HasSubTypes (name, ""));
 
-  // Remove the type from the map.
+  // remove the type from the map.
   this->type_map_.unbind (type_entry);
   delete type_info;
 }
 
-CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
+CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq*
 TAO_Service_Type_Repository::
-list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types,
-            CORBA::Environment &ACE_TRY_ENV)
+list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes& which_types,
+            CORBA::Environment& ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong i = 0;
-  CORBA::ULong length = this->type_map_.current_size ();
-  CosTrading::ServiceTypeName *types =
+  CORBA::ULong i = 0,
+    length = this->type_map_.current_size ();
+  CosTrading::ServiceTypeName* types =
     CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq::allocbuf (length);
 
   if (types == 0)
     return 0;
 
-  int all = which_types._d () == CosTradingRepos::ServiceTypeRepository::all;
-
+  int all = (which_types._d () == CosTradingRepos::ServiceTypeRepository::all);
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber num =
     which_types.incarnation ();
 
   for (Service_Type_Map_Iterator itr (this->type_map_);
-       itr.done () == 0;
+       ! itr.done ();
        itr++)
     {
       Type_Info* type_info = (*itr).int_id_;
       const char* type_name = (const char*) (*itr).ext_id_;
 
-      if (all 
-          || num < type_info->type_struct_.incarnation)
+      if (all || num < type_info->type_struct_.incarnation)
         types[i++] = CORBA::string_dup (type_name);
     }
 
-  CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *tmp = 0;
-  
-  ACE_NEW_RETURN (tmp,
-                  CosTradingRepos::ServiceTypeRepository::
-                  ServiceTypeNameSeq (length,
-                                      i,
-                                      types,
-                                      1),
-                  0);
-  return tmp;
+  return new CosTradingRepos::ServiceTypeRepository::
+    ServiceTypeNameSeq (length, i, types, 1);
 }
 
-CosTradingRepos::ServiceTypeRepository::TypeStruct *
+
+
+CosTradingRepos::ServiceTypeRepository::TypeStruct*
 TAO_Service_Type_Repository::
 describe_type (const char * name,
                CORBA::Environment& ACE_TRY_ENV)
@@ -238,10 +221,10 @@ describe_type (const char * name,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
-  if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
+  if (! TAO_Trader_Base::is_valid_identifier_name (name))
     ACE_THROW_RETURN
       (CosTrading::IllegalServiceType (name),
-       (CosTradingRepos::ServiceTypeRepository::TypeStruct *) 0);
+       (CosTradingRepos::ServiceTypeRepository::TypeStruct*) 0);
 
   ACE_READ_GUARD_THROW_EX
     (ACE_Lock,
@@ -250,20 +233,19 @@ describe_type (const char * name,
      CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  // Make sure the type exists.
+  // make sure the type exists.
   TAO_String_Hash_Key type_name (name);
-  Service_Type_Map::ENTRY *type_entry = 0;
-  if (this->type_map_.find (type_name,
-                            type_entry) == -1)
+  Service_Type_Map::ENTRY* type_entry = 0;
+  if (this->type_map_.find (type_name, type_entry) == -1)
     ACE_THROW_RETURN (CosTrading::UnknownServiceType (name),
-                      (CosTradingRepos::ServiceTypeRepository::TypeStruct *) 0);
+                      (CosTradingRepos::ServiceTypeRepository::TypeStruct*) 0);
 
   // Return appropriate information about the type.
-  CosTradingRepos::ServiceTypeRepository::TypeStruct *descr = 0;
+  CosTradingRepos::ServiceTypeRepository::TypeStruct* descr = 0;
   ACE_NEW_RETURN (descr,
                   CosTradingRepos::ServiceTypeRepository::TypeStruct,
                   0);
-  CosTradingRepos::ServiceTypeRepository::TypeStruct &s =
+  CosTradingRepos::ServiceTypeRepository::TypeStruct & s =
     type_entry->int_id_->type_struct_;
 
   descr->if_name = s.if_name;
@@ -280,42 +262,38 @@ describe_type (const char * name,
   return descr;
 }
 
-CosTradingRepos::ServiceTypeRepository::TypeStruct *
+
+CosTradingRepos::ServiceTypeRepository::TypeStruct*
 TAO_Service_Type_Repository::
-fully_describe_type (const char *name,
-                     CORBA::Environment &ACE_TRY_ENV)
+fully_describe_type (const char * name,
+                     CORBA::Environment& ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
-  if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
-    ACE_THROW_RETURN (CosTrading::IllegalServiceType (name),
-                      0);
+  if (! TAO_Trader_Base::is_valid_identifier_name (name))
+    ACE_THROW_RETURN (CosTrading::IllegalServiceType (name), 0);
 
   ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  // Make sure the type exists.
+  // make sure the type exists.
   TAO_String_Hash_Key type_name (name);
-  Service_Type_Map::ENTRY *type_entry = 0;
-  if (this->type_map_.find (type_name,
-                            type_entry) == -1)
-    ACE_THROW_RETURN (CosTrading::UnknownServiceType (name),
-                      0);
+  Service_Type_Map::ENTRY* type_entry = 0;
+  if (this->type_map_.find (type_name, type_entry) == -1)
+    ACE_THROW_RETURN (CosTrading::UnknownServiceType (name), 0);
 
-  // Return appropriate information about the type.
-  CosTradingRepos::ServiceTypeRepository::TypeStruct *descr = 0;
+  // return appropriate information about the type.
+  CosTradingRepos::ServiceTypeRepository::TypeStruct* descr = 0;
   ACE_NEW_RETURN (descr,
                   CosTradingRepos::ServiceTypeRepository::TypeStruct,
                   0);
-  CosTradingRepos::ServiceTypeRepository::TypeStruct &s =
+  CosTradingRepos::ServiceTypeRepository::TypeStruct & s =
     type_entry->int_id_->type_struct_;
 
   // Aggregate the Properties of this type and all its supertypes.
   // Compute the transitive closure of all supertypes.
-  this->fully_describe_type_i (s,
-                               descr->props,
-                               descr->super_types);
+  this->fully_describe_type_i (s, descr->props, descr->super_types);
 
   // We do the explicit copy, since otherwise we'd have excessive
   // properties copying.
@@ -328,28 +306,26 @@ fully_describe_type (const char *name,
 
 void
 TAO_Service_Type_Repository::
-mask_type (const char *name,
-           CORBA::Environment &ACE_TRY_ENV)
+mask_type (const char * name,
+           CORBA::Environment& ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::AlreadyMasked))
 {
-  if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
+  if (! TAO_Trader_Base::is_valid_identifier_name (name))
     ACE_THROW (CosTrading::IllegalServiceType (name));
 
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
-  // Make sure the type exists.
+  // make sure the type exists.
   TAO_String_Hash_Key type_name (name);
-  Service_Type_Map::ENTRY *type_entry = 0;
-  if (this->type_map_.find (type_name,
-                            type_entry) != -1)
+  Service_Type_Map::ENTRY* type_entry = 0;
+  if (this->type_map_.find (type_name, type_entry) != -1)
     ACE_THROW (CosTrading::UnknownServiceType (name));
 
-  // Make sure the type is unmasked.
-  CORBA::Boolean &mask =
-    type_entry->int_id_->type_struct_.masked;
+  // make sure the type is unmasked.
+  CORBA::Boolean& mask = type_entry->int_id_->type_struct_.masked;
 
   if (mask == 1)
     ACE_THROW (CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name));
@@ -357,66 +333,60 @@ mask_type (const char *name,
     mask = 1;
 }
 
+
 void
 TAO_Service_Type_Repository::
-unmask_type (const char *name,
-             CORBA::Environment &ACE_TRY_ENV)
+unmask_type (const char * name,
+             CORBA::Environment& ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
                   CosTradingRepos::ServiceTypeRepository::NotMasked))
 {
-  if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
+  if (! TAO_Trader_Base::is_valid_identifier_name (name))
     ACE_THROW (CosTrading::IllegalServiceType (name));
 
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
-  // Make sure the type exists.
+  // make sure the type exists.
   TAO_String_Hash_Key type_name (name);
-  Service_Type_Map::ENTRY *type_entry = 0;
-  if (this->type_map_.find (type_name,
-                            type_entry) != -1)
+  Service_Type_Map::ENTRY* type_entry = 0;
+  if (this->type_map_.find (type_name, type_entry) != -1)
     ACE_THROW (CosTrading::UnknownServiceType (name));
 
-  // Make sure the type is masked.
-  CORBA::Boolean &mask = type_entry->int_id_->type_struct_.masked;
-
+  // make sure the type is masked.
+  CORBA::Boolean& mask = type_entry->int_id_->type_struct_.masked;
   if (mask == 0)
-    ACE_THROW (CosTradingRepos::ServiceTypeRepository::NotMasked (name));
+    ACE_THROW (CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name));
   else
     mask = 0;
 }
 
 void
 TAO_Service_Type_Repository::
-fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct &type_struct,
-                       CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-                       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
+fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct,
+                       CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+                       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types)
 {
   TAO_String_Queue service_type_queue;
-  this->collect_inheritance_hierarchy (type_struct,
-                                       service_type_queue);
+  this->collect_inheritance_hierarchy (type_struct, service_type_queue);
 
   // Count the total number of properties.
-  CORBA::ULong num_props = 0;
-  CORBA::ULong num_types = service_type_queue.size ();
+  CORBA::ULong num_props = 0,
+    num_types = service_type_queue.size ();
 
   TAO_String_Queue::ITERATOR iterator (service_type_queue);
 
-  for (;
-       iterator.done () == 0;
-       iterator.advance ())
+  for (; ! iterator.done (); iterator.advance ())
     {
-      char **next_type_name = 0;
-      Service_Type_Map::ENTRY *type_entry = 0;
+      char** next_type_name = 0;
+      Service_Type_Map::ENTRY* type_entry = 0;
 
       iterator.next (next_type_name);
-      TAO_String_Hash_Key hash_key (ACE_const_cast (const char *,
-                                                    *next_type_name));
-      this->type_map_.find (hash_key,
-                            type_entry);
+      TAO_String_Hash_Key hash_key (ACE_const_cast (const char*, *next_type_name));
+      this->type_map_.find (hash_key, type_entry);
 
-      CosTradingRepos::ServiceTypeRepository::TypeStruct &tstruct =
+      CosTradingRepos::ServiceTypeRepository::TypeStruct& tstruct =
         type_entry->int_id_->type_struct_;
       num_props += tstruct.props.length ();
     }
@@ -427,36 +397,25 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct
 
   // Copy in all properties.
   int i = 0;
-  CORBA::ULong prop_index = 0;
-  CORBA::ULong type_index = 0;
-
-  for (i = type_struct.props.length () - 1;
-       i >= 0;
-       i--)
+  CORBA::ULong prop_index = 0, type_index = 0;
+  for (i = type_struct.props.length () - 1; i >= 0; i--)
     props[prop_index++] = type_struct.props[i];
 
-  for (iterator.first ();
-       iterator.done () == 0;
-       iterator.advance ())
+  for (iterator.first (); ! iterator.done (); iterator.advance ())
     {
-      char **next_type_name = 0;
-      Service_Type_Map::ENTRY *type_entry = 0;
+      char** next_type_name = 0;
+      Service_Type_Map::ENTRY* type_entry = 0;
 
       iterator.next (next_type_name);
-      TAO_String_Hash_Key hash_key (ACE_const_cast (const char *,
-                                                    *next_type_name));
-      this->type_map_.find (hash_key,
-                            type_entry);
+      TAO_String_Hash_Key hash_key (ACE_const_cast (const char*, *next_type_name));
+      this->type_map_.find (hash_key, type_entry);
 
       // Should never be zero.
       if (type_entry != 0)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct& tstruct =
             type_entry->int_id_->type_struct_;
-
-          for (i = tstruct.props.length () - 1;
-               i >= 0;
-               i--)
+          for (i = tstruct.props.length () - 1; i >= 0; i--)
             props[prop_index++] = tstruct.props[i];
 
           super_types[type_index++] = hash_key.in ();
@@ -466,57 +425,49 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct
 
 void
 TAO_Service_Type_Repository::
-collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::TypeStruct &type_struct,
-                               TAO_String_Queue &target)
+collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct,
+                               TAO_String_Queue& target)
 {
   // Recurse for each super_type
-  for (int i = type_struct.super_types.length () - 1;
-       i >= 0;
-       i--)
+  for (int i = type_struct.super_types.length () - 1; i >= 0; i--)
     {
-      Service_Type_Map::ENTRY *next_type_entry = 0;
+      Service_Type_Map::ENTRY* next_type_entry = 0;
       TAO_String_Hash_Key next_type_name (type_struct.super_types[i]);
 
       if (this->type_map_.find (next_type_name, next_type_entry) != -1)
         {
-          CosTradingRepos::ServiceTypeRepository::TypeStruct &next_type_struct =
-            next_type_entry->int_id_->type_struct_;
+          CosTradingRepos::ServiceTypeRepository::TypeStruct&
+            next_type_struct = next_type_entry->int_id_->type_struct_;
 
-          const char *type_name =
-            type_struct.super_types[i];
-          target.enqueue_tail (ACE_const_cast (char *,
-                                               type_name));
+          const char* type_name = type_struct.super_types[i];
+          target.enqueue_tail (ACE_const_cast (char*, type_name));
 
-          this->collect_inheritance_hierarchy (next_type_struct,
-                                               target);
+          this->collect_inheritance_hierarchy (next_type_struct, target);
         }
     }
 }
 
+
 void
 TAO_Service_Type_Repository::
-validate_properties (Prop_Map &prop_map,
-                     const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-                     CORBA::Environment &ACE_TRY_ENV)
+validate_properties (Prop_Map& prop_map,
+                     const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+                     CORBA::Environment& ACE_TRY_ENV)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
 {
-  for (CORBA::ULong i = 0;
-       i < props.length ();
-       i++)
+  for (CORBA::ULong i = 0; i < props.length (); i++)
     {
-      const char *n = props[i].name;
-      if (TAO_Trader_Base::is_valid_identifier_name (n) == 0)
+      const char* n = props[i].name;
+      if (! TAO_Trader_Base::is_valid_identifier_name (n))
         ACE_THROW (CosTrading::IllegalPropertyName (n));
       else
         {
           TAO_String_Hash_Key prop_name (n);
-          CosTradingRepos::ServiceTypeRepository::PropStruct *prop_val =
-            ACE_const_cast (CosTradingRepos::ServiceTypeRepository::PropStruct *,
-                            &props[i]);
+          CosTradingRepos::ServiceTypeRepository::PropStruct* prop_val =
+            (CosTradingRepos::ServiceTypeRepository::PropStruct*) &props[i];
 
-          if (prop_map.bind (prop_name,
-                             prop_val) == 1)
+          if (prop_map.bind (prop_name, prop_val) == 1)
             ACE_THROW (CosTrading::DuplicatePropertyName (n));
         }
     }
@@ -524,34 +475,28 @@ validate_properties (Prop_Map &prop_map,
 
 void
 TAO_Service_Type_Repository::
-validate_supertypes (Service_Type_Map &super_map,
-                     const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-                     CORBA::Environment &ACE_TRY_ENV)
+validate_supertypes (Service_Type_Map& super_map,
+                     const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
+                     CORBA::Environment& ACE_TRY_ENV)
   ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName))
+                  CosTrading::UnknownServiceType,
+                  CosTrading::DuplicatePropertyName))
 {
-  for (CORBA::ULong i = 0;
-       i < super_types.length ();
-       i++)
+  for (CORBA::ULong i = 0; i < super_types.length (); i++)
     {
-      const char *type =
-        super_types[i];
+      const char* type =  super_types[i];
 
-      if (TAO_Trader_Base::is_valid_identifier_name (type) == 0)
+      if (! TAO_Trader_Base::is_valid_identifier_name (type))
         ACE_THROW (CosTrading::IllegalServiceType (type));
       else
         {
           TAO_String_Hash_Key s_type (type);
-          Service_Type_Map::ENTRY *type_entry = 0;
-
-          if (this->type_map_.find (s_type,
-                                    type_entry) == -1)
+          Service_Type_Map::ENTRY* type_entry = 0;
+          if (this->type_map_.find (s_type, type_entry) == -1)
             ACE_THROW (CosTrading::UnknownServiceType (type));
           else
             {
-              if (super_map.bind (s_type,
-                                  type_entry->int_id_) == 1)
+              if (super_map.bind (s_type, type_entry->int_id_) == 1)
                 ACE_THROW (CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName (type));
             }
         }
@@ -560,59 +505,54 @@ validate_supertypes (Service_Type_Map &super_map,
 
 void
 TAO_Service_Type_Repository::
-validate_inheritance (Prop_Map &prop_map,
-                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-                      CORBA::Environment &ACE_TRY_ENV)
+validate_inheritance (Prop_Map& prop_map,
+                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
+                      CORBA::Environment& ACE_TRY_ENV)
   ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition))
 {
   CORBA::ULong num_super_types = super_types.length ();
 
-  for (CORBA::ULong i = 0;
-       i < num_super_types;
-       i++)
+  for (CORBA::ULong i = 0; i < num_super_types; i++)
     {
-      Service_Type_Map::ENTRY *super_type_entry = 0;
+      Service_Type_Map::ENTRY* super_type_entry = 0;
       TAO_String_Hash_Key super_type (super_types[i]);
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq place_holder;
       CosTradingRepos::ServiceTypeRepository::PropStructSeq super_props;
 
       this->type_map_.find (super_type, super_type_entry);
 
-      // Super_type_entry should never be zero.
+      // super_type_entry should never be zero.
       if (super_type_entry != 0)
-        this->fully_describe_type_i (super_type_entry->int_id_->type_struct_,
-                                     super_props,
-                                     place_holder);
+        {
+          this->fully_describe_type_i (super_type_entry->int_id_->type_struct_,
+                                       super_props,
+                                       place_holder);
+        }
       else
         continue;
 
       CORBA::ULong num_props = super_props.length ();
-
-      for (CORBA::ULong j = 0;
-           j < num_props;
-           j++)
+      for (CORBA::ULong j = 0; j < num_props; j++)
         {
-          Prop_Map::ENTRY *existing_prop = 0;
+          Prop_Map::ENTRY* existing_prop = 0;
           TAO_String_Hash_Key prop_name (super_props[j].name);
 
-          if (prop_map.bind (prop_name,
-                             &super_props[j],
-                             existing_prop) == 1)
+          if (prop_map.bind (prop_name, &super_props[j], existing_prop) == 1)
             {
-              // If already there, check that it is compatible with
+              // if already there, check that it is compatible with
               // properties of other types. Value Types have to be the
               // same.
-              const CosTradingRepos::ServiceTypeRepository::PropStruct &property_in_map =
-                *existing_prop->int_id_;
+              const CosTradingRepos::ServiceTypeRepository::PropStruct&
+                property_in_map = *existing_prop->int_id_;
+
 
               CORBA::TypeCode_ptr prop_type = property_in_map.value_type.in ();
               int compare = 0;
               ACE_TRY
                 {
-                  compare =
-                    super_props[j].value_type->equal (prop_type,
-                                                      ACE_TRY_ENV);
+                  compare = super_props[j].value_type->equal (prop_type, ACE_TRY_ENV);
                   ACE_TRY_CHECK;
+
                 }
               ACE_CATCHANY
                 {
@@ -625,8 +565,7 @@ validate_inheritance (Prop_Map &prop_map,
               ACE_ENDTRY;
               ACE_CHECK;
 
-              if (compare == 0
-                  || super_props[j].mode > property_in_map.mode)
+              if (! compare || super_props[j].mode > property_in_map.mode)
                 ACE_THROW (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition
                            (super_props[j].name,
                             super_props[j],
@@ -639,28 +578,27 @@ validate_inheritance (Prop_Map &prop_map,
 
 void
 TAO_Service_Type_Repository::
-update_type_map (const char *name,
-                 const char *if_name,
-                 const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-                 const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
+update_type_map (const char* name,
+                 const char * if_name,
+                 const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+                 const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
                  Prop_Map &,
-                 Service_Type_Map &super_map)
+                 Service_Type_Map& super_map)
 {
-  // Update entries for all supertypes to include this type as a
-  // subtype.  we can use the super_types_map we have constructed.
+  // update entries for all supertypes to include this type as a subtype.
+  // we can use the super_types_map we have constructed.
 
   for (Service_Type_Map_Iterator super_map_iterator (super_map);
-       super_map_iterator.done () == 0;
+       ! super_map_iterator.done ();
        super_map_iterator++)
     {
-      Type_Info *super_type_info =
-        (*super_map_iterator).int_id_;
+      Type_Info* super_type_info = (*super_map_iterator).int_id_;
       super_type_info->has_subtypes_ = 0;
     }
 
-  // All parameters are valid, create an entry for this service type
+  // all parameters are valid, create an entry for this service type
   // in the this->type_map_.
-  Type_Info *type = 0;
+  Type_Info* type = 0;
   ACE_NEW (type,
            Type_Info);
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index c4e6139ad80..3583056e222 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -254,7 +254,7 @@ public:
                             CORBA::Environment &)
     ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+                     CosTrading::DuplicatePropertyName));
   // Confirm that the each super type exists, and cram them into super_map.
 
   void validate_inheritance (Prop_Map &prop_map,
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
index 50eb20ce4cc..180e78f38e5 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

 

-CFG=ORB Services DLL - Win32 MFC Debug

+CFG=ORB Services DLL - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,7 +14,7 @@ CFG=ORB Services DLL - Win32 MFC Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "orbsvcs.mak" CFG="ORB Services DLL - Win32 MFC Debug"

+!MESSAGE NMAKE /f "orbsvcs.mak" CFG="ORB Services DLL - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -22,8 +22,6 @@ CFG=ORB Services DLL - Win32 MFC Debug
 !MESSAGE "ORB Services DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "ORB Services DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE "ORB Services DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "ORB Services DLL - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ORB Services DLL - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

@@ -151,70 +149,6 @@ LINK32=link.exe
 # ADD BASE LINK32 TAOd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"orbsvcsd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 # ADD LINK32 TAOd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"orbsvcsd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "ORB_Services_DLL___Win32_MFC_Debug"

-# PROP BASE Intermediate_Dir "ORB_Services_DLL___Win32_MFC_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\MFC_Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /FD /c

-# SUBTRACT BASE CPP /WX /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c

-# SUBTRACT CPP /WX /YX

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 TAOd.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\bin\orbsvcsd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 TAOmfcd.lib acemfcd.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\bin\orbsvcsmfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "ORB_Services_DLL___Win32_MFC_Release"

-# PROP BASE Intermediate_Dir "ORB_Services_DLL___Win32_MFC_Release"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\MFC_Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c

-# SUBTRACT CPP /YX

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\bin\orbsvcs.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 acemfc.lib TAOmfc.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\bin\orbsvcsmfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

 !ENDIF 

 

 # Begin Target

@@ -223,8 +157,6 @@ LINK32=link.exe
 # Name "ORB Services DLL - Win32 Debug"

 # Name "ORB Services DLL - Win32 Alpha Release"

 # Name "ORB Services DLL - Win32 Alpha Debug"

-# Name "ORB Services DLL - Win32 MFC Debug"

-# Name "ORB Services DLL - Win32 MFC Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

@@ -240,10 +172,6 @@ SOURCE=.\AV\AVStreams_i.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -259,10 +187,6 @@ SOURCE=.\AVStreamsC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -278,10 +202,6 @@ SOURCE=.\AVStreamsS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -297,10 +217,6 @@ SOURCE=.\Event\BCU.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -316,10 +232,6 @@ SOURCE=.\Sched\Config_Scheduler.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -335,10 +247,6 @@ SOURCE=.\Trader\Constraint_Interpreter.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -354,10 +262,6 @@ SOURCE=.\Trader\Constraint_l.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -373,10 +277,6 @@ SOURCE=.\Trader\Constraint_Nodes.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -392,10 +292,6 @@ SOURCE=.\Trader\Constraint_Visitors.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -411,10 +307,6 @@ SOURCE=.\Trader\Constraint_y.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -430,10 +322,6 @@ SOURCE=.\CosEvent\ConsumerAdmin_i.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -449,10 +337,6 @@ SOURCE=.\CosEvent_Utilities.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -468,10 +352,6 @@ SOURCE=.\CosEventChannelAdminC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -487,10 +367,6 @@ SOURCE=.\CosEventChannelAdminS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -506,10 +382,6 @@ SOURCE=.\CosEventCommC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -525,10 +397,6 @@ SOURCE=.\CosEventCommS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -544,10 +412,6 @@ SOURCE=.\CosLifeCycleC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -563,10 +427,6 @@ SOURCE=.\CosLifeCycleS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -582,10 +442,6 @@ SOURCE=.\CosNamingC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -601,10 +457,6 @@ SOURCE=.\CosNamingS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -620,10 +472,6 @@ SOURCE=.\Property\CosPropertyService_i.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -639,10 +487,6 @@ SOURCE=.\CosPropertyServiceC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -658,10 +502,6 @@ SOURCE=.\CosPropertyServiceS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -677,10 +517,6 @@ SOURCE=.\CosTradingC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -696,10 +532,6 @@ SOURCE=.\CosTradingDynamicC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -715,10 +547,6 @@ SOURCE=.\CosTradingDynamicS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -734,10 +562,6 @@ SOURCE=.\CosTradingReposC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -753,10 +577,6 @@ SOURCE=.\CosTradingReposS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -772,10 +592,6 @@ SOURCE=.\CosTradingS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -791,10 +607,6 @@ SOURCE=.\Event\Dispatching_Modules.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -810,10 +622,6 @@ SOURCE=.\Sched\DynSched.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -829,10 +637,6 @@ SOURCE=.\Event\EC_Basic_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -848,10 +652,6 @@ SOURCE=.\Event\EC_Basic_Filter_Builder.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -867,10 +667,6 @@ SOURCE=.\Event\EC_Busy_Lock.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -886,10 +682,6 @@ SOURCE=.\Event\EC_Conjunction_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -905,10 +697,6 @@ SOURCE=.\Event\EC_ConsumerAdmin.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -924,10 +712,6 @@ SOURCE=.\Event\EC_Default_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -943,10 +727,6 @@ SOURCE=.\Event\EC_Disjunction_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -962,10 +742,6 @@ SOURCE=.\Event\EC_Dispatching.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -981,10 +757,6 @@ SOURCE=.\Event\EC_Dispatching_Task.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1000,10 +772,6 @@ SOURCE=.\Event\EC_Event_Channel.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1019,10 +787,6 @@ SOURCE=.\Event\EC_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1038,10 +802,6 @@ SOURCE=.\Event\EC_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1057,10 +817,6 @@ SOURCE=.\Event\EC_Filter_Builder.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1076,10 +832,6 @@ SOURCE=.\Event\EC_Gateway.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1095,10 +847,6 @@ SOURCE=.\Event\EC_Gateway_UDP.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1114,10 +862,6 @@ SOURCE=.\Event\EC_MT_Dispatching.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1133,10 +877,6 @@ SOURCE=.\Event\EC_Null_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1152,10 +892,6 @@ SOURCE=.\Event\EC_Null_Scheduling.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1171,10 +907,6 @@ SOURCE=.\Event\EC_ObserverStrategy.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1190,10 +922,6 @@ SOURCE=.\Event\EC_Per_Supplier_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1209,10 +937,6 @@ SOURCE=.\Event\EC_Priority_Dispatching.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1228,10 +952,6 @@ SOURCE=.\Event\EC_Priority_Scheduling.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1247,10 +967,6 @@ SOURCE=.\Event\EC_ProxyConsumer.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1266,10 +982,6 @@ SOURCE=.\Event\EC_ProxyPushSupplier_Set.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1285,10 +997,6 @@ SOURCE=.\Event\EC_ProxySupplier.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1304,10 +1012,6 @@ SOURCE=.\Event\EC_QOS_Info.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1323,10 +1027,6 @@ SOURCE=.\Event\EC_Reactive_Timeout_Generator.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1342,10 +1042,6 @@ SOURCE=.\Event\EC_Sched_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1361,10 +1057,6 @@ SOURCE=.\Event\EC_Sched_Filter_Builder.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1380,10 +1072,6 @@ SOURCE=.\Event\EC_Scheduling_Strategy.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1399,10 +1087,6 @@ SOURCE=.\Event\EC_Supplier_Filter_Builder.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1418,10 +1102,6 @@ SOURCE=.\Event\EC_SupplierAdmin.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1437,10 +1117,6 @@ SOURCE=.\Event\EC_SupplierFiltering.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1456,10 +1132,6 @@ SOURCE=.\Event\EC_Timeout_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1475,10 +1147,6 @@ SOURCE=.\Event\EC_Timeout_Generator.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1494,10 +1162,6 @@ SOURCE=.\Event\EC_Trivial_Supplier_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1513,10 +1177,6 @@ SOURCE=.\Event\EC_Type_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1532,10 +1192,6 @@ SOURCE=.\Event\EC_UDP_Admin.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1551,10 +1207,6 @@ SOURCE=.\AV\Endpoint_Strategy.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1570,10 +1222,6 @@ SOURCE=.\Naming\Entries.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1589,10 +1237,6 @@ SOURCE=.\Event\Event_Channel.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1608,10 +1252,6 @@ SOURCE=.\Event\Event_Manip.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1627,10 +1267,6 @@ SOURCE=.\Event_Utilities.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1646,10 +1282,6 @@ SOURCE=.\CosEvent\EventChannel_i.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1665,10 +1297,6 @@ SOURCE=.\Naming\Hash_Naming_Context.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1684,10 +1312,6 @@ SOURCE=.\ImplRepoC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1703,10 +1327,6 @@ SOURCE=.\ImplRepoS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1722,10 +1342,6 @@ SOURCE=.\IOR_Multicast.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1741,10 +1357,6 @@ SOURCE=.\IR_Helper.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1760,10 +1372,6 @@ SOURCE=.\LifeCycleServiceC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1779,10 +1387,6 @@ SOURCE=.\LifeCycleServiceS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1798,10 +1402,6 @@ SOURCE=.\Event\Local_ESTypes.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1817,10 +1417,6 @@ SOURCE=.\Event\Memory_Pools.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1836,10 +1432,6 @@ SOURCE=.\Event\Module_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1855,10 +1447,6 @@ SOURCE=.\Naming\Naming_Context.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1874,10 +1462,6 @@ SOURCE=.\Naming\Naming_Utils.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1893,10 +1477,6 @@ SOURCE=.\Null_MediaCtrlC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1912,10 +1492,6 @@ SOURCE=.\Null_MediaCtrlS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1931,10 +1507,6 @@ SOURCE=.\Trader\Offer_Iterators.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1950,10 +1522,6 @@ SOURCE=.\Naming\Persistent_Context_Index.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1969,10 +1537,6 @@ SOURCE=.\Naming\Persistent_Entries.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1988,10 +1552,6 @@ SOURCE=.\Naming\Persistent_Naming_Context.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2007,10 +1567,6 @@ SOURCE=.\CosEvent\ProxyPushConsumer_i.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2026,10 +1582,6 @@ SOURCE=.\CosEvent\ProxyPushSupplier_i.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2045,10 +1597,6 @@ SOURCE=.\Event\ReactorTask.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2064,10 +1612,6 @@ SOURCE=.\Sched\Reconfig_Sched_Utils.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2083,10 +1627,6 @@ SOURCE=.\Sched\Reconfig_Scheduler.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2102,10 +1642,6 @@ SOURCE=.\Event\RT_Task.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2121,10 +1657,6 @@ SOURCE=.\RtecEventChannelAdminC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2140,10 +1672,6 @@ SOURCE=.\RtecEventChannelAdminS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2159,10 +1687,6 @@ SOURCE=.\RtecEventCommC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2178,10 +1702,6 @@ SOURCE=.\RtecEventCommS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2197,10 +1717,6 @@ SOURCE=.\RtecSchedulerC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2216,10 +1732,6 @@ SOURCE=.\RtecSchedulerS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2235,10 +1747,6 @@ SOURCE=.\RtecUDPAdminC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2254,10 +1762,6 @@ SOURCE=.\RtecUDPAdminS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2273,10 +1777,6 @@ SOURCE=.\Runtime_Scheduler.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2292,10 +1792,6 @@ SOURCE=.\Sched\SchedEntry.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2311,10 +1807,6 @@ SOURCE=.\Sched\Scheduler.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2330,10 +1822,6 @@ SOURCE=.\Scheduler_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2349,10 +1837,6 @@ SOURCE=.\Sched\Scheduler_Generic.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2368,10 +1852,6 @@ SOURCE=.\Scheduler_Utilities.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2387,10 +1867,6 @@ SOURCE=.\Trader\Service_Type_Repository.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2406,10 +1882,6 @@ SOURCE=.\AV\sfp.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2425,10 +1897,6 @@ SOURCE=.\sfpC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2444,10 +1912,6 @@ SOURCE=.\sfpS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2463,10 +1927,6 @@ SOURCE=.\Sched\Strategy_Scheduler.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2482,10 +1942,6 @@ SOURCE=.\CosEvent\SupplierAdmin_i.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2501,10 +1957,6 @@ SOURCE=.\Time\TAO_Time_Service_Clerk.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2520,10 +1972,6 @@ SOURCE=.\Time\TAO_Time_Service_Server.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2539,10 +1987,6 @@ SOURCE=.\Time\TAO_TIO.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2558,10 +2002,6 @@ SOURCE=.\Time\TAO_UTO.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2577,10 +2017,6 @@ SOURCE=.\Time_Utilities.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2596,10 +2032,6 @@ SOURCE=.\TimeBaseC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2615,10 +2047,6 @@ SOURCE=.\TimeBaseS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2634,10 +2062,6 @@ SOURCE=.\Time\Timer_Helper.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2653,10 +2077,6 @@ SOURCE=.\Event\Timer_Module.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2672,10 +2092,6 @@ SOURCE=.\TimeServiceC.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2691,10 +2107,6 @@ SOURCE=.\TimeServiceS.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2710,10 +2122,6 @@ SOURCE=.\Trader\Trader.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2729,10 +2137,6 @@ SOURCE=.\Trader\Trader_Utils.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2748,10 +2152,6 @@ SOURCE=.\Naming\Transient_Naming_Context.cpp
 

 !ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -3600,7 +3000,7 @@ InputPath=.\AVStreams.idl
 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3639,7 +3039,7 @@ InputPath=.\AVStreams.idl
 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3678,7 +3078,7 @@ InputPath=.\AVStreams.idl
 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3717,7 +3117,7 @@ InputPath=.\AVStreams.idl
 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3747,16 +3147,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -3773,7 +3163,7 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3812,7 +3202,7 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3851,7 +3241,7 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3890,7 +3280,7 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3920,16 +3310,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -3946,7 +3326,7 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3985,7 +3365,7 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4024,7 +3404,7 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4063,7 +3443,7 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4093,16 +3473,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -4119,7 +3489,7 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4158,7 +3528,7 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4197,7 +3567,7 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4236,7 +3606,7 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4266,16 +3636,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -4292,7 +3652,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4331,7 +3691,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4370,7 +3730,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4409,7 +3769,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4439,16 +3799,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -4465,7 +3815,7 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4504,7 +3854,7 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4543,7 +3893,7 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4582,7 +3932,7 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4612,16 +3962,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -4638,7 +3978,7 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4677,7 +4017,7 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4716,7 +4056,7 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4755,7 +4095,7 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4785,16 +4125,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -4811,7 +4141,7 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4850,7 +4180,7 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4889,7 +4219,7 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4928,7 +4258,7 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4958,16 +4288,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -4984,7 +4304,7 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5023,7 +4343,7 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5062,7 +4382,7 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5101,7 +4421,7 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5131,16 +4451,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -5157,7 +4467,7 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5196,7 +4506,7 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5235,7 +4545,7 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5274,7 +4584,7 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5304,16 +4614,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -5330,7 +4630,7 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5369,7 +4669,7 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5408,7 +4708,7 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5447,7 +4747,7 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5477,16 +4777,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -5503,7 +4793,7 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5542,7 +4832,7 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5581,7 +4871,7 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5620,7 +4910,7 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5650,16 +4940,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -5676,7 +4956,7 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5715,7 +4995,7 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5754,7 +5034,7 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5793,7 +5073,7 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5823,16 +5103,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -5849,7 +5119,7 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5888,7 +5158,7 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5927,7 +5197,7 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5966,7 +5236,7 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5996,16 +5266,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -6022,7 +5282,7 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6061,7 +5321,7 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6100,7 +5360,7 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6139,7 +5399,7 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6169,16 +5429,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -6195,7 +5445,7 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6234,7 +5484,7 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6273,7 +5523,7 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6312,7 +5562,7 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6342,16 +5592,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -6368,7 +5608,7 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6407,7 +5647,7 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6446,7 +5686,7 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6485,7 +5725,7 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6515,16 +5755,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -6541,7 +5771,7 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6580,7 +5810,7 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6619,7 +5849,7 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6658,7 +5888,7 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6688,16 +5918,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -6714,7 +5934,7 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6753,7 +5973,7 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6792,7 +6012,7 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6831,7 +6051,7 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6861,16 +6081,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-

 !ENDIF 

 

 # End Source File

@@ -6881,431 +6091,67 @@ BuildCmds= \
 # Begin Source File

 

 SOURCE=.\AV\AVStreams_i_T.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Property\CosPropertyService_i_T.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\CosPropertyServiceS_T.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\CosTradingDynamicS_T.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\CosTradingReposS_T.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\CosTradingS_T.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\AV\Endpoint_Strategy_T.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\ImplRepoS_T.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trader\Offer_Database.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trader\Offer_Iterators_T.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TimeServiceS_T.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trader\Trader_Interfaces.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trader\Trader_T.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # End Group

 # End Target

diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.rc b/TAO/orbsvcs/orbsvcs/orbsvcs.rc
deleted file mode 100644
index 9dcfda5d6d4..00000000000
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\..\tao\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "ORBSVCS\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "ORBSVCSDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "ORBSVCS.DLL\0"
-            VALUE "ProductName", "ORBSVCS\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
index 81801d8569d..9877b4b4abf 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
@@ -1357,7 +1357,7 @@ InputPath=.\AVStreams.idl
 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1396,7 +1396,7 @@ InputPath=.\AVStreams.idl
 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1442,7 +1442,7 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1481,7 +1481,7 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1527,7 +1527,7 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1566,7 +1566,7 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1612,7 +1612,7 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1651,7 +1651,7 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1697,7 +1697,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1736,7 +1736,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1782,7 +1782,7 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1821,7 +1821,7 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1867,7 +1867,7 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1906,7 +1906,7 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1952,7 +1952,7 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1991,7 +1991,7 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2037,7 +2037,7 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2076,7 +2076,7 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2122,7 +2122,7 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2161,7 +2161,7 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2207,7 +2207,7 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2246,7 +2246,7 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2292,7 +2292,7 @@ InputPath=.\Logger.idl
 InputName=Logger

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2331,7 +2331,7 @@ InputPath=.\Logger.idl
 InputName=Logger

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2377,7 +2377,7 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2416,7 +2416,7 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2462,7 +2462,7 @@ InputPath=.\Ping.idl
 InputName=Ping

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2501,7 +2501,7 @@ InputPath=.\Ping.idl
 InputName=Ping

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2547,7 +2547,7 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2586,7 +2586,7 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2632,7 +2632,7 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2671,7 +2671,7 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2717,7 +2717,7 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2756,7 +2756,7 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2802,7 +2802,7 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2841,7 +2841,7 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2887,7 +2887,7 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2926,7 +2926,7 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2972,7 +2972,7 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3011,7 +3011,7 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3057,7 +3057,7 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../   -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3096,7 +3096,7 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -I../../tao -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
index be2257347f3..b871a5f98e0 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
@@ -15,6 +15,8 @@ SERVER_OBJS = server.o child.o
 CLIENT_OBJS = client.o
 CHILD_PROCESS_OBJS = child.o child_process.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
 endif
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
index 02fc4cf4b8e..457b56fefa7 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(benchmark, client, "$Id$")
 Client_StreamEndPoint::Client_StreamEndPoint (void)
 {
 }
-
+ 
 
 int
 Client_StreamEndPoint::handle_open (void)
@@ -47,7 +47,7 @@ Client_StreamEndPoint::handle_postconnect (AVStreams::flowSpec& /* server_spec *
 
 int
 Client_StreamEndPoint::handle_start (const AVStreams::flowSpec &/* the_spec */,
-                                     CORBA::Environment &/* env */)
+                                     CORBA::Environment &/* env */) 
 
 {
   return -1;
@@ -55,7 +55,7 @@ Client_StreamEndPoint::handle_start (const AVStreams::flowSpec &/* the_spec */,
 
 int
 Client_StreamEndPoint::handle_stop (const AVStreams::flowSpec &/* the_spec */,
-                                    CORBA::Environment &/* env */)
+                                    CORBA::Environment &/* env */) 
 
 {
   return -1;
@@ -63,7 +63,7 @@ Client_StreamEndPoint::handle_stop (const AVStreams::flowSpec &/* the_spec */,
 
 int
 Client_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &/* the_spec */,
-                                       CORBA::Environment &/* env */)
+                                       CORBA::Environment &/* env */) 
 
 {
   return -1;
@@ -95,7 +95,7 @@ CORBA::Boolean
 ttcp_Client_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &the_spec)
 {
   // listen for the tcp socket.
-
+  
   ACE_INET_Addr tcp_addr;
 
   //  tcp_addr.set (TCP_PORT,"mambo-atm.cs.wustl.edu");
@@ -117,7 +117,7 @@ ttcp_Client_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &the_spec)
              local_addr.get_port_number ());
   the_spec.length (1);
   the_spec [0] = CORBA::string_dup (client_address_string);
-
+  
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) client flow spec is %s\n",
               client_address_string));
@@ -194,7 +194,7 @@ Globals::parse_args (int argc,
         this->thread_count_ = ACE_OS::atoi (opts.optarg);
         break;
       case 's':
-        // use ttcp strategy.
+        // use ttcp strategy.        
         this->strategy_ = TTCP_REACTIVE;
         break;
       case '?':
@@ -212,7 +212,7 @@ Client::svc (void)
   // Now start pumping data.
   ACE_High_Res_Timer timer;
   ACE_Time_Value tv1,tv2;
-
+  
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Thread created\n"));
 
@@ -266,13 +266,13 @@ Client::svc (void)
       ACE_TRY_CHECK;
 
       if (this->bind_to_server () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACE_ERROR_RETURN ((LM_ERROR, 
                            "(%P|%t) Error binding to the naming service\n"),
                           -1);
-
+      
       // wait for the other clients to finish binding
       GLOBALS::instance ()->barrier_->wait ();
-
+      
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) All threads finished, starting tests.\n"));
 
       ACE_Time_Value tv (0);
@@ -297,16 +297,16 @@ Client::svc (void)
       tv1.dump ();
       ACE_DEBUG ((LM_DEBUG,"(%P|%t)time taken for stream setup is %ld \n",
                   time_taken ));
-
+      
 #if !defined (ACE_LACKS_SOCKET_BUFSIZ)
       int sndbufsize = ACE_DEFAULT_MAX_SOCKET_BUFSIZ;
       int rcvbufsize = ACE_DEFAULT_MAX_SOCKET_BUFSIZ;
-
+      
       int result;
       result = this->stream_.set_option (SOL_SOCKET,
-                                         SO_SNDBUF,
-                                         (void *) &sndbufsize,
-                                         sizeof (sndbufsize));
+					 SO_SNDBUF,
+					 (void *) &sndbufsize,
+					 sizeof (sndbufsize));
       if ((result == -1) && (errno != ENOTSUP))
         ACE_ERROR_RETURN ((LM_ERROR,"set_option failed for sndbufsize:%p\n",""),-1);
       result = this->stream_.set_option (SOL_SOCKET,
@@ -319,25 +319,25 @@ Client::svc (void)
 #if defined (TCP_NODELAY)
       int one = 1;
       result = this->stream_.set_option (SOL_SOCKET,
-                                         TCP_NODELAY,
-                                         (char *)& one,
-                                         sizeof (one));
+					 TCP_NODELAY,
+					 (char *)& one,
+					 sizeof (one));
       if (result == -1)
         ACE_ERROR_RETURN ((LM_ERROR,"set_option failed TCP_NODELAY:%p\n",""),-1);
 #endif
 
       char *buffer;
       long buffer_siz = GLOBALS::instance ()->block_size_*1024;
-
+      
       ACE_NEW_RETURN (buffer,
                       char [buffer_siz],
                       -1);
       long number = 64 *1024/(GLOBALS::instance ()->block_size_);
       timer.start ();
       for (int i=0;i<number;i++)
-        {
+	{
           this->stream_.send_n (buffer,buffer_siz);
-        }
+	}
       timer.stop ();
       timer.elapsed_time (tv2);
       double total_time = tv2.sec ()+tv2.usec ()/1000000.0;
@@ -354,7 +354,7 @@ Client::svc (void)
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
+  
   return 0;
 }
 
@@ -365,25 +365,25 @@ Client::bind_to_server (void)
   ACE_TRY
     {
       /*
-        CORBA::Object_var naming_obj =
-        this->orb_manager_.orb ()->resolve_initial_references ("NameService");
-        if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-        " (%P|%t) Unable to resolve the Name Service.\n"),
-        -1);
-        CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-        ACE_TRY_ENV);
-        ACE_TRY_CHECK;
+	CORBA::Object_var naming_obj =
+	this->orb_manager_.orb ()->resolve_initial_references ("NameService");
+	if (CORBA::is_nil (naming_obj.in ()))
+	ACE_ERROR_RETURN ((LM_ERROR,
+	" (%P|%t) Unable to resolve the Name Service.\n"),
+	-1);
+	CosNaming::NamingContext_var naming_context =
+	CosNaming::NamingContext::_narrow (naming_obj.in (),
+	ACE_TRY_ENV);
+	ACE_TRY_CHECK;
       */
 
       // Initialize the naming services
       if (my_name_client_.init (this->orb_manager_.orb ()) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
-                          -1);
-
+	ACE_ERROR_RETURN ((LM_ERROR,
+			   " (%P|%t) Unable to initialize "
+			   "the TAO_Naming_Client. \n"),
+			  -1);
+      
       CosNaming::Name server_mmdevice_name (1);
 
       server_mmdevice_name.length (1);
@@ -432,7 +432,7 @@ Client::establish_stream (void)
          the_qos.inout (),
          the_flows.in (),
          ACE_TRY_ENV);
-
+      
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -471,7 +471,7 @@ ttcp_Endpoint_Reactive_Strategy_A::make_stream_endpoint (ttcp_Client_StreamEndPo
 
 int
 main (int argc, char **argv)
-{
+{  
 
   GLOBALS::instance ()->thread_count_ = 1;
   // Preliminary argument processing.
@@ -494,7 +494,7 @@ main (int argc, char **argv)
                       -1);
 
       if (client->activate (THR_BOUND) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACE_ERROR_RETURN ((LM_ERROR, 
                            "(%P|%t) Error in activate: %p",
                            "activate"),
                           -1);
@@ -510,14 +510,18 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Client_StreamEndPoint,TAO_VDev,
 template class TAO_AV_Endpoint_Reactive_Strategy_A<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
 template class TAO_AV_Endpoint_Reactive_Strategy_A<Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
 template class ACE_Acceptor <ttcp_Client_StreamEndPoint,ACE_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+template class ACE_Task<ACE_SYNCH>;
 template class ACE_Condition<ACE_SYNCH_MUTEX> ;
 template class ACE_Singleton<Globals,ACE_SYNCH_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> 
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate ACE_Acceptor <ttcp_Client_StreamEndPoint,ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Condition<ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton <Globals,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+#pragma instantiate ACE_Task<ACE_SYNCH>
+#pragma instantiate ACE_Condition<ACE_SYNCH_MUTEX> 
+#pragma instantiate ACE_Singleton <Globals,ACE_SYNCH_MUTEX> 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
index a0c9e68d9c4..13aee01facd 100755
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
@@ -70,11 +70,11 @@ $SV->Terminate (); if ($SV->TimedWait (5) == -1) {
   $NS->Kill (); $NS->TimedWait (1);
   exit 1;
 }
-
+  
 $NS->Terminate (); if ($NS->TimedWait (5) == -1) {
   print STDERR "ERROR: cannot terminate naming service\n";
   $NS->Kill (); $NS->TimedWait (1);
   exit 1;
 }
-
+  
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
index 453904b5942..8d36d536681 100644
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
@@ -31,6 +31,7 @@ LDFLAGS += -L$(JAVA_ROOT)/jre/lib/sparc -L$(JAVA_ROOT)/jre/lib/sparc/native_thre
 
 LIBS = -lorbsvcs -lTAO -lACE -lmpeg_shared
 LDLIBS = -lavdemo -ljava -ljvm
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 CPPFLAGS +=  -I$(JAVA_ROOT)/include-old -I$(JAVA_ROOT)/include-old/solaris \
 	    -I$(TAO_ROOT)/orbsvcs -I$(MPEG_ROOT) -I$(TAO_ROOT) $(TSS_ORB_FLAG) -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile
index ee44969f909..f091c372ba2 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile
@@ -26,6 +26,9 @@ CC_CLT_OBJS = CC_client.o CC_tests.o tmplinst.o CC_naming_service.o \
                 CC_command.tab.o lex.CC_command.o \
                 CC_command.o CC_test_utils.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
 BIN2 = CC_client
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp b/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp
index 958bae2078e..5cde9839a46 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp
+++ b/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp
@@ -61,6 +61,8 @@ CosEC_Basic::init_ORB  (int argc, char *argv [])
 
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      return 0;
     }
   ACE_CATCHANY
     {
@@ -71,7 +73,7 @@ CosEC_Basic::init_ORB  (int argc, char *argv [])
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
@@ -111,6 +113,8 @@ CosEC_Basic::init_RtEC (void)
                   str.in ()));
 
       this->ec_impl_->activate ();
+
+      return 0;
     }
   ACE_CATCHANY
     {
@@ -121,7 +125,7 @@ CosEC_Basic::init_RtEC (void)
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
@@ -160,6 +164,8 @@ CosEC_Basic::init_CosEC (void)
 
       this->cos_ec_ = this->ec_i_._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      return 0;
     }
   ACE_CATCHANY
     {
@@ -170,7 +176,7 @@ CosEC_Basic::init_CosEC (void)
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp b/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp
index 4c72af1c49e..bb104bf6422 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp
@@ -162,6 +162,8 @@ CosECConsumer::init_Consumer (void)
 
       this->connect (ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      return 0;
     }
   ACE_CATCHANY
     {
@@ -172,7 +174,7 @@ CosECConsumer::init_Consumer (void)
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp b/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp
index afcc867ed5b..75fff7f1707 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp
@@ -69,6 +69,8 @@ CosEC_Multiple::init_ORB  (int argc, char *argv [])
 
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      return 0;
     }
   ACE_CATCHANY
     {
@@ -79,7 +81,7 @@ CosEC_Multiple::init_ORB  (int argc, char *argv [])
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
@@ -112,6 +114,8 @@ CosEC_Multiple::init_CosEC (void)
         CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in (),
                                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      return 0;
     }
   ACE_CATCHANY
     {
@@ -122,7 +126,7 @@ CosEC_Multiple::init_CosEC (void)
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
index 75322e30473..24fb6ed7521 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
@@ -28,6 +28,8 @@ SIMPLE_SUP_OBJS = \
         CosEC_Multiple.o \
         CosECSupplier.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = supplier \
        consumer
 
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
index 6a00abf4556..6f30b6ee0c8 100755
--- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
@@ -17,7 +17,7 @@ $status = 0;
 sub cosec_multiple_test2
 {
     # first start the Naming service..
-    $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Server".$EXE_EXT, "");
+    $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Service".$EXE_EXT, "");
 
     sleep 10;
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index cd610c1bd7c..82d4989007a 100755
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -66,3 +66,5 @@ unlink $NS_ior;
 
 # @@ Capture the errors from the processes.
 exit $status;
+
+
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index a8b715a15ca..67b74fad970 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -37,17 +37,7 @@ else # ! ACE_HAS_GNUG_PRE_2_8
   include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 endif # ! ACE_HAS_GNUG_PRE_2_8
 
-#----------------------------------------------------------------------------
-#       Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-ifeq ($(LYNXTARGET),ppc)
-#### EC_Multiple.cpp raises internal compiler error with LynxOS 3.0.0 g++,
-#### but only when -O2 optimization is enabled.  Disable it . . .
-.obj/EC_Multiple.o .obj/EC_Multiple.so .shobj/EC_Multiple.o .shobj/EC_Multiple.so: EC_Multiple.cpp
-	@echo NOTE: compiling EC_Multiple.cpp with -O instead of -O2, see Makefile.
-	$(subst $(OCFLAGS) ,-O ,$(COMPILE.cc)) -o $@ $<
-endif # LYNXTARGET == ppc
+#### Local rules and variables...
 
 #----------------------------------------------------------------------------
 #       Dependencies
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
index 632c6e1b316..de2b010c3c8 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
@@ -37,6 +37,6 @@ $NS->Terminate (); if ($NS->TimedWait (5) == -1) {
   print STDERR "ERROR: cannot terminate naming service\n";
   $NS->Kill (); $NS->TimedWait (1);
   exit 1;
-}
+}  
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 03cea69d4f8..5802b7ce7e3 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -101,19 +101,25 @@ Test_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Test_Consumer::dump_results (const char* name,
-                             ACE_UINT32 gsf)
+Test_Consumer::dump_results (const char* name)
 {
-  this->throughput_.dump_results (name, gsf);
+  this->throughput_.dump_results ("ECT_Consumers", name);
+  this->latency_.dump_results ("ECT_Consumers", name);
 }
 
 void
-Test_Consumer::accumulate (ACE_Throughput_Stats& stats) const
+Test_Consumer::accumulate (ECT_Driver::Throughput_Stats& stats) const
 {
   stats.accumulate (this->throughput_);
 }
 
 void
+Test_Consumer::accumulate (ECT_Driver::Latency_Stats& stats) const
+{
+  stats.accumulate (this->latency_);
+}
+
+void
 Test_Consumer::push (const RtecEventComm::EventSet& events,
                      CORBA::Environment &ACE_TRY_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
@@ -129,7 +135,9 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
 
   // We start the timer as soon as we receive the first event...
   if (this->recv_count_ == 0)
-    this->first_event_ = ACE_OS::gethrtime ();
+    this->throughput_.start ();
+
+  this->throughput_.sample ();
 
   this->recv_count_ += events.length ();
 
@@ -154,6 +162,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
             {
               // We stop the timer as soon as we realize it is time to
               // do so.
+              this->throughput_.stop ();
               this->driver_->shutdown_consumer (this->cookie_, ACE_TRY_ENV);
               ACE_CHECK;
             }
@@ -165,8 +174,8 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
                                          e.header.creation_time);
 
           const ACE_hrtime_t now = ACE_OS::gethrtime ();
-          this->throughput_.sample (now - this->first_event_,
-                                    now - creation);
+          const ACE_hrtime_t elapsed = now - creation;
+          this->latency_.sample (elapsed);
         }
     }
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index f7cdc6d527d..13b6eb2a249 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -49,12 +49,14 @@ public:
   void disconnect (CORBA::Environment &_env);
   // Disconnect from the EC.
 
-  void dump_results (const char* name,
-                     ACE_UINT32 global_scale_factor);
+  void dump_results (const char* name);
   // Print out the results
 
-  void accumulate (ACE_Throughput_Stats& stats) const;
-  // Add our throughput and latency statistics to <stats>
+  void accumulate (ECT_Driver::Throughput_Stats& stats) const;
+  // Add our throughput statistics to <stats>
+
+  void accumulate (ECT_Driver::Latency_Stats& stats) const;
+  // Add our latency statistics to <stats>
 
   virtual void push (const RtecEventComm::EventSet& events,
                      CORBA::Environment &_env)
@@ -80,10 +82,12 @@ private:
 
   ACE_SYNCH_MUTEX lock_;
   int recv_count_;
-  ACE_hrtime_t first_event_;
   // How many events we have received.
 
-  ACE_Throughput_Stats throughput_;
+  ECT_Driver::Throughput_Stats throughput_;
+  // Used for reporting stats.
+
+  ECT_Driver::Latency_Stats latency_;
   // Used for reporting stats.
 
   int shutdown_count_;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 900032cc5a6..a5080690263 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -239,18 +239,20 @@ ECT_Consumer_Driver::connect_consumers
 void
 ECT_Consumer_Driver::dump_results (void)
 {
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-
-  ACE_Throughput_Stats throughput;
+  ECT_Driver::Throughput_Stats throughput;
+  ECT_Driver::Latency_Stats latency;
   for (int i = 0; i < this->n_consumers_; ++i)
     {
       char buf[BUFSIZ];
       ACE_OS::sprintf (buf, "consumer_%02.2d", i);
 
-      this->consumers_[i]->dump_results (buf, gsf);
+      this->consumers_[i]->dump_results (buf);
       this->consumers_[i]->accumulate (throughput);
+      this->consumers_[i]->accumulate (latency);
     }
-  throughput.dump_results ("ECT_Consumer/totals", gsf);
+  throughput.dump_results ("ECT_Consumer", "accumulated");
+  latency.dump_results ("ECT_Consumer", "accumulated");
+  // this->dump_latency_results ("Latency");
 }
 
 void
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
index 3fdc0892859..262338fe9be 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
@@ -12,3 +12,126 @@ ACE_RCSID(EC_Throughput, ECT_Driver, "$Id$")
 ECT_Driver::~ECT_Driver (void)
 {
 }
+
+void
+ECT_Driver::dump_latency_results (const char* d)
+{
+  this->end_to_end_.dump_results (d, "end to end");
+#if 0
+  this->supplier_to_ec_.dump_results (d, "supplier to ec");
+  this->inside_ec_.dump_results (d, "inside ec");
+  this->ec_to_consumer_.dump_results (d, "ec to consumer");
+#endif /* 0 */
+}
+
+// ****************************************************************
+
+void
+ECT_Driver::Latency_Stats::dump_results (const char *test_name,
+                                         const char *sub_test)
+{
+  if (this->n_ <= 1)
+    return;
+
+  ACE_hrtime_t avg = this->sum_ / this->n_;
+  ACE_hrtime_t dev =
+    this->sum2_ / this->n_ - avg*avg;
+
+  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+
+  double min_usec = ACE_CU64_TO_CU32 (this->min_) / gsf;
+  double max_usec = ACE_CU64_TO_CU32 (this->max_) / gsf;
+  double avg_usec = ACE_CU64_TO_CU32 (avg) / gsf;
+  double dev_usec = ACE_CU64_TO_CU32 (dev) / (gsf * gsf);
+  ACE_DEBUG ((LM_DEBUG,
+              "%s/%s: %.2f/%.2f/%.2f/%.2f (min/avg/max/var^2) [usecs]\n",
+              test_name, sub_test,
+              min_usec, avg_usec, max_usec, dev_usec));
+}
+
+void
+ECT_Driver::Latency_Stats::accumulate (const Latency_Stats& rhs)
+{
+  if (rhs.n_ == 0)
+    return;
+
+  if (this->n_ == 0)
+    {
+      *this = rhs;
+      return;
+    }
+
+  if (this->min_ > rhs.min_)
+    this->min_ = rhs.min_;
+  if (this->max_ < rhs.max_)
+    this->max_ = rhs.max_;
+
+  this->sum_ += rhs.sum_;
+  this->sum2_ += rhs.sum2_;
+  this->n_ += rhs.n_;
+}
+
+// ****************************************************************
+
+ECT_Driver::Throughput_Stats::Throughput_Stats (void)
+  :  n_ (0),
+     done_ (0)
+{
+}
+
+void
+ECT_Driver::Throughput_Stats::accumulate (const Throughput_Stats& rhs)
+{
+  if (!this->done_)
+    {
+      this->done_ = 1;
+      this->start_ = rhs.start_;
+      this->stop_ = rhs.stop_;
+      this->n_ = rhs.n_;
+      return;
+    }
+
+  if (this->start_ > rhs.start_)
+    this->start_ = rhs.start_;
+
+  if (this->stop_ < rhs.stop_)
+    this->stop_ = rhs.stop_;
+
+  this->n_ += rhs.n_;
+}
+
+void
+ECT_Driver::Throughput_Stats::dump_results (const char *test_name,
+                                            const char *subtest)
+{
+  if (this->n_ == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "%s/%s: no events recorded\n",
+                  test_name, subtest));
+      return;
+    }
+
+  if (this->done_ == 0)
+    {
+      this->stop ();
+      ACE_DEBUG ((LM_DEBUG,
+                  "%s/%s: incomplete data,"
+                  " potentially skewed results\n",
+                  test_name, subtest));
+    }
+
+  ACE_Time_Value tv;
+  ACE_High_Res_Timer::hrtime_to_tv (tv, this->stop_ - this->start_);
+
+  double f = 1.0/(tv.sec () + tv.usec () / 1000000.0);
+  double events_per_second = this->n_ * f;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "%s/%s: "
+              "%d / %d.%06.6d = %.3f events/second\n",
+              test_name, subtest,
+              this->n_,
+              tv.sec (), tv.usec (),
+              events_per_second));
+}
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index f7d923ac230..0a5b96dbc92 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -13,7 +13,6 @@
 #define ECT_DRIVER_H
 
 #include "tao/corba.h"
-#include "ace/Stats.h"
 
 class ECT_Driver
 {
@@ -30,6 +29,85 @@ public:
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
+
+  void end_to_end (ACE_hrtime_t sample);
+  void supplier_to_ec (ACE_hrtime_t sample);
+  void inside_ec (ACE_hrtime_t sample);
+  void ec_to_consumer (ACE_hrtime_t sample);
+
+  void dump_latency_results (const char* description);
+
+  class Latency_Stats
+  {
+    // = TITLE
+    //   Maintains latency statistics.
+    //
+    // = DESCRIPTION
+    //   This class is used to keep latency statistics of the Event
+    //   Channel, in the future we could keep a histogram, but at the
+    //   moment we just keep track of minimum, maximum, average and
+    //   variance.
+    //   The data should be  collected using the High Resolution
+    //   timers.
+  public:
+    Latency_Stats (void);
+
+    void dump_results (const char* test_name,
+                       const char* sub_test);
+
+    void sample (ACE_hrtime_t sample);
+
+    void accumulate (const Latency_Stats& stats);
+    // Useful to merge several Latency_Stats.
+
+  private:
+    u_long n_;
+    ACE_hrtime_t sum_;
+    ACE_hrtime_t sum2_;
+    ACE_hrtime_t min_;
+    ACE_hrtime_t max_;
+  };
+
+  class Throughput_Stats
+  {
+    // = TITLE
+    //   Maintains throughput statistics.
+    //
+    // = DESCRIPTION
+    //   This class is used to keep throughput statistics of the Event
+    //   Channel.
+    //   The data should be  collected using the High Resolution
+    //   timers.
+  public:
+    Throughput_Stats (void);
+
+    void dump_results (const char* test_name,
+                       const char* sub_test);
+
+    void start (void);
+    // Start measuring the time.
+
+    void stop (void);
+    // The test has completed
+
+    void sample (void);
+    // An event has been received
+
+    void accumulate (const Throughput_Stats& stats);
+    // Useful to merge several Throughput_Stats.
+
+  private:
+    CORBA::ULong n_;
+    int done_;
+    ACE_hrtime_t start_;
+    ACE_hrtime_t stop_;
+  };
+
+private:
+  Latency_Stats end_to_end_;
+  Latency_Stats supplier_to_ec_;
+  Latency_Stats inside_ec_;
+  Latency_Stats ec_to_consumer_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i
index c5d7985bfbc..c4481a2da3d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i
@@ -2,5 +2,78 @@
 // $Id$
 //
 
+ACE_INLINE
+ECT_Driver::Latency_Stats::Latency_Stats (void)
+  :  n_ (0),
+     sum_ (0),
+     sum2_ (0),
+     min_ (0),
+     max_ (0)
+{
+}
+
+ACE_INLINE
+void ECT_Driver::Latency_Stats::sample (ACE_hrtime_t sample)
+{
+  this->sum_ += sample;
+  this->sum2_ += sample * sample;
+  if (this->n_ == 0)
+    {
+      this->min_ = sample;
+      this->max_ = sample;
+    }
+  else if (this->min_ > sample)
+    this->min_ = sample;
+  else if (this->max_ < sample)
+    this->max_ = sample;
+  this->n_++;
+}
+
 // ****************************************************************
 
+ACE_INLINE void
+ECT_Driver::Throughput_Stats::start (void)
+{
+  this->done_ = 0;
+  this->start_ = ACE_OS::gethrtime ();
+}
+
+ACE_INLINE void
+ECT_Driver::Throughput_Stats::stop (void)
+{
+  this->done_ = 1;
+  this->stop_ = ACE_OS::gethrtime ();
+}
+
+ACE_INLINE void
+ECT_Driver::Throughput_Stats::sample (void)
+{
+  this->n_++;
+}
+
+// ****************************************************************
+
+ACE_INLINE
+void ECT_Driver::end_to_end (ACE_hrtime_t sample)
+{
+  this->end_to_end_.sample (sample);
+}
+
+ACE_INLINE
+void ECT_Driver::supplier_to_ec (ACE_hrtime_t sample)
+{
+  this->supplier_to_ec_.sample (sample);
+}
+
+ACE_INLINE
+void ECT_Driver::inside_ec (ACE_hrtime_t sample)
+{
+  this->inside_ec_.sample (sample);
+}
+
+ACE_INLINE
+void ECT_Driver::ec_to_consumer (ACE_hrtime_t sample)
+{
+  this->ec_to_consumer_.sample (sample);
+}
+
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 3c9c6306667..1275047e924 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "ECT_Supplier.h"
+#include "ace/Get_Opt.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/Sched_Params.h"
 
+#include "tao/Timeprobe.h"
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/Time_Utilities.h"
-#include "tao/Timeprobe.h"
-
-#include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Sched_Params.h"
-#include "ace/High_Res_Timer.h"
+#include "ECT_Supplier.h"
 
 ACE_RCSID(EC_Throughput, ECT_Supplier, "$Id$")
 
@@ -157,8 +155,7 @@ Test_Supplier::svc ()
       event[0].data.payload.replace (this->event_size_,
                                      &mb);
 
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
+      this->throughput_.start ();
       for (int i = 0; i < this->burst_count_; ++i)
         {
           for (int j = 0; j < this->burst_size_; ++j)
@@ -166,17 +163,15 @@ Test_Supplier::svc ()
               event[0].header.type =
                 this->type_start_ + j % this->type_count_;
 
-              ACE_hrtime_t request_start = ACE_OS::gethrtime ();
+              ACE_hrtime_t now = ACE_OS::gethrtime ();
               ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
-                                             request_start);
+                                             now);
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
               this->consumer_proxy ()->push (event, ACE_TRY_ENV);
 
               ACE_TRY_CHECK;
-              ACE_hrtime_t end = ACE_OS::gethrtime ();
-              this->throughput_.sample (end - test_start,
-                                        end - request_start);
             }
+          this->throughput_.sample ();
 
           if (TAO_debug_level > 0
               && i % 100 == 0)
@@ -191,14 +186,14 @@ Test_Supplier::svc ()
 
       // Send one event shutdown from each supplier
       event[0].header.type = ACE_ES_EVENT_SHUTDOWN;
-      ACE_hrtime_t request_start = ACE_OS::gethrtime ();
+      ACE_hrtime_t now = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
-                                     request_start);
+                                     now);
       this->consumer_proxy ()->push(event, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      ACE_hrtime_t end = ACE_OS::gethrtime ();
-      this->throughput_.sample (end - test_start,
-                                end - request_start);
+      this->throughput_.sample ();
+      this->throughput_.stop ();
+
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
     {
@@ -233,14 +228,13 @@ Test_Supplier::consumer_proxy (void)
 }
 
 void
-Test_Supplier::dump_results (const char* name,
-                             ACE_UINT32 gsf)
+Test_Supplier::dump_results (const char* name)
 {
-  this->throughput_.dump_results (name, gsf);
+  this->throughput_.dump_results ("ECT_Supplier", name);
 }
 
 void
-Test_Supplier::accumulate (ACE_Throughput_Stats& stats) const
+Test_Supplier::accumulate (ECT_Driver::Throughput_Stats& stats) const
 {
   stats.accumulate (this->throughput_);
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 7b08d8f7405..4c1326497fb 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -19,7 +19,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/Task.h"
 
 class Test_Supplier : public ACE_Task<ACE_SYNCH>
@@ -61,11 +60,10 @@ public:
   // We talk to the EC (as a supplier) using this proxy, no duplicates
   // are done here...
 
-  void dump_results (const char* name,
-                     ACE_UINT32 global_scale_factor);
+  void dump_results (const char* name);
   // Dump the results...
 
-  void accumulate (ACE_Throughput_Stats& stats) const;
+  void accumulate (ECT_Driver::Throughput_Stats& stats) const;
   // Add our statistics to <stats>
 
 private:
@@ -85,7 +83,7 @@ private:
   // We also connect to the EC as a consumer so we can receive the
   // timeout events.
 
-  ACE_Throughput_Stats throughput_;
+  ECT_Driver::Throughput_Stats throughput_;
   // Measure the elapsed time spent while sending the events.
 
   int burst_count_;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index ad03c743227..5f3d8ecb03d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -258,18 +258,16 @@ ECT_Supplier_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
 void
 ECT_Supplier_Driver::dump_results (void)
 {
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-
-  ACE_Throughput_Stats throughput;
+  ECT_Driver::Throughput_Stats throughput;
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       char buf[BUFSIZ];
       ACE_OS::sprintf (buf, "supplier_%02.2d", i);
 
-      this->suppliers_[i]->dump_results (buf, gsf);
+      this->suppliers_[i]->dump_results (buf);
       this->suppliers_[i]->accumulate (throughput);
     }
-  throughput.dump_results ("ECT_Supplier/totals", gsf);
+  throughput.dump_results ("ECT_Supplier", "accumulated");
 }
 
 int
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 60caa15d755..f6d58ede385 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -471,29 +471,31 @@ ECT_Throughput::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
 void
 ECT_Throughput::dump_results (void)
 {
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-
-  ACE_Throughput_Stats consumers;
+  ECT_Driver::Throughput_Stats consumers;
+  ECT_Driver::Latency_Stats latency;
   for (int j = 0; j < this->n_consumers_; ++j)
     {
       char buf[BUFSIZ];
       ACE_OS::sprintf (buf, "consumer_%02.2d", j);
 
-      this->consumers_[j]->dump_results (buf, gsf);
+      this->consumers_[j]->dump_results (buf);
       this->consumers_[j]->accumulate (consumers);
+      this->consumers_[j]->accumulate (latency);
     }
-  consumers.dump_results ("ECT_Consumer/totals", gsf);
+  consumers.dump_results ("ECT_Consumer", "throughput");
+  latency.dump_results ("ECT_Consumer", "latency");
 
-  ACE_Throughput_Stats suppliers;
+  ECT_Driver::Throughput_Stats suppliers;
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       char buf[BUFSIZ];
       ACE_OS::sprintf (buf, "supplier_%02.2d", i);
 
-      this->suppliers_[i]->dump_results (buf, gsf);
+      this->suppliers_[i]->dump_results (buf);
       this->suppliers_[i]->accumulate (suppliers);
     }
-  suppliers.dump_results ("ECT_Supplier/totals", gsf);
+  suppliers.dump_results ("ECT_Supplier", "accumulated");
+  this->dump_latency_results ("Latency");
 }
 
 int
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index bb629b804e8..2f9c403cd6a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -5,7 +5,6 @@
 #include "Supplier.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
 
 ACE_RCSID(EC_Tests_Basic, Reconnect, "$Id$")
 
@@ -91,11 +90,12 @@ void
 EC_Reconnect::execute_test (CORBA::Environment& ACE_TRY_ENV)
 {
   this->execute_consumer_test (ACE_TRY_ENV);
+
   this->execute_supplier_test (ACE_TRY_ENV);
 
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  this->consumer_reconnect_.dump_results ("Reconnect/consumer", gsf);
-  this->supplier_reconnect_.dump_results ("Reconnect/supplier", gsf);
+  this->consumer_reconnect_.dump_results ("Reconnect", "consumer");
+
+  this->supplier_reconnect_.dump_results ("Reconnect", "supplier");
 
   // this->EC_Driver::execute_test (ACE_TRY_ENV);
 }
@@ -115,7 +115,6 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV)
 
   if (this->allow_consumer_reconnect_)
     {
-      ACE_hrtime_t start_time = ACE_OS::gethrtime ();
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
@@ -124,8 +123,7 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV)
                                         ACE_TRY_ENV);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
-          this->consumer_reconnect_.sample (stop - start_time,
-                                            stop - start);
+          this->consumer_reconnect_.sample (stop - start);
         }
     }
   else
@@ -154,7 +152,6 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV)
         this->event_channel_->for_consumers (ACE_TRY_ENV);
       ACE_CHECK;
 
-      ACE_hrtime_t start_time = ACE_OS::gethrtime ();
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
@@ -166,8 +163,7 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV)
                                         ACE_TRY_ENV);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
-          this->consumer_reconnect_.sample (stop - start_time,
-                                            stop - start);
+          this->consumer_reconnect_.sample (stop - start);
         }
     }
 }
@@ -182,7 +178,6 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV)
 
   if (this->allow_supplier_reconnect_)
     {
-      ACE_hrtime_t start_time = ACE_OS::gethrtime ();
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
@@ -190,8 +185,7 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV)
                                         ACE_TRY_ENV);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
-          this->supplier_reconnect_.sample (stop - start_time,
-                                            stop - start);
+          this->supplier_reconnect_.sample (stop - start);
         }
     }
   else
@@ -219,7 +213,6 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV)
         this->event_channel_->for_suppliers (ACE_TRY_ENV);
       ACE_CHECK;
 
-      ACE_hrtime_t start_time = ACE_OS::gethrtime ();
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
@@ -231,8 +224,7 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV)
                                         ACE_TRY_ENV);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
-          this->supplier_reconnect_.sample (stop - start_time,
-                                            stop - start);
+          this->supplier_reconnect_.sample (stop - start);
         }
     }
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
index 66cfbdca3a6..9e98eee77df 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
@@ -72,8 +72,8 @@ private:
   int disconnections_;
   // The number of disconnections
 
-  ACE_Throughput_Stats consumer_reconnect_;
-  ACE_Throughput_Stats supplier_reconnect_;
+  EC_Driver::Latency_Stats consumer_reconnect_;
+  EC_Driver::Latency_Stats supplier_reconnect_;
 };
 
 #endif /* EC_RECONNECT_H */
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index d9cba9424f4..b2d18032e20 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -5,7 +5,6 @@
 #include "Supplier.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Arg_Shifter.h"
-#include "ace/High_Res_Timer.h"
 
 ACE_RCSID(EC_Tests_Performance, Connect, "$Id$")
 
@@ -97,10 +96,9 @@ EC_Connect::print_args (void) const
 void
 EC_Connect::dump_results (void)
 {
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "\nConnect time:\n"));
-  this->consumer_connect_.dump_results ("Consumer/connect", gsf);
-  this->supplier_connect_.dump_results ("Supplier/connect", gsf);
+  this->consumer_connect_.dump_results ("Consumer", "connect");
+  this->supplier_connect_.dump_results ("Supplier", "connect");
 
   ACE_DEBUG ((LM_DEBUG, "\nDisconnect time:\n"));
 }
@@ -116,8 +114,7 @@ EC_Connect::connect_consumer (
                                      i,
                                      ACE_TRY_ENV);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->consumer_connect_.sample (now - this->start_time_,
-                                  now - start);
+  this->consumer_connect_.sample (now - start);
 }
 
 void
@@ -131,8 +128,7 @@ EC_Connect::connect_supplier (
                                      i,
                                      ACE_TRY_ENV);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->supplier_connect_.sample (now - this->start_time_,
-                                  now - start);
+  this->supplier_connect_.sample (now - start);
 }
 
 EC_Consumer*
@@ -150,7 +146,6 @@ EC_Connect::allocate_supplier (int i)
 void
 EC_Connect::connect_clients (CORBA::Environment &ACE_TRY_ENV)
 {
-  this->start_time_ = ACE_OS::gethrtime ();
   switch (this->order_)
     {
     default:
@@ -236,7 +231,6 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
     this->event_channel_->for_suppliers (ACE_TRY_ENV);
   ACE_CHECK;
 
-  ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i != max; ++i)
     {
       if (i < this->n_suppliers_)
@@ -247,8 +241,7 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
           ACE_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
-          this->supplier_disconnect_.sample (now - start_time,
-                                             now - start);
+          this->supplier_disconnect_.sample (now - start);
         }
       if (i < this->n_consumers_)
         {
@@ -258,19 +251,16 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
           ACE_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
-          this->consumer_disconnect_.sample (now - start_time,
-                                             now - start);
+          this->consumer_disconnect_.sample (now - start);
         }
     }
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  this->consumer_disconnect_.dump_results ("Consumer/disconnect", gsf);
-  this->supplier_disconnect_.dump_results ("Supplier/disconnect", gsf);
+  this->consumer_disconnect_.dump_results ("Consumer", "disconnect");
+  this->supplier_disconnect_.dump_results ("Supplier", "disconnect");
 }
 
 void
 EC_Connect::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_consumers_; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
@@ -279,12 +269,9 @@ EC_Connect::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
       ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->consumer_disconnect_.sample (now - start_time,
-                                         now - start);
+      this->consumer_disconnect_.sample (now - start);
     }
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  this->consumer_disconnect_.dump_results ("Consumer/disconnect",
-                                           gsf);
+  this->consumer_disconnect_.dump_results ("Consumer", "disconnect");
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Connect (%P|%t) consumers disconnected\n"));
 }
@@ -292,7 +279,6 @@ EC_Connect::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
 void
 EC_Connect::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
@@ -301,12 +287,9 @@ EC_Connect::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
       ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->supplier_disconnect_.sample (now - start_time,
-                                         now - start);
+      this->supplier_disconnect_.sample (now - start);
     }
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  this->supplier_disconnect_.dump_results ("Supplier/disconnect",
-                                           gsf);
+  this->supplier_disconnect_.dump_results ("Supplier", "disconnect");
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Connect (%P|%t) suppliers disconnected\n"));
 }
@@ -343,15 +326,14 @@ ECC_Consumer::connect (
                               shutdown_event_type,
                               ACE_TRY_ENV);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->connect_time_.sample (now, now - start);
+  this->connect_time_.sample (now - start);
 }
 
 void
-ECC_Consumer::dump_results (const char* name,
-                            ACE_UINT32 gsf)
+ECC_Consumer::dump_results (const char* name)
 {
-  this->connect_time_.dump_results (name, gsf);
-  this->EC_Consumer::dump_results (name, gsf);
+  this->connect_time_.dump_results ("EC_Consumers/connect", name);
+  this->EC_Consumer::dump_results (name);
 }
 
 // ****************************************************************
@@ -385,15 +367,14 @@ ECC_Supplier::connect (
                               shutdown_event_type,
                               ACE_TRY_ENV);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->connect_time_.sample (now, now - start);
+  this->connect_time_.sample (now - start);
 }
 
 void
-ECC_Supplier::dump_results (const char* name,
-                            ACE_UINT32 gsf)
+ECC_Supplier::dump_results (const char* name)
 {
-  this->connect_time_.dump_results (name, gsf);
-  this->EC_Supplier::dump_results (name, gsf);
+  this->connect_time_.dump_results ("EC_Suppliers/connect", name);
+  this->EC_Supplier::dump_results (name);
 }
 
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h
index 1b58133482e..e69412ec32f 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h
@@ -74,11 +74,10 @@ public:
   virtual void disconnect_clients (CORBA::Environment&);
 
 private:
-  ACE_hrtime_t start_time_;
-  ACE_Throughput_Stats consumer_connect_;
-  ACE_Throughput_Stats supplier_connect_;
-  ACE_Throughput_Stats consumer_disconnect_;
-  ACE_Throughput_Stats supplier_disconnect_;
+  EC_Driver::Latency_Stats consumer_connect_;
+  EC_Driver::Latency_Stats supplier_connect_;
+  EC_Driver::Latency_Stats consumer_disconnect_;
+  EC_Driver::Latency_Stats supplier_disconnect_;
 
   int order_;
   // What is connected first?
@@ -100,11 +99,10 @@ public:
       const RtecEventChannelAdmin::ConsumerQOS& qos,
       int shutdown_event_type,
       CORBA::Environment &ACE_TRY_ENV);
-  virtual void dump_results (const char* name,
-                             ACE_UINT32 global_scale_factor);
+  virtual void dump_results (const char* name);
 
 private:
-  ACE_Throughput_Stats connect_time_;
+  EC_Driver::Latency_Stats connect_time_;
 };
 
 // ****************************************************************
@@ -123,11 +121,10 @@ public:
       const RtecEventChannelAdmin::SupplierQOS& qos,
       int shutdown_event_type,
       CORBA::Environment &ACE_TRY_ENV);
-  virtual void dump_results (const char* name,
-                             ACE_UINT32 global_scale_factor);
+  virtual void dump_results (const char* name);
 
 private:
-  ACE_Throughput_Stats connect_time_;
+  EC_Driver::Latency_Stats connect_time_;
 };
 
 #endif /* EC_CONNECT_H */
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
index a7c67c15e12..99962528d43 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile
@@ -184,9 +184,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/IORS.h \
@@ -216,6 +213,9 @@ endif
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
@@ -268,7 +268,6 @@ endif
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -344,8 +343,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
  ../lib/Driver.i ../lib/Consumer.h ../lib/Supplier.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -493,9 +490,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/IORS.h \
@@ -525,6 +519,9 @@ endif
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
@@ -577,7 +574,6 @@ endif
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -653,8 +649,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
  ../lib/Driver.i ../lib/Supplier.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -672,8 +666,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i
+ $(ACE_ROOT)/ace/Arg_Shifter.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index 91488dba4fe..0622ed6eb4e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -89,16 +89,18 @@ EC_Consumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Consumer::dump_results (const char* name,
-                           ACE_UINT32 gsf)
+EC_Consumer::dump_results (const char* name)
 {
-  this->throughput_.dump_results (name, gsf);
+  this->throughput_.dump_results ("EC_Consumers", name);
+  this->latency_.dump_results ("EC_Consumers", name);
 }
 
 void
-EC_Consumer::accumulate (ACE_Throughput_Stats& throughput) const
+EC_Consumer::accumulate (EC_Driver::Throughput_Stats& throughput,
+                           EC_Driver::Latency_Stats& latency) const
 {
   throughput.accumulate (this->throughput_);
+  latency.accumulate (this->latency_);
 }
 
 void
@@ -117,7 +119,10 @@ EC_Consumer::push (const RtecEventComm::EventSet& events,
 
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
   if (this->push_count_ == 0)
-    this->throughput_start_ = ACE_OS::gethrtime ();
+    this->throughput_.start ();
+
+  // We start the timer as soon as we receive the first event...
+  this->throughput_.sample ();
 
   this->push_count_ += events.length ();
 
@@ -138,8 +143,8 @@ EC_Consumer::push (const RtecEventComm::EventSet& events,
                                      e.header.creation_time);
 
       const ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->throughput_.sample (now - this->throughput_start_,
-                                now - creation);
+      const ACE_hrtime_t elapsed = now - creation;
+      this->latency_.sample (elapsed);
 
       if (e.header.type == this->shutdown_event_type_)
         this->driver_->consumer_shutdown (this->cookie_, ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index 2679cf51e29..68231280d09 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -70,11 +70,11 @@ public:
   void shutdown (CORBA::Environment &ACE_TRY_ENV);
   // The application is shutting down, deactivate the consumer.
 
-  void accumulate (ACE_Throughput_Stats& throughput) const;
+  void accumulate (EC_Driver::Throughput_Stats& throughput,
+                   EC_Driver::Latency_Stats& latency) const;
   // Accumulate our statistics to the totals.
 
-  virtual void dump_results (const char* name,
-                             ACE_UINT32 global_scale_factor);
+  virtual void dump_results (const char* name);
   // Printout the statistics
 
   // = The RtecEventComm::PushConsumer methods
@@ -100,10 +100,10 @@ private:
   ACE_SYNCH_MUTEX lock_;
   // Protect internal state
 
-  ACE_hrtime_t throughput_start_;
-  // The timestamp for the first message received
+  EC_Driver::Throughput_Stats throughput_;
+  // Used for reporting stats
 
-  ACE_Throughput_Stats throughput_;
+  EC_Driver::Latency_Stats latency_;
   // Used for reporting stats
 
   int push_count_;
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index aec9d59d40a..324d59ed016 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -10,7 +10,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/High_Res_Timer.h"
-#include "ace/Stats.h"
 
 #if !defined(EC_DISABLE_OLD_EC)
 #include "EC_Scheduler_Info.h"
@@ -760,32 +759,34 @@ EC_Driver::shutdown_consumers (CORBA::Environment &ACE_TRY_ENV)
 void
 EC_Driver::dump_results (void)
 {
-  ACE_Throughput_Stats throughput;
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  char buf[BUFSIZ];
+  EC_Driver::Throughput_Stats throughput;
+  EC_Driver::Latency_Stats latency;
   for (int j = 0; j < this->n_consumers_; ++j)
     {
-      ACE_OS::sprintf (buf, "Consumer [%02.2d]", j);
+      char buf[BUFSIZ];
+      ACE_OS::sprintf (buf, "consumer_%02.2d", j);
 
-      this->consumers_[j]->dump_results (buf, gsf);
-      this->consumers_[j]->accumulate (throughput);
+      this->consumers_[j]->dump_results (buf);
+      this->consumers_[j]->accumulate (throughput, latency);
     }
   ACE_DEBUG ((LM_DEBUG, "\n"));
 
-  ACE_Throughput_Stats suppliers;
+  EC_Driver::Throughput_Stats suppliers;
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      ACE_OS::sprintf (buf, "Supplier [%02.2d]", i);
+      char buf[BUFSIZ];
+      ACE_OS::sprintf (buf, "supplier_%02.2d", i);
 
-      this->suppliers_[i]->dump_results (buf, gsf);
+      this->suppliers_[i]->dump_results (buf);
       this->suppliers_[i]->accumulate (suppliers);
     }
 
   ACE_DEBUG ((LM_DEBUG, "\nTotals:\n"));
-  throughput.dump_results ("EC_Consumer/totals", gsf);
+  throughput.dump_results ("EC_Consumer", "throughput");
+  latency.dump_results ("EC_Consumer", "latency");
 
   ACE_DEBUG ((LM_DEBUG, "\n"));
-  suppliers.dump_results ("EC_Supplier/totals", gsf);
+  suppliers.dump_results ("EC_Supplier", "accumulated");
 }
 
 int
@@ -1124,3 +1125,108 @@ EC_Driver::supplier_disconnect (void*,
                                 CORBA::Environment&)
 {
 }
+
+// ****************************************************************
+
+void
+EC_Driver::Latency_Stats::dump_results (const char *test_name,
+                                        const char *sub_test)
+{
+  if (this->n_ <= 1)
+    return;
+
+  ACE_hrtime_t avg = this->sum_ / this->n_;
+  ACE_hrtime_t dev =
+    this->sum2_ / this->n_ - avg*avg;
+
+  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+
+  double min_usec = ACE_CU64_TO_CU32 (this->min_) / gsf;
+  double max_usec = ACE_CU64_TO_CU32 (this->max_) / gsf;
+  double avg_usec = ACE_CU64_TO_CU32 (avg) / gsf;
+  double dev_usec = ACE_CU64_TO_CU32 (dev) / (gsf * gsf);
+  ACE_DEBUG ((LM_DEBUG,
+              "%s/%s: %.2f/%.2f/%.2f/%.2f (min/avg/max/var^2) [usecs]\n",
+              test_name, sub_test,
+              min_usec, avg_usec, max_usec, dev_usec));
+}
+
+void
+EC_Driver::Latency_Stats::accumulate (const Latency_Stats& rhs)
+{
+  if (rhs.n_ == 0)
+    return;
+
+  if (this->n_ == 0)
+    {
+      *this = rhs;
+      return;
+    }
+
+  if (this->min_ > rhs.min_)
+    this->min_ = rhs.min_;
+  if (this->max_ < rhs.max_)
+    this->max_ = rhs.max_;
+
+  this->sum_ += rhs.sum_;
+  this->sum2_ += rhs.sum2_;
+  this->n_ += rhs.n_;
+}
+
+// ****************************************************************
+
+void
+EC_Driver::Throughput_Stats::accumulate (const Throughput_Stats& rhs)
+{
+  if (!this->done_)
+    {
+      this->done_ = 1;
+      this->start_ = rhs.start_;
+      this->stop_ = rhs.stop_;
+      this->n_ = rhs.n_;
+      return;
+    }
+
+  if (this->start_ > rhs.start_)
+    this->start_ = rhs.start_;
+
+  if (this->stop_ < rhs.stop_)
+    this->stop_ = rhs.stop_;
+
+  this->n_ += rhs.n_;
+}
+
+void
+EC_Driver::Throughput_Stats::dump_results (const char *test_name,
+                                           const char *subtest)
+{
+  if (this->n_ == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "%s/%s: no events recorded\n",
+                  test_name, subtest));
+      return;
+    }
+
+  if (this->done_ == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "%s/%s: incomplete data,"
+                  " potentially skewed results\n",
+                  test_name, subtest));
+    }
+
+  ACE_Time_Value tv;
+  ACE_High_Res_Timer::hrtime_to_tv (tv, this->stop_ - this->start_);
+
+  double f = 1.0/(tv.sec () + tv.usec () / 1000000.0);
+  double events_per_second = this->n_ * f;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "%s/%s: "
+              "%d / %d.%06.6d = %.3f events/second\n",
+              test_name, subtest,
+              this->n_,
+              tv.sec (), tv.usec (),
+              events_per_second));
+}
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index df3d3cc1bf5..40f4b51833d 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -24,7 +24,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
-#include "ace/Stats.h"
 
 class TAO_EC_Event_Channel_Attributes;
 class TAO_Module_Factory;
@@ -225,6 +224,72 @@ public:
   // Activate all the tasks, by default runs each supplier on its
   // own thread.
 
+  class EC_Test_Export Latency_Stats
+  {
+    // = TITLE
+    //   Maintains latency statistics.
+    //
+    // = DESCRIPTION
+    //   This class is used to keep latency statistics, collected
+    //   using the high resolution timers.
+    //
+    // = TODO
+    //   Implement a version that keeps a histogram, with bounded
+    //   memory requirements.
+    //
+  public:
+    Latency_Stats (void);
+
+    void dump_results (const char* test_name,
+                       const char* sub_test);
+
+    void sample (ACE_hrtime_t sample);
+
+    void accumulate (const Latency_Stats& stats);
+    // Useful to merge several Latency_Stats.
+
+  private:
+    u_long n_;
+    ACE_hrtime_t sum_;
+    ACE_hrtime_t sum2_;
+    ACE_hrtime_t min_;
+    ACE_hrtime_t max_;
+  };
+
+  class EC_Test_Export Throughput_Stats
+  {
+    // = TITLE
+    //   Maintains throughput statistics.
+    //
+    // = DESCRIPTION
+    //   This class is used to keep throughput statistics, the data is
+    //   collected using the High Resolution Timer.
+    //
+  public:
+    Throughput_Stats (void);
+
+    void dump_results (const char* test_name,
+                       const char* sub_test);
+
+    void start (void);
+    // Start measuring the time.
+
+    void stop (void);
+    // The test has completed
+
+    void sample (void);
+    // An event has been received
+
+    void accumulate (const Throughput_Stats& stats);
+    // Useful to merge several Throughput_Stats.
+
+  private:
+    CORBA::ULong n_;
+    int done_;
+    ACE_hrtime_t start_;
+    ACE_hrtime_t stop_;
+  };
+
 protected:
   CORBA::ORB_var orb_;
   // The ORB
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.i b/TAO/orbsvcs/tests/Event/lib/Driver.i
index f346e7757c1..b93a23fdbd2 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.i
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.i
@@ -5,3 +5,62 @@ EC_Driver::verbose (void) const
 {
   return this->verbose_;
 }
+
+// ****************************************************************
+
+ACE_INLINE
+EC_Driver::Latency_Stats::Latency_Stats (void)
+  :  n_ (0),
+     sum_ (0),
+     sum2_ (0),
+     min_ (0),
+     max_ (0)
+{
+}
+
+ACE_INLINE
+void EC_Driver::Latency_Stats::sample (ACE_hrtime_t sample)
+{
+  this->sum_ += sample;
+  this->sum2_ += sample * sample;
+  if (this->n_ == 0)
+    {
+      this->min_ = sample;
+      this->max_ = sample;
+    }
+  else if (this->min_ > sample)
+    this->min_ = sample;
+  else if (this->max_ < sample)
+    this->max_ = sample;
+  this->n_++;
+}
+
+// ****************************************************************
+
+ACE_INLINE
+EC_Driver::Throughput_Stats::Throughput_Stats (void)
+  :  n_ (0),
+     done_ (0)
+{
+}
+
+ACE_INLINE void
+EC_Driver::Throughput_Stats::start (void)
+{
+  this->done_ = 0;
+  this->start_ = ACE_OS::gethrtime ();
+}
+
+ACE_INLINE void
+EC_Driver::Throughput_Stats::stop (void)
+{
+  this->stop_ = ACE_OS::gethrtime ();
+  this->done_ = 1;
+}
+
+ACE_INLINE void
+EC_Driver::Throughput_Stats::sample (void)
+{
+  this->n_++;
+  this->stop_ = ACE_OS::gethrtime ();
+}
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile
index 8bed6e33f66..6b182b07c99 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile
@@ -181,9 +181,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/IORS.h \
@@ -213,6 +210,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
@@ -265,7 +265,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -341,8 +340,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
  Driver.i Consumer.h Supplier.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -499,9 +496,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/IORS.h \
@@ -531,6 +525,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
@@ -583,7 +580,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -659,8 +655,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
  Driver.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
@@ -792,9 +786,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/IORS.h \
@@ -824,6 +815,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
@@ -876,7 +870,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -952,8 +945,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
  Driver.i \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 8e69ee498c0..33d9d45af56 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -58,7 +58,10 @@ EC_Supplier::send_event (const RtecEventComm::EventSet& event,
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (this->push_count_ == 0)
-    this->throughput_start_ = ACE_OS::gethrtime ();
+    this->throughput_.start ();
+
+  // We start the timer as soon as we receive the first event...
+  this->throughput_.sample ();
 
   this->push_count_ += event.length ();
 
@@ -69,14 +72,7 @@ EC_Supplier::send_event (const RtecEventComm::EventSet& event,
                   "EC_Consumer (%P|%t): %d events received\n",
                   this->push_count_));
     }
-  
-  ACE_hrtime_t start = ACE_OS::gethrtime ();
-
   this->consumer_proxy_->push (event, ACE_TRY_ENV);
-
-  ACE_hrtime_t end = ACE_OS::gethrtime ();
-  this->throughput_.sample (end - this->throughput_start_,
-                            end - start);
 }
 
 void
@@ -181,14 +177,13 @@ EC_Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Supplier::dump_results (const char* name,
-                           ACE_UINT32 gsf)
+EC_Supplier::dump_results (const char* name)
 {
-  this->throughput_.dump_results (name, gsf);
+  this->throughput_.dump_results ("EC_Supplier", name);
 }
 
 void
-EC_Supplier::accumulate (ACE_Throughput_Stats& stats) const
+EC_Supplier::accumulate (EC_Driver::Throughput_Stats& stats) const
 {
   stats.accumulate (this->throughput_);
 }
@@ -267,8 +262,9 @@ EC_Supplier_Task::svc (void)
               ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
             }
           ACE_ENDTRY;
+
+          ACE_OS::sleep (tv);
         }
-      ACE_OS::sleep (tv);
     }
 
   ACE_TRY_EX(SHUTDOWN)
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index 8fb4138418b..b2d5dcc1bfa 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -89,11 +89,10 @@ public:
   void shutdown (CORBA::Environment &ACE_TRY_ENV);
   // Disconnect from the EC, also deactivates the object
 
-  virtual void dump_results (const char* name,
-                             ACE_UINT32 global_scale_factor);
+  virtual void dump_results (const char* name);
   // Dump the results...
 
-  void accumulate (ACE_Throughput_Stats& stats) const;
+  void accumulate (EC_Driver::Throughput_Stats& stats) const;
   // Add our statistics to <stats>
 
   void event_type (int event_number,
@@ -120,10 +119,7 @@ private:
   RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
   // We talk to the EC (as a supplier) using this proxy.
 
-  ACE_hrtime_t throughput_start_;
-  // The time for the first event sent
-
-  ACE_Throughput_Stats throughput_;
+  EC_Driver::Throughput_Stats throughput_;
   // Measure the elapsed time spent while sending the events.
 
   int burst_count_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile
index 77e5443263e..7982b4862eb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile
@@ -53,6 +53,8 @@ NESTEA_SERVER_OBJS =  NesteaC.o \
                       nestea_server_i.o \
                       nestea_i.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = airplane_server \
        airplane_client \
        nestea_server \
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 1a66f9a62b6..5ed6b235838 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(ImplRepo, nestea_server_i, "$Id$")
 
 const char *NESTEA_DATA_FILENAME = "nestea.dat";
 
-Nestea_Server_i::Nestea_Server_i (const char * /*filename*/)
+Nestea_Server_i::Nestea_Server_i (const char */*filename*/)
   : server_impl_ (0),
     ior_output_file_ (0),
     ir_helper_ (0),
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index b194f4dffde..5cbbb6207fc 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -62,8 +62,7 @@ sub airplane_ir_test
 
   system($airplane_client." -k file://$airplane_ior");
 
-  system($tao_ir." -ORBImplRepoIOR file://$implrepo_ior shutdown plane");
-
+  $SV->Kill (); $SV->Wait ();
   $IR->Kill (); $IR->Wait ();
 }
 
@@ -100,8 +99,7 @@ sub nestea_ir_test
 
   system ($nestea_client." -k file://$nestea_ior");
 
-  system ($tao_ir." -ORBImplRepoIOR file://$implrepo_ior shutdown nestea_server");
-
+  $SV->Kill (); $SV->Wait ();
   $IR->Kill (); $IR->Wait ();
 }
 
diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile
index 8ffb640165a..52979c1b173 100644
--- a/TAO/orbsvcs/tests/Property/Makefile
+++ b/TAO/orbsvcs/tests/Property/Makefile
@@ -15,6 +15,8 @@ CosProperty_SERVER_OBJS = server.o
 CosProperty_CLIENT_OBJS = client.o
 SRC=server.cpp client.cpp
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = server client
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl
index 54c1cec55fd..e2604ab132a 100755
--- a/TAO/orbsvcs/tests/Property/run_test.pl
+++ b/TAO/orbsvcs/tests/Property/run_test.pl
@@ -21,8 +21,8 @@ $nsior = "ns.ior";
 sub name_server
 {
     my $args = " -o $nsior";
-    my $prog =
-    print STDERR ("\nNaming_Service: $args\n");
+    my $prog = 
+      print STDERR "\nNaming_Service: $args\n";
 
     unlink $nsior;
     $NS = Process::Create ("..".$DIR_SEPARATOR
@@ -71,7 +71,7 @@ $SV->Terminate (); if ($SV->TimedWait (5) == -1) {
   $NS->Kill (); $NS->TimedWait (1);
   exit 1;
 }
-
+  
 $NS->Terminate (); if ($NS->TimedWait (5) == -1) {
   print STDERR "ERROR: cannot terminate naming service\n";
   $NS->Kill (); $NS->TimedWait (1);
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile
index ead0f2185e8..11559c69138 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile
@@ -7,6 +7,7 @@ SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 DUMP_OBJS = $(DUMP_SRCS:.cpp=.o)
 
 LDLIBS  = -lorbsvcs -lTAO
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BIN2 = Sched_Conf
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile
index 7f75bab7be5..bd74f226fa6 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile
@@ -25,6 +25,8 @@ TEST_OBJECT_OBJS = test_objectC.o \
                    test_objectS.o \
                    client.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = client
 
 TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index e6c4298c97f..9233d1c1b04 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -289,11 +289,6 @@ MT_Test::svc (void)
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test");
-      // This debug statement works around a IRIX/MIPSPro 7.3 bug (it
-      // fails with optimize=1 debug=0; but works with any other
-      // settings for those flags).
-      ACE_DEBUG ((LM_DEBUG, "MT_Test(%t) - bind[3] %d\n",
-                  test_name_.length ()));
       return -1;
     }
   ACE_ENDTRY;
@@ -416,9 +411,8 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 
   if (status == -1)
     return -1;
-
-  status = this->wait ();
-  return status;
+  else
+    return this->wait ();
 }
 
 int
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 5d72e95adaa..7f5167f5db5 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -18,8 +18,8 @@ require Uniqueid;
 $sleeptime = 8;
 
 # Variables for command-line arguments to client and server
-# executables.
-$ns_multicast_port = 10000 + uniqueid ();
+# executables. 
+$ns_multicast_port = 10000 + uniqueid ();  
 $ns_orb_port = 12000 + uniqueid ();
 $iorfile = "ns.ior";
 $persistent_ior_file = "pns.ior";
@@ -60,9 +60,9 @@ sub client
 # Options for all simple tests recognized by the 'client' program.
 @opts = ("-s -ORBnameserviceior file://$iorfile",
          "-s -ORBnameserviceport $ns_multicast_port",
-         "-t -ORBnameserviceior file://$iorfile",
-         "-i -ORBnameserviceior file://$iorfile",
-         "-e -ORBnameserviceior file://$iorfile",
+         "-t -ORBnameserviceior file://$iorfile", 
+         "-i -ORBnameserviceior file://$iorfile", 
+         "-e -ORBnameserviceior file://$iorfile", 
          "-y -ORBnameserviceior file://$iorfile",
          "-p $persistent_ior_file -ORBnameserviceior file://$iorfile",
          "-c file://$persistent_ior_file -ORBnameserviceior file://$iorfile");
@@ -141,3 +141,4 @@ print STDERR "\n";
 
 # @@ Capture any exit status from the processes.
 exit 0;
+
diff --git a/TAO/orbsvcs/tests/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile
index 57f68bad76d..044c0eaa776 100644
--- a/TAO/orbsvcs/tests/Time/Makefile
+++ b/TAO/orbsvcs/tests/Time/Makefile
@@ -23,6 +23,8 @@ SRC = $(PROG_SRCS)
 SIMPLE_CLT_OBJS = Client_i.o \
         client.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = client
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index df1ae4e240e..cd298e95f73 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -39,6 +39,7 @@ LSRC    = $(addsuffix .cpp,$(FILES))
 PSRC    = $(addsuffix .cpp,$(BIN))
 LIBS    = -lorbsvcs -lTAO
 LDLIBS  = -lorbsvcs -lTAO
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
diff --git a/TAO/orbsvcs/tests/Trading/TradingLib.dsp b/TAO/orbsvcs/tests/Trading/TradingLib.dsp
index bd88b946f18..a89d4112e49 100644
--- a/TAO/orbsvcs/tests/Trading/TradingLib.dsp
+++ b/TAO/orbsvcs/tests/Trading/TradingLib.dsp
@@ -155,7 +155,6 @@ SOURCE=.\TTest.idl
 

 !IF  "$(CFG)" == "TradingLib - Win32 Release"

 

-USERDEP__TTEST="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL compiler

 InputPath=.\TTest.idl

 InputName=TTest

@@ -194,7 +193,6 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "TradingLib - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TTEST="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL compiler

 InputPath=.\TTest.idl

 InputName=TTest

diff --git a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
index 927e5e61d77..7443d01573b 100644
--- a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
@@ -47,6 +47,8 @@ else
   LDLIBS += -lOrb-mt $(MATHLIB)
 endif
 
+VLDLIBS := $(LDLIBS:%=%$(VAR)) $(ACELIB) $(LIBS)
+
 #----------------------------------------------------------------------------
 #	Local targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
index ba19b1dffaf..9dc8b41e2e4 100644
--- a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
@@ -61,6 +61,8 @@ else
   LDLIBS += -lOrb-mt
 endif
 
+VLDLIBS := $(LDLIBS:%=%$(VAR)) $(ACELIB) $(LIBS)
+
 #----------------------------------------------------------------------------
 #	Local targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile
index c4016edd1a0..f89dc1b2eb2 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile
@@ -18,6 +18,9 @@ CUBIT_SVR_OBJS = cubit.o cubit_s.o svr.o cubit_i.o
 CUBIT_CLT_OBJS = cubit.o clnt.o
 
 BIN = svr clnt
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile
index de794049ebc..d6834f2d40a 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile
+++ b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile
@@ -19,6 +19,9 @@ LSRC = $(PROG_SRCS)
 CUBIT_CLIENT_OBJS = cubit.o Task_Client.o client.o
 
 BIN = client
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile
index 406ac91aa26..4a73e39f1a8 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile
+++ b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile
@@ -20,6 +20,9 @@ LSRC = $(IDL_SRC) $(PROG_SRCS)
 CUBIT_SVR_OBJS = cubit.o cubit_s.o svr.o cubit_i.o
 
 BIN = svr
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/performance-tests/Cubit/Orbix/base_server/Makefile b/TAO/performance-tests/Cubit/Orbix/base_server/Makefile
index 36002f19199..47e25193c7b 100644
--- a/TAO/performance-tests/Cubit/Orbix/base_server/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/base_server/Makefile
@@ -14,6 +14,8 @@ SVR_OBJS = cubitS.o cubit_impl.o server.o
 
 LDLIBS	 = -lorbixmt
 
+VLDLIBS	 = $(LDLIBS:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/Orbix/client/Makefile b/TAO/performance-tests/Cubit/Orbix/client/Makefile
index 9b2e8f71a63..4600f50b145 100644
--- a/TAO/performance-tests/Cubit/Orbix/client/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/client/Makefile
@@ -14,6 +14,8 @@ CLT_OBJS = cubitC.o client.o
 
 LDLIBS	 = 
 
+VLDLIBS	 = $(LDLIBS:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/Orbix/factory_client/Makefile b/TAO/performance-tests/Cubit/Orbix/factory_client/Makefile
index afb3debd306..b1dfde41302 100644
--- a/TAO/performance-tests/Cubit/Orbix/factory_client/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/factory_client/Makefile
@@ -14,6 +14,8 @@ CLT_OBJS = cubitC.o client.o
 
 LDLIBS	 = 
 
+VLDLIBS	 = $(LDLIBS:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/Orbix/tpool/Makefile b/TAO/performance-tests/Cubit/Orbix/tpool/Makefile
index 7ec7ff2ee09..addb29d130c 100644
--- a/TAO/performance-tests/Cubit/Orbix/tpool/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/tpool/Makefile
@@ -14,6 +14,8 @@ SVR_OBJS = cubitS.o cubit_impl.o server.o tpool.o
 
 LDLIBS	 = 
 
+VLDLIBS	 = $(LDLIBS:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/Orbix/tpr/Makefile b/TAO/performance-tests/Cubit/Orbix/tpr/Makefile
index 222afc55c31..96fe70563a7 100644
--- a/TAO/performance-tests/Cubit/Orbix/tpr/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/tpr/Makefile
@@ -14,6 +14,8 @@ SVR_OBJS = cubitS.o cubit_impl.o server.o tpr.o
 
 LDLIBS	 = 
 
+VLDLIBS	 = $(LDLIBS:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/Orbix/tps/Makefile b/TAO/performance-tests/Cubit/Orbix/tps/Makefile
index f1ff326f867..ff12f24622d 100644
--- a/TAO/performance-tests/Cubit/Orbix/tps/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/tps/Makefile
@@ -14,6 +14,8 @@ SVR_OBJS = cubitS.o cubit_impl.o server.o tps.o
 
 LDLIBS	 = 
 
+VLDLIBS	 = $(LDLIBS:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
index 0881024b91a..76d415f9f11 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
@@ -26,6 +26,7 @@ CUBIT_CLT_OBJS = client.o
 CFLAGS += -I../IDL_Cubit
 
 BIN = client
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
@@ -50,10 +51,10 @@ include $(TAO_ROOT)/taoconfig.mk
 LDFLAGS += -L$(TAO_ROOT)/tao
 
 ifeq ($(CXX),cxx)
-  ifeq (use_ld_input,$(findstring use_ld_input,$(SOFLAGS)))
-    #### Digital Unix 4.0 or later
-    CCFLAGS += -ptr ../IDL_Cubit/cxx_repository
-  endif # DU 4.0 or later
+  ifeq ($(findstring ptrepository,$(CCFLAGS)),ptrepository)
+    #### Digital Unix 4.0
+    CCFLAGS += -ptr ../IDL_Cubit/ptrepository
+  endif # CCFLAGS contains ptrepository
 else
 ifeq (-xildoff,$(findstring -xildoff,$(LDFLAGS)))
   #### Sun CC
@@ -67,15 +68,11 @@ client: $(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 ../IDL_Cubit/server:
-	cd ../IDL_Cubit; $(MAKE) BIN=server
+	cd ../IDL_Cubit; $(MAKE) BUILD=server
 
 realclean: clean
 	-$(RM) cubitC.* cubitS.* cubitS_T.*
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 57248c3da3a..659acf576bb 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -92,41 +92,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (Cubit_Client_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
-
-// Bitmasks for each of the Cubit tests
-#define TAO_ENABLE_CUBIT_VOID              1 << 0
-#define TAO_ENABLE_CUBIT_OCTET             1 << 1
-#define TAO_ENABLE_CUBIT_SHORT             1 << 2
-#define TAO_ENABLE_CUBIT_LONG              1 << 3
-#define TAO_ENABLE_CUBIT_STRUCT            1 << 4
-#define TAO_ENABLE_CUBIT_UNION             1 << 5
-#define TAO_ENABLE_CUBIT_SMALL_OCTET_SEQ   1 << 6
-#define TAO_ENABLE_CUBIT_LARGE_OCTET_SEQ   1 << 7
-#define TAO_ENABLE_CUBIT_SMALL_LONG_SEQ    1 << 8
-#define TAO_ENABLE_CUBIT_LARGE_LONG_SEQ    1 << 9
-#define TAO_ENABLE_CUBIT_SMALL_STRUCT_SEQ  1 << 10
-#define TAO_ENABLE_CUBIT_LARGE_STRUCT_SEQ  1 << 11
-#define TAO_ENABLE_CUBIT_MIXIN             1 << 12
-#define TAO_ENABLE_CUBIT_RTI_DATA          1 << 13
-#define TAO_ENABLE_CUBIT_ONE_WAY           1 << 14
-// Bitmask to enable all tests
-#define TAO_ENABLE_CUBIT_ALL \
-        TAO_ENABLE_CUBIT_VOID | \
-        TAO_ENABLE_CUBIT_OCTET | \
-        TAO_ENABLE_CUBIT_SHORT | \
-        TAO_ENABLE_CUBIT_LONG | \
-        TAO_ENABLE_CUBIT_STRUCT | \
-        TAO_ENABLE_CUBIT_UNION | \
-        TAO_ENABLE_CUBIT_SMALL_OCTET_SEQ | \
-        TAO_ENABLE_CUBIT_LARGE_OCTET_SEQ | \
-        TAO_ENABLE_CUBIT_SMALL_LONG_SEQ | \
-        TAO_ENABLE_CUBIT_LARGE_LONG_SEQ | \
-        TAO_ENABLE_CUBIT_SMALL_STRUCT_SEQ | \
-        TAO_ENABLE_CUBIT_LARGE_STRUCT_SEQ | \
-        TAO_ENABLE_CUBIT_MIXIN | \
-        TAO_ENABLE_CUBIT_RTI_DATA |  \
-        TAO_ENABLE_CUBIT_ONE_WAY
-
 // Constructor.
 Cubit_Client::Cubit_Client (int testing_collocation, int shutdown)
   : cubit_factory_key_ (0),
@@ -137,8 +102,8 @@ Cubit_Client::Cubit_Client (int testing_collocation, int shutdown)
     error_count_ (0),
     cubit_factory_ior_file_ (0),
     f_handle_ (ACE_INVALID_HANDLE),
-    test_enable_bitset_ (0),
-    test_disable_bitset_ (0),
+    only_void_ (0),
+    only_oneway_ (0),
     testing_collocation_ (testing_collocation)
 {
 }
@@ -191,39 +156,18 @@ Cubit_Client::read_ior (const char *filename)
 int
 Cubit_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "t:z:ovdn:f:k:xs");
-  int c = 0;
-  int result = 0;
-  unsigned int test_mask = 0;
+  ACE_Get_Opt get_opts (argc_, argv_, "ovdn:f:k:xs");
+  int c;
+  int result;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
-      case 't':
-        test_mask = this->opt_to_mask (get_opts.optarg);
-        if (test_mask == 0)
-          return -1;
-        this->enable_test (test_mask);
-        break;
-      case 'z':
-        test_mask = this->opt_to_mask (get_opts.optarg);
-        if (test_mask == 0)
-          return -1;
-        this->disable_test (test_mask);
-        break;
       case 'v':
-        // For backward compatibility
-        test_mask = this->opt_to_mask ("void");
-        if (test_mask == 0)
-          return -1;
-        this->enable_test (test_mask);
+        this->only_void_ = 1;
         break;
       case 'o':
-        // For backward compatibility
-        test_mask = this->opt_to_mask ("one_way");
-        if (test_mask == 0)
-          return -1;
-        this->enable_test (test_mask);
+        this->only_oneway_ = 1;
         break;
       case 'd':  // debug flag
         TAO_debug_level++;
@@ -266,8 +210,6 @@ Cubit_Client::parse_args (void)
                            " [-k cubit-obj-ref-key]"
                            " [-x]"
                            " [-s]"
-                           " [-t test-to-enable]"
-                           " [-z test-to-disable]"
                            "\n",
                            this->argv_ [0]),
                           -1);
@@ -277,70 +219,6 @@ Cubit_Client::parse_args (void)
   return 0;
 }
 
-unsigned int
-Cubit_Client::opt_to_mask (const char *test_type)
-{
-  if (ACE_OS::strcasecmp (test_type, "void") == 0)
-    return TAO_ENABLE_CUBIT_VOID;
-  else if (ACE_OS::strcasecmp (test_type, "octet") == 0)
-    return TAO_ENABLE_CUBIT_OCTET;
-  else if (ACE_OS::strcasecmp (test_type, "short") == 0)
-    return TAO_ENABLE_CUBIT_SHORT;
-  else if (ACE_OS::strcasecmp (test_type, "long") == 0)
-    return TAO_ENABLE_CUBIT_LONG;
-  else if (ACE_OS::strcasecmp (test_type, "struct") == 0)
-    return TAO_ENABLE_CUBIT_STRUCT;
-  else if (ACE_OS::strcasecmp (test_type, "union") == 0)
-    return TAO_ENABLE_CUBIT_UNION;
-  else if (ACE_OS::strcasecmp (test_type, "small_octet_seq") == 0)
-    return TAO_ENABLE_CUBIT_SMALL_OCTET_SEQ;
-  else if (ACE_OS::strcasecmp (test_type, "small_long_seq") == 0)
-    return TAO_ENABLE_CUBIT_SMALL_LONG_SEQ;
-  else if (ACE_OS::strcasecmp (test_type, "small_struct_seq") == 0)
-    return TAO_ENABLE_CUBIT_SMALL_STRUCT_SEQ;
-  else if (ACE_OS::strcasecmp (test_type, "large_octet_seq") == 0)
-    return TAO_ENABLE_CUBIT_LARGE_OCTET_SEQ;
-  else if (ACE_OS::strcasecmp (test_type, "large_long_seq") == 0)
-    return TAO_ENABLE_CUBIT_LARGE_LONG_SEQ;
-  else if (ACE_OS::strcasecmp (test_type, "large_struct_seq") == 0)
-    return TAO_ENABLE_CUBIT_LARGE_STRUCT_SEQ;
-  else if (ACE_OS::strcasecmp (test_type, "mixin") == 0)
-    return TAO_ENABLE_CUBIT_MIXIN;
-  else if (ACE_OS::strcasecmp (test_type, "rti_data") == 0)
-    return TAO_ENABLE_CUBIT_RTI_DATA;
-  else if (ACE_OS::strcasecmp (test_type, "one_way") == 0)
-    return TAO_ENABLE_CUBIT_ONE_WAY;
-
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     "Incorrect test: %s\n"
-                     "Valid tests are:\n"
-                     "  void, octet, short, long, struct, union,\n"
-                     "  small_octet_seq, small_long_seq, small_struct_seq\n"
-                     "  large_octet_seq, large_long_seq, large_struct_seq\n"
-                     "  mixin, rti_data, one_way\n",
-                     test_type),
-                    0);  // Zero since unsigned int return type
-}
-
-void
-Cubit_Client::enable_test (unsigned int mask)
-{
-  ACE_SET_BITS (this->test_enable_bitset_, mask);
-}
-
-void
-Cubit_Client::disable_test (unsigned int mask)
-{
-  ACE_SET_BITS (this->test_disable_bitset_, mask);
-}
-
-
-int
-Cubit_Client::check_enabled (unsigned int mask) const
-{
-  return ACE_BIT_ENABLED (this->test_enable_bitset_, mask);
-}
-
 // Exercise the union.  Cube a union.
 
 void
@@ -1041,6 +919,12 @@ Cubit_Client::run ()
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
+  if (this->only_void_)
+    return this->run_void (ACE_TRY_ENV);
+
+  if (this->only_oneway_)
+    return this->run_oneway (ACE_TRY_ENV);
+
   u_int i;
 
   ACE_Profile_Timer timer;
@@ -1050,313 +934,268 @@ Cubit_Client::run ()
   // Show the results one type at a time.
 
   // VOID
-  if (this->check_enabled (TAO_ENABLE_CUBIT_VOID))
-    {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_void (i, 
-                           ACE_TRY_ENV);
-        }
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_void (i, 
+                       ACE_TRY_ENV);
+    }
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      this->print_stats ("cube_void", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_void", 
+                     elapsed_time);
 
   // SHORT
-  if (this->check_enabled (TAO_ENABLE_CUBIT_SHORT))
-    {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_short (i, 
-                            ACE_TRY_ENV);
-        }
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_short (i, 
+                        ACE_TRY_ENV);
+    }
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      this->print_stats ("cube_short", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_short", 
+                     elapsed_time);
 
   // OCTET
-  if (this->check_enabled (TAO_ENABLE_CUBIT_OCTET))
-    {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_octet (i, 
-                            ACE_TRY_ENV);
-        }
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_octet (i, 
+                        ACE_TRY_ENV);
+    }
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      this->print_stats ("cube_octet", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_octet", 
+                     elapsed_time);
 
   // LONG
-  if (this->check_enabled (TAO_ENABLE_CUBIT_LONG))
-    {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_long (i, 
-                           ACE_TRY_ENV);
-        }
-
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
-      this->print_stats ("cube_long", 
-                         elapsed_time);
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_long (i, 
+                       ACE_TRY_ENV);
     }
 
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
+  this->print_stats ("cube_long", 
+                     elapsed_time);
+
   // STRUCT
-  if (this->check_enabled (TAO_ENABLE_CUBIT_STRUCT))
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
+
+  for (i = 0; i < this->loop_count_; i++)
     {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+      this->cube_struct (i, 
+                         ACE_TRY_ENV);
+    }
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_struct (i, 
-                             ACE_TRY_ENV);
-        }
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
-
-      this->print_stats ("cube_struct", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_struct", 
+                     elapsed_time);
 
   // UNION
-  if (this->check_enabled (TAO_ENABLE_CUBIT_UNION))
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
+
+  for (i = 0; i < this->loop_count_; i++)
     {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+      this->cube_union (ACE_TRY_ENV);
+    }
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_union (ACE_TRY_ENV);
-        }
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
-
-      this->print_stats ("cube_union_stub call", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_union_stub call", 
+                     elapsed_time);
 
   // SMALL LONG SEQUENCES
-  if (this->check_enabled (TAO_ENABLE_CUBIT_SMALL_LONG_SEQ))
-    {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
 
-      for (i = 0; i < this->loop_count_; i++)
-        {
-          this->cube_long_sequence (this->loop_count_, 
-                                    4, 
-                                    ACE_TRY_ENV);
-        }
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_long_sequence (this->loop_count_, 
+                                4, 
+                                ACE_TRY_ENV);
+    }
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      this->print_stats ("cube_small_sequence<long>", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_small_sequence<long>", 
+                     elapsed_time);
 
   // LARGE LONG SEQUENCES
-  if (this->check_enabled (TAO_ENABLE_CUBIT_LARGE_LONG_SEQ))
-    {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_long_sequence (this->loop_count_, 
-                                    1024, 
-                                    ACE_TRY_ENV);
-        }
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_long_sequence (this->loop_count_, 
+                                1024, 
+                                ACE_TRY_ENV);
+    }
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      this->print_stats ("cube_large_sequence<long>", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_large_sequence<long>", 
+                     elapsed_time);
 
   // SMALL OCTET SEQUENCES
-  if (this->check_enabled (TAO_ENABLE_CUBIT_SMALL_OCTET_SEQ))
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
+
+  for (i = 0; i < this->loop_count_; i++)
     {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+      this->cube_octet_sequence (this->loop_count_, 
+                                 16, 
+                                 ACE_TRY_ENV);
+    }
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_octet_sequence (this->loop_count_, 
-                                     16, 
-                                     ACE_TRY_ENV);
-        }
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
-
-      this->print_stats ("cube_small_sequence<octet>", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_small_sequence<octet>", 
+                     elapsed_time);
 
   // LARGE OCTET SEQUENCES
-  if (this->check_enabled (TAO_ENABLE_CUBIT_LARGE_OCTET_SEQ))
-    {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_octet_sequence (this->loop_count_, 
-                                     4096, 
-                                     ACE_TRY_ENV);
-        }
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_octet_sequence (this->loop_count_, 
+                                 4096, 
+                                 ACE_TRY_ENV);
+    }
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      this->print_stats ("cube_large_sequence<octet>", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_large_sequence<octet>", 
+                     elapsed_time);
 
   // SMALL MANY SEQUENCES
-  if (this->check_enabled (TAO_ENABLE_CUBIT_SMALL_STRUCT_SEQ))
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
+
+  for (i = 0; i < this->loop_count_; i++)
     {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+      this->cube_many_sequence (this->loop_count_, 
+                                4, 
+                                ACE_TRY_ENV);
+    }
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_many_sequence (this->loop_count_, 
-                                    4, 
-                                    ACE_TRY_ENV);
-        }
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
+  this->print_stats ("cube_small_sequence<many>",
+                     elapsed_time);
 
-      this->print_stats ("cube_small_sequence<many>",
-                         elapsed_time);
-    }
+  // LARGE many SEQUENCES
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
 
-  // LARGE MANY SEQUENCES
-  if (this->check_enabled (TAO_ENABLE_CUBIT_LARGE_STRUCT_SEQ))
+  for (i = 0; i < this->loop_count_; i++)
     {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
-
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_many_sequence (this->loop_count_,
-                                    1024,
-                                    ACE_TRY_ENV);
-        }
+      this->cube_many_sequence (this->loop_count_, 
+                                1024, 
+                                ACE_TRY_ENV);
+    }
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      this->print_stats ("cube_large_sequence<many>", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_large_sequence<many>", 
+                     elapsed_time);
 
   // MIXIN
-  if (this->check_enabled (TAO_ENABLE_CUBIT_MIXIN))
-    {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_short (i, 
-                            ACE_TRY_ENV);
-          this->cube_octet (i, 
-                            ACE_TRY_ENV);
-          this->cube_long (i, 
-                           ACE_TRY_ENV);
-        }
-
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
-      this->print_stats ("cube mixin (short/octet/long)", 
-                         elapsed_time);
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_short (i, 
+                        ACE_TRY_ENV);
+      this->cube_octet (i, 
+                        ACE_TRY_ENV);
+      this->cube_long (i, 
+                       ACE_TRY_ENV);
     }
 
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
+  this->print_stats ("cube mixin (short/octet/long)", 
+                     elapsed_time);
+
   // RTI
-  if (this->check_enabled (TAO_ENABLE_CUBIT_RTI_DATA))
-    {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_rti_data (this->loop_count_, 
-                               2, 
-                               5, 
-                               ACE_TRY_ENV);
-        }
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_rti_data (this->loop_count_, 
+                           2, 
+                           5, 
+                           ACE_TRY_ENV);
+    }
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      this->print_stats ("cube_rti_data", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_rti_data", 
+                     elapsed_time);
 
   // ONEWAY
-  if (this->check_enabled (TAO_ENABLE_CUBIT_ONE_WAY))
-    {
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-      timer.start ();
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
 
-      for (i = 0; i < this->loop_count_; ++i)
-        {
-          this->cube_oneway (i, 
-                             ACE_TRY_ENV);
-        }
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_oneway (i, 
+                         ACE_TRY_ENV);
+    }
 
-      timer.stop ();
-      timer.elapsed_time (elapsed_time);
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
 
-      this->print_stats ("cube_oneway", 
-                         elapsed_time);
-    }
+  this->print_stats ("cube_oneway", 
+                     elapsed_time);
 
   this->shutdown_server (this->shutdown_,
                          ACE_TRY_ENV);
@@ -1442,6 +1281,81 @@ Cubit_Client::shutdown_server (int do_shutdown,
   return 0;
 }
 
+int
+Cubit_Client::run_oneway (CORBA::Environment &ACE_TRY_ENV)
+{
+  u_int i;
+
+  ACE_Profile_Timer timer;
+  ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
+  //  ACE_Time_Value before;
+
+
+  // ONEWAY
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
+
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_oneway (i, 
+                         ACE_TRY_ENV);
+    }
+
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
+
+  this->print_stats ("cube_oneway", 
+                     elapsed_time);
+
+  if (this->shutdown_)
+    {
+      ACE_DEBUG ((LM_DEBUG, 
+                  "shutdown on cubit object\n"));
+
+      this->cubit_->shutdown (ACE_TRY_ENV);
+    }
+
+  return this->error_count_ == 0 ? 0 : 1;
+}
+
+int
+Cubit_Client::run_void (CORBA::Environment &ACE_TRY_ENV)
+{
+  u_int i;
+
+  ACE_Profile_Timer timer;
+  ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
+  //  ACE_Time_Value before;
+
+  // VOID
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  timer.start ();
+
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_void (i, 
+                       ACE_TRY_ENV);
+    }
+
+  timer.stop ();
+  timer.elapsed_time (elapsed_time);
+
+  this->print_stats ("cube_void", 
+                     elapsed_time);
+
+  if (this->shutdown_)
+    {
+      ACE_DEBUG ((LM_DEBUG, 
+                  "shutdown on cubit object\n"));
+
+      this->cubit_->shutdown (ACE_TRY_ENV);
+    }
+
+  return this->error_count_ == 0 ? 0 : 1;
+}
+
 Cubit_Client::~Cubit_Client (void)
 {
   // Free resources and close the IOR files.
@@ -1495,17 +1409,6 @@ Cubit_Client::init (int argc, char **argv, const char *collocation_test_ior)
         {
           return -1;
         }
-      else
-        {
-          // Enable all tests if none were specified.
-          if (this->test_enable_bitset_ == 0)
-            this->enable_test (TAO_ENABLE_CUBIT_ALL);
-
-          // Disable tests that were explicitly disabled.
-          if (this->test_disable_bitset_ != 0)
-            this->test_enable_bitset_ &= ~this->test_disable_bitset_;
-        }
-
 
       if (collocation_test_ior != 0)
         {
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index bc1f6d2a4da..4f68d5cafd7 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -67,18 +67,6 @@ private:
   int parse_args (void);
   // Parses the arguments passed on the command line.
 
-  unsigned int opt_to_mask (const char *optarg);
-  // Obtain the bit mask representation of the specified test
-
-  void enable_test (unsigned int mask);
-  // Enable the specified test.
-
-  void disable_test (unsigned int mask);
-  // Disable the specified test.
-
-  int check_enabled (unsigned int mask) const;
-  // Check if the specified test has been enabled.
-
   void print_stats (const char *call_name,
                     ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
   // Prints the time stats.
@@ -126,6 +114,12 @@ private:
                       CORBA::Environment &ACE_TRY_ENV);
   // Cube a sequence <l> is the length of the sequence.
 
+  int run_void (CORBA::Environment &ACE_TRY_ENV);
+  // This method runs only the cube_void() test.
+
+  int run_oneway (CORBA::Environment &ACE_TRY_ENV);
+  // This method runs only the cube_oneway() test.
+
   int shutdown_server (int do_shutdown,
                        CORBA::Environment &ACE_TRY_ENV);
   // Invoke the method with <do_shutdown> != 0 to shutdown the server.
@@ -169,11 +163,11 @@ private:
   ACE_HANDLE f_handle_;
   // File handle to read the IOR.
 
-  unsigned int test_enable_bitset_;
-  // Bitset that determines which tests get run.
+  int only_void_;
+  // Run only the cube_void() test.
 
-  unsigned int test_disable_bitset_;
-  // Bitset that determines which tests do not get run.
+  int only_oneway_;
+  // Run only the cube_oneway() test.
 
   int testing_collocation_;
   // We are running the collocation test.
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index adba5a30843..9315f9be064 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -18,7 +18,7 @@ Cubit_Server::Cubit_Server (void)
 int
 Cubit_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "df:");
+  ACE_Get_Opt get_opts (argc_, argv_, "do:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -28,7 +28,7 @@ Cubit_Server::parse_args (void)
         TAO_debug_level++;
         break;
 
-      case 'f': // output the IOR to a file.
+      case 'o': // output the IOR to a file.
         this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -42,7 +42,7 @@ Cubit_Server::parse_args (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s"
                            " [-d]"
-                           " [-f] <ior_output_file>"
+                           " [-o] <ior_output_file>"
                            "\n",
                            argv_ [0]),
                           -1);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
index b0ecd1621bb..485bebfad68 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
@@ -52,6 +52,9 @@ COLLOCATION_OBJS = cubitC.o \
 BIN = server \
       client \
       collocation/collocation_test
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README
index bb41a392d52..1bca7dedcb2 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README
@@ -21,17 +21,17 @@ NOTES: The IDL_Cubit server used to run a Naming Service so the client
         the factory IOR between the server and the client.
 
 server:
-=======
+-------
 
-% server [-ORBEndpoint <endpoint>]
-         [-d] [-f <ior_output_file>]
+% server [-ORBendpoint <endpoint>]
+         [-d] [-o <ior_output_file>]
 
 Options:
 -------
 -d       Debug flag (It is additive more -d flags will increase
          the debugging level).
 
--f       Outputs the cubit_factory IOR to a file.
+-o       Outputs the cubit_factory IOR to a file.
 
 When the server is started and you have used the -d flag, you should
 see as the first line of output something that looks like the follow:
@@ -48,43 +48,23 @@ Using -d turns on debugging messages.  It is additive, i.e., the more
 silently ignored.
 
 client:
-=======
+-------
 
-% client [client options]
+% client [-d] [-x] <-f cubit_factory_ior_file> <-k cubit_factory_ior>  -n <iterations>
 
-IDL_Cubit Client Options:
--------------------------
+Options:
+-------
 -d      Debug flag
 -x      Tells the server to shutdown.
 -f      Reads the cubit factory IOR from the file
 -k      Reads the cubit factory IOR from commandline
 -n      no. of iterations
--t      Enable a test   (see below for a list of valid tests)
--z      Disable a test  (see below for a list of valid tests)
-
-Valid IDL_Cubit test arguments are:
-
-        void
-        octet
-        short
-        long
-        struct
-        union
-        small_octet_seq
-        small_long_seq
-        small_struct_seq
-        large_octet_seq
-        large_long_seq
-        large_struct_seq
-        mixin
-        rti_data
-        one_way
 
 The following are the three ways of giving the CubitFactory IOR to the
 client:
 
         1. From a file using the -f option. (This file can be produced using
-                the -f option of the server.)
+                the -o option of the server.)
 
         2. Directly on the commandline using the -k option.
 
@@ -97,7 +77,7 @@ collocation_test:
         This test demonstrates how collocation optimization improve
 performance of collocated objects.  Run the test without any argument
 to see results with collocation optimization.  Run it with
-<-ORBCollocation no> to perform the same test without the
+<-ORBcollocation no> to perform the same test without the
 optimization.  Notice that the executable of collocation_test is
 generated in the subdirectory ./collocation/.
 
@@ -125,7 +105,7 @@ Sample Run, Using files to communicate IOR:
 
 1. Start the server.
 
-% server -ORBEndpoint iiop://tango:20000 -ORBObjRefStyle URL -f theior
+% server -ORBendpoint iiop://tango:20000 -ORBobjrefstyle url -o theior
 
         IDL_Cubit:SERVER
 
@@ -146,18 +126,22 @@ Factory received OK
 Sample Run, passing the IOR on the command line, on VxWorks:
 ------------------------------------------------------------
     -> ld < server
-    -> spa server, "-ORBObjRefStyle", "URL"
+    -> spa main, "-ORBobjrefstyle", "url"
             IDL_Cubit: server
 
     The IOR is: <iiop://1.0@samba:1028/U/child_poa/factory>
 
     -> ld < client
-    -> spa client, "-k", "iiop://1.0@samba:1028/U/child_poa/factory"
+    -> spa main, "-k", "iiop://1.0@samba:1028/U/child_poa/factory"
     Enter <number> to select, anything else to stop: 2
 
 The IOR provided to the client is the IOR that the server printed out.
 Be sure to replace the <> with "".
 
+NOTE:  if you built your VxWorks executables with g++, replace "main"
+with "ace_main" above.  See ACE-INSTALL.html for an explanation of why
+ACE renames "main" to "ace_main" with g++ on VxWorks.
+
 
 Using JAVA to access the IDL Cubit test:
 ----------------------------------------
@@ -193,14 +177,14 @@ for ALL.
 
 server:
 ------
-$rsh host_name arun path_to_server -f path_to_ior_file -ORBDottedDecimalAddresses 1 <server_options>
+$rsh host_name arun path_to_server -o path_to_ior_file -ORBdotteddecimaladdresses 1 <server_options>
 
 You DONT have to use -ORBdotteddecimaladdresses 1 if you have
 TAO_USE_DOTTED_DECIMAL_ADDRESSES defined in your config.h file.
 
 e.g.,
-$rsh tambora1 arun /IDL_Cubit/server  -f /ior
--ORBDottedDecimalAddresses 1 -ORBObjRefStyle URL
+$rsh tambora1 arun /IDL_Cubit/server  -o /ior
+-ORBdotteddecimaladdresses 1 -ORBobjrefstyle url
 
 client:
 -------
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
index d4da7c16f51..f55349eacb9 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
@@ -1,11 +1,5 @@
 // $Id$
 
-#include "ace/inc_user_config.h"
-#if defined (VXWORKS)
-# undef ACE_MAIN
-# define ACE_MAIN client
-#endif /* VXWORKS */
-
 #include "Cubit_Client.h"
 #include "tao/Timeprobe.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
index a8c2a65e5ea..61310d9118f 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBReactorType select_st"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST -ORBConnectorLock null"
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
+static Resource_Factory "-ORBResources tss -ORBReactorType select_st"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null -ORBConnectorLock null"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index 80aef08262e..1b30bd26408 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -18,7 +18,7 @@ svr_worker (void *arg)
 
   int argc = 3;
   CORBA::String_var argv0 = CORBA::string_dup ("server");
-  CORBA::String_var argv1 = CORBA::string_dup ("-f");
+  CORBA::String_var argv1 = CORBA::string_dup ("-o");
   CORBA::String_var argv2 = CORBA::string_dup (THE_IOR_FILE);
   //CORBA::String_var argv3 = CORBA::string_dup ("-ORBCollocationStrategy");
   //CORBA::String_var argv4 = CORBA::string_dup ("direct");
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
index 9e1ec1e5d7c..c168a256343 100755
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
@@ -18,7 +18,7 @@ require ACEutils;
 
 $iorfile = "cubit.ior";
 $exepref = '.' . $DIR_SEPARATOR;
-$svnsflags = " -f $iorfile";
+$svnsflags = " -o $iorfile";
 $clnsflags = " -f $iorfile";
 $clflags = "";
 $svflags = "";
@@ -147,13 +147,13 @@ if ($OSNAME ne "MSWin32")
   $CL = Process::Create ($exepref . "client".$EXE_EXT,
                          " $clflags $clnsflags -x");
 
-  $client = $CL->TimedWait (120);
+  $client = $CL->TimedWait (60);
   if ($client == -1) {
     print STDERR "ERROR: client timedout\n";
     $CL->Kill (); $CL->TimedWait (1);
   }
 
-  $server = $SV->TimedWait (30);
+  $server = $SV->TimedWait (10);
   if ($server == -1) {
     print STDERR "ERROR: server timedout\n";
     $SV->Kill (); $SV->TimedWait (1);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index c9407a665c6..f4d37fd467b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -1,11 +1,5 @@
 // $Id$
 
-#include "ace/inc_user_config.h"
-#if defined (VXWORKS)
-# undef ACE_MAIN
-# define ACE_MAIN server
-#endif /* VXWORKS */
-
 #include "Cubit_Server.h"
 #include "tao/Timeprobe.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index 30ddeaec8b3..62099e50851 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
@@ -4,5 +4,5 @@
 #
 
 static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock thread -ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic
index 63da9842c39..0b49f7c36b1 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic
@@ -4,5 +4,5 @@
 #
 
 dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBResources global -ORBReactorlock null -ORBInputCDRAllocator null"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationofSystemIds 0"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() "-ORBProfileLock null -ORBClientConnectionHandler RW"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationofSystemIds 0"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf
deleted file mode 100644
index 845689fc35e..00000000000
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id$
-#
-# Please see $TAO_ROOT/docs/Options.html for details on these options.
-#
-
-static Resource_Factory "-ORBReactorType select_mt"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
deleted file mode 100644
index c7d3d8c7965..00000000000
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id$
-#
-# Please see $TAO_ROOT/docs/Options.html for details on these options.
-#
-
-static Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf
deleted file mode 100644
index 723cd557ac3..00000000000
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id$
-#
-# Please see $TAO_ROOT/docs/Options.html for details on these options.
-#
-
-static Resource_Factory "-ORBReactorType select_st  -ORBInputCDRAllocator null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
deleted file mode 100644
index 992b80929aa..00000000000
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Id$
-#
-# Please see $TAO_ROOT/docs/Options.html for details on these options.
-#
-# This configuration is almost safe for IDL_Cubit, it uses no locks
-# but runs with thread-per-connection, since there is only one client
-# the only problems are on shutdown.
-#
-
-static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 4ca127c1b53..98968dcf637 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -139,14 +139,6 @@ MT_Priority::get_low_priority (u_int num_low_priority,
   return -1;
 #else
   ACE_Sched_Priority low_priority = ACE_THR_PRI_FIFO_DEF;
-  int policy = ACE_SCHED_FIFO;
-
-  if (!ACE_BIT_ENABLED (GLOBALS::instance ()->thr_create_flags,
-			THR_SCHED_FIFO))
-    {
-      low_priority = ACE_THR_PRI_OTHER_DEF;
-      policy = ACE_SCHED_OTHER;
-    }
 
   // Drop the priority.
   if (use_multiple_priority)
@@ -154,7 +146,7 @@ MT_Priority::get_low_priority (u_int num_low_priority,
       this->num_priorities_ = 0;
 
       for (ACE_Sched_Priority_Iterator priority_iterator
-             (policy, ACE_SCOPE_THREAD);
+             (ACE_SCHED_FIFO, ACE_SCOPE_THREAD);
            priority_iterator.more ();
            priority_iterator.next ())
         this->num_priorities_++;
@@ -169,7 +161,7 @@ MT_Priority::get_low_priority (u_int num_low_priority,
            j++)
         {
           low_priority =
-            ACE_Sched_Params::previous_priority (policy,
+            ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
                                                  prev_priority,
                                                  ACE_SCOPE_THREAD);
           prev_priority = low_priority;
@@ -185,7 +177,7 @@ MT_Priority::get_low_priority (u_int num_low_priority,
     }
   else
     low_priority =
-      ACE_Sched_Params::previous_priority (policy,
+      ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
                                            prev_priority,
                                            ACE_SCOPE_THREAD);
   return low_priority;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
index f2e46643fbb..e475d61ae0d 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
@@ -50,6 +50,9 @@ CUBIT_CLIENT_OBJS = \
 	Timer.o
 
 BIN = server client
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index ce0c9eb230a..148c81799db 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -273,6 +273,7 @@ Client::Client (ACE_Thread_Manager *thread_manager,
     my_jitter_array_ (0),
     timer_ (0),
     frequency_ (0),
+    orb_ (0),
     latency_ (0),
     argc_ (argc),
     argv_ (argv)
@@ -552,11 +553,14 @@ Client::find_frequency (void)
         }
 }
 
-CORBA::ORB_ptr
-Client::init_orb (CORBA::Environment &ACE_TRY_ENV)
+int
+Client::init_orb (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "I'm thread %t\n"));
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "I'm thread %t\n"));
 
 
   // Convert the argv vector into a string.
@@ -578,13 +582,11 @@ Client::init_orb (CORBA::Environment &ACE_TRY_ENV)
   int argc = tmp_args2.argc ();
   char **argv = tmp_args2.argv ();
 
-  char orbid[64];
-  ACE_OS::sprintf (orbid, "orb:%d", this->id_);
-  CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        argv,
-                                        orbid,
-                                        ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::ORB::_nil ());
+  this->orb_ = CORBA::ORB_init (argc,
+                         argv,
+                         "internet",
+                         ACE_TRY_ENV);
+  ACE_TRY_CHECK;
 
   if (this->id_ == 0)
     {
@@ -594,14 +596,12 @@ Client::init_orb (CORBA::Environment &ACE_TRY_ENV)
       int result = this->ts_->parse_args (argc,
                                           argv);
       if (result != 0)
-        return CORBA::ORB::_nil ();
+        return -1;
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%t)Arguments parsed successfully\n"));
 
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ready_mon,
-                        this->ts_->ready_mtx_,
-                        CORBA::ORB::_nil ());
+      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ready_mon, this->ts_->ready_mtx_, 1);
       this->ts_->ready_ = 1;
       this->ts_->ready_cnd_.broadcast ();
       ready_mon.release ();
@@ -609,109 +609,129 @@ Client::init_orb (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_DEBUG ((LM_DEBUG,
               "(%t) ORB_init success\n"));
-  return orb._retn ();
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::Orb_init ()");
+      return -1;
+    }
+  ACE_ENDTRY;
+  return 0;
 }
 
 int
-Client::get_cubit (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV)
+Client::get_cubit (void)
 {
-  char *my_ior =
-    this->ts_->use_utilization_test_ == 1
-    ? this->ts_->one_ior_
-    : this->ts_->iors_[this->id_];
-
-  // If we are running the "1 to n" test make sure all low
-  // priority clients use only 1 low priority servant.
-  if (this->id_ > 0
-      && this->ts_->one_to_n_test_ == 1)
-    my_ior = this->ts_->iors_[1];
-
-  if (my_ior == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Must specify valid ior filename with -f option\n"),
-                      -1);
-
-  CORBA::Object_var objref =
-    orb->string_to_object (my_ior,
-                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil (objref.in ()))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%t) string_to_object Failed!\n"),
-                      -1);
-
-  // Narrow the CORBA::Object reference to the stub object,
-  // checking the type along the way using _is_a.
-  this->cubit_ = Cubit::_narrow (objref.in (),
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil (this->cubit_))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Create cubit failed\n"),
-                      -1);
+  CORBA::Object_var objref (0);
 
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) Binding succeeded\n"));
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      char *my_ior =
+        this->ts_->use_utilization_test_ == 1
+        ? this->ts_->one_ior_
+        : this->ts_->iors_[this->id_];
+
+      // If we are running the "1 to n" test make sure all low
+      // priority clients use only 1 low priority servant.
+      if (this->id_ > 0
+          && this->ts_->one_to_n_test_ == 1)
+        my_ior = this->ts_->iors_[1];
+
+      if (my_ior == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Must specify valid ior filename with -f option\n"),
+                          -1);
 
-  CORBA::String_var str =
-    orb->object_to_string (this->cubit_,
-                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-      
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) CUBIT OBJECT connected to <%s>\n",
-              str.in ()));
+      objref = this->orb_->string_to_object (my_ior,
+                                             ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (objref.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%t) string_to_object Failed!\n"),
+                          -1);
+
+      // Narrow the CORBA::Object reference to the stub object,
+      // checking the type along the way using _is_a.
+      this->cubit_ = Cubit::_narrow (objref.in (),
+                                     ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (this->cubit_))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Create cubit failed\n"),
+                          1);
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%t) Binding succeeded\n"));
+
+      CORBA::String_var str =
+        this->orb_->object_to_string (this->cubit_,
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%t) CUBIT OBJECT connected to <%s>\n",
+                  str.in ()));
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::get_cubit");
+      return -1;
+    }
+  ACE_ENDTRY;
   return 0;
 }
 
 int
 Client::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Initialize the ORB.
-      CORBA::ORB_var orb = this->init_orb (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Initialize the ORB.
+  int result = this->init_orb ();
+  if (result != 0)
+    return result;
 
-      // Find the frequency of CORBA requests based on thread id.
-      this->find_frequency ();
+  // Find the frequency of CORBA requests based on thread id.
+  this->find_frequency ();
 
-      // Get the cubit object from the file.
-      int r = this->get_cubit (orb.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (r != 0)
-        return r;
+  // Get the cubit object from the file.
+  result = this->get_cubit ();
+  if (result != 0)
+    return result;
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%t) Waiting for other threads to "
-                  "finish binding..\n"));
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t) Waiting for other threads to "
+              "finish binding..\n"));
 
-      // Wait for all the client threads to be initialized before going
-      // any further.
-      this->ts_->barrier_->wait ();
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%t; %D) Everyone's done, here I go!!\n"));
-      if (this->ts_->oneway_ == 1)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%t) **** USING ONEWAY CALLS ****\n"));
+  // Wait for all the client threads to be initialized before going
+  // any further.
+  this->ts_->barrier_->wait ();
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t; %D) Everyone's done, here I go!!\n"));
+  if (this->ts_->oneway_ == 1)
+    ACE_DEBUG ((LM_DEBUG,
+                "(%t) **** USING ONEWAY CALLS ****\n"));
 
-      // Perform the tests.
-      int result = this->run_tests ();
-      if (result != 0)
-        return result;
+  // Perform the tests.
+  result = this->run_tests ();
+  if (result != 0)
+    {
+      ACE_ERROR ((LM_ERROR, "(%t) Error occurred in run_test ()\n"));
+      return result;
+    }
 
-      // release the semaphore
-      if (this->ts_->thread_per_rate_ == 1
-          && this->id_ == this->ts_->thread_count_ - 1)
-        this->ts_->semaphore_->release (this->ts_->thread_count_ - 1);
-      else
-        this->ts_->semaphore_->release ();
+  // release the semaphore
+  if (this->ts_->thread_per_rate_ == 1
+      && this->id_ == this->ts_->thread_count_ - 1)
+    this->ts_->semaphore_->release (this->ts_->thread_count_ - 1);
+  else
+    this->ts_->semaphore_->release ();
 
-      // shutdown the server if necessary.
+  // shutdown the server if necessary.
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
       if (this->ts_->shutdown_)
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -719,16 +739,18 @@ Client::svc (void)
           this->cubit_->shutdown (ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
-
-      CORBA::release (this->cubit_);
-      this->cubit_ = 0;
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Task_Client::svc()");
+      ACE_ERROR ((LM_ERROR,
+                  "Shutdown of the server failed!\n"));
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "shutdown() call failed.\n");
     }
   ACE_ENDTRY;
 
+  // Delete dynamic memory
+  CORBA::release (this->cubit_);
+
   // To avoid a memPartFree on VxWorks.  It will leak memory, though.
   int status = 0;
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index d5e63b7e9bd..b966fd23942 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -10,8 +10,7 @@
 //    Task_Client.h
 //
 // = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, Sergio Flores-Gaitan, and
-//    Nagarajan Surendran.
+//    Andy Gokhale, Sumedh Mungee ,Sergio Flores-Gaitan and Nagarajan Surendran.
 //
 // ============================================================================
 
@@ -39,23 +38,21 @@
 #include "Timer.h"
 
 #if defined (CHORUS)
-# include "pccTimer.h"
+#include "pccTimer.h"
 #endif /* CHORUS */
 
 #if defined(ACE_HAS_EXCEPTIONS)
-  // Some plaforms define an exception structure in math.h...
-# if defined (__GNUG__)
-    // And some compilers have this workaround.  Disable it with this
-    // #define, to avoid warning about multiple #defines of exception.
-#   define _MATH_H_WRAPPER
-# endif /* __GNUG__ */
-# define exception _math_exception
-# include /**/ <math.h>
-# undef exception
+// Some plaforms define an exception structure in math.h...
+#define exception _math_exception
+#include /**/ <math.h>
+#undef exception
 #else
-# include /**/ <math.h>
+#include /**/ <math.h>
 #endif /* ACE_HAS_EXCEPTIONS */
 
+// I will integrate this, together with the sqrt() function when
+// the implementation is complete.  --Sergio.
+// levine 1 nov 98 % Note: I removed fabs () because we no longer use it.
 #if defined (ACE_LACKS_FLOATING_POINT)
 // The following is just temporary, until we finish the sqrt()
 // implementation.
@@ -277,14 +274,13 @@ public:
   // cubed.
 
 private:
-  CORBA::ORB_ptr init_orb (CORBA::Environment &ACE_TRY_ENV);
+  int init_orb (void);
   // initialize the ORB.
 
   void read_ior (void);
   // reads the cubit ior from a file.
 
-  int get_cubit (CORBA::ORB_ptr orb,
-                 CORBA::Environment &ACE_TRY_ENV);
+  int get_cubit (void);
   // gets the cubit object.
 
   int run_tests (void);
@@ -359,6 +355,9 @@ private:
   ACE_timer_t frequency_;
   // frequency of CORBA requests.
 
+  CORBA::ORB_var orb_;
+  // ORB pointer.
+
   ACE_timer_t latency_;
   // aggregate latency of the requests.
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index aad47cebb55..504159349e3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -1,11 +1,5 @@
 // $Id$
 
-#include "ace/inc_user_config.h"
-#if defined (VXWORKS)
-# undef ACE_MAIN
-# define ACE_MAIN client
-#endif /* VXWORKS */
-
 #include "ace/Sched_Params.h"
 #include "server.h"
 #include "client.h"
@@ -829,9 +823,17 @@ Client_i::do_thread_per_rate_test (void)
 // finish. After they aer done, we compute the latency and jitter
 // metrics and print them.
 
+#if defined (VXWORKS)
+extern "C"
+int
+client (int argc, char *argv[])
+{
+  ACE_Object_Manager ace_object_manager;
+#else
 int
 main (int argc, char *argv[])
 {
+#endif /* VXWORKS */
   ACE_Log_Msg::instance()->clr_flags (ACE_Log_Msg::LOGGER);
 
   Client_i client;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 99405a0534a..497d6dcb62f 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -16,12 +16,6 @@
 //
 // ============================================================================
 
-#include "ace/inc_user_config.h"
-#if defined (VXWORKS)
-# undef ACE_MAIN
-# define ACE_MAIN server
-#endif /* VXWORKS */
-
 #include "server.h"
 #include "ace/Sched_Params.h"
 
@@ -238,7 +232,7 @@ Server::activate_low_servants (void)
   // choose the remaining endpoints based on the protocol used in
   // the endpoint.
   //
-  // e.g.: orignal endpoint:    iiop://foobar:10001
+  // e.g.: orignal endpoint:    iiop://foobar:10001 
   //       random endpoint      iiop://
 
   const char protocol_delimiter[] = "://";
@@ -361,11 +355,28 @@ Server::start_servants (void)
   return 0;
 }
 
-
+// The main() function.
+#include "ace/streams.h"
+#if defined (VXWORKS)
+  // Rename main to server to make it easier to run both client and
+  // server on one target.
+extern "C"
+int
+server (int argc, char *argv[])
+{
+  ACE_Object_Manager ace_object_manager;
+#else
 int
 main (int argc, char *argv[])
 {
+#endif /* VXWORKS */
   int result;
+  //   ACE_Log_Msg::instance()->clr_flags (ACE_Log_Msg::OSTREAM);
+  //   ACE_Log_Msg::instance()->clr_flags (ACE_Log_Msg::STDERR);
+  //   ACE_Log_Msg::instance()->clr_flags (ACE_Log_Msg::LOGGER);
+  //  ofstream log ("server.log");
+  //  log.setf (ios::unitbuf);
+  //  ACE_Log_Msg::instance()->msg_ostream (&log);
 
   Server server;
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
index 0fbba74a93a..f8f49d4290c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBResources tss -ORBInputCDRAllocator null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
+static Resource_Factory "-ORBResources tss -ORBInputCDRAllocator tss"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Latency/Makefile b/TAO/performance-tests/Latency/Makefile
index 7e230178dee..7555d15b393 100644
--- a/TAO/performance-tests/Latency/Makefile
+++ b/TAO/performance-tests/Latency/Makefile
@@ -15,16 +15,31 @@ endif # ! TAO_ROOT
 LDLIBS = -lTAO
 
 IDLFILES = testC testS
-BIN = client st_client server st_server
+BIN = client server st-client
+
+ifdef AMI
+BIN += ami-latency-client ami-throughput-client
+endif # AMI
 
 SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
 
 CLIENT_OBJS = client.o testC.o
-ST_CLIENT_OBJS = st_client.o testC.o
+ST_CLIENT_OBJS = st-client.o testC.o
 SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
-ST_SERVER_OBJS = st_server.o test_i.o $(addsuffix .o, $(IDLFILES))
 
-TAO_IDLFLAGS += -Ge 1
+ifdef AMI
+AMI_LATENCY_CLIENT_OBJS = ami-latency-client.o testC.o
+AMI_THROUGHPUT_CLIENT_OBJS = ami-throughput-client.o testC.o
+endif # AMI
+
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+TAO_IDLFLAGS += -Ge 1 
+
+ifdef AMI
+TAO_IDLFLAGS += -GC
+endif # AMI
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -44,17 +59,22 @@ include $(TAO_ROOT)/taoconfig.mk
 
 .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
 
+server: $(addprefix $(VDIR),$(SERVER_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
 client: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-st_client: $(addprefix $(VDIR),$(ST_CLIENT_OBJS))
+st-client: $(addprefix $(VDIR),$(ST_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
+ifdef AMI
+ami-latency-client: $(addprefix $(VDIR),$(AMI_LATENCY_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-st_server: $(addprefix $(VDIR),$(ST_SERVER_OBJS))
+ami-throughput-client: $(addprefix $(VDIR),$(AMI_THROUGHPUT_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+endif # AMI
 
 realclean: clean
 	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
@@ -187,8 +207,7 @@ realclean: clean
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- testC.h \
+ $(ACE_ROOT)/ace/Sched_Params.i testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -287,6 +306,8 @@ realclean: clean
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -310,7 +331,6 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -340,10 +360,11 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
  testC.i
-.obj/st_client.o .obj/st_client.so .shobj/st_client.o .shobj/st_client.so: st_client.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h testS.h testC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -353,18 +374,15 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -388,6 +406,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
@@ -397,16 +420,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Stats.i \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
@@ -534,6 +547,8 @@ realclean: clean
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -557,7 +572,6 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -608,9 +622,27 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i
+.obj/st-client.o .obj/st-client.so .shobj/st-client.o .shobj/st-client.so: st-client.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -620,17 +652,20 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -638,13 +673,18 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -652,11 +692,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
@@ -666,38 +701,24 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -709,6 +730,56 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Stats.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i testC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -793,6 +864,8 @@ realclean: clean
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -816,7 +889,6 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -827,27 +899,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -867,24 +918,12 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ testC.i
+.obj/ami-latency-client.o .obj/ami-latency-client.so .shobj/ami-latency-client.o .shobj/ami-latency-client.so: ami-latency-client.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-.obj/st_server.o .obj/st_server.so .shobj/st_server.o .shobj/st_server.so: st_server.cpp test_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -894,17 +933,20 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -912,13 +954,18 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -926,11 +973,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
@@ -940,12 +982,74 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Stats.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i testS.h \
+ testC.h $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -957,21 +1061,226 @@ realclean: clean
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i
+.obj/ami-throughput-client.o .obj/ami-throughput-client.so .shobj/ami-throughput-client.o .shobj/ami-throughput-client.so: ami-throughput-client.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -983,6 +1292,56 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Stats.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i testS.h \
+ testC.h $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -1067,6 +1426,8 @@ realclean: clean
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -1090,7 +1451,6 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1101,27 +1461,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -1141,11 +1480,9 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1330,6 +1667,8 @@ realclean: clean
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -1353,7 +1692,6 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1404,6 +1742,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
  testC.i
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1589,6 +1929,8 @@ realclean: clean
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -1612,7 +1954,6 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1663,6 +2004,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
  testC.i testS_T.h testS_T.i testS_T.cpp testS.i
 .obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1848,6 +2191,8 @@ realclean: clean
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -1871,7 +2216,6 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1922,6 +2266,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
  testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Latency/README b/TAO/performance-tests/Latency/README
index 5f27d6dceff..9a3259d7d55 100644
--- a/TAO/performance-tests/Latency/README
+++ b/TAO/performance-tests/Latency/README
@@ -2,44 +2,37 @@
 
 Description:
 
-	This is a simple latency test, single threaded and
-multi-threaded clients and servers are included.
-
-= Thread pool test:
-
-	The server runs using a thread pool reactor, the client
-  creates several threads that send requests to the server and record
-  latency and throughput statistics.
+	This is a simple latency test, a server runs using a thread
+pool reactor, the client creates several threads that send requests to 
+the server and record latency and throughput statistics.
 
 	Command line options on the client and server can be used to
-  control the number of threads in the server and the client, the
-  amount work performed on each request, the number of requests per
-  thread, etc.
+control the number of threads in the server and the client, the amount
+work performed on each request, the number of requests per thread,
+etc.
 
-  - Expected output:
+Expected output:
 	The server prints out the IOR of the object it serves. The
-  client prints the results on a per-thread basis as well as the
-  aggregated numbers.
+client prints the results on a per-thread basis as well as the
+aggregated numbers.
 
-  - How to run:
+How to run:
 	You can use the run_test.pl script to run it or:
 
 $ server -ORBSvcConf server.conf -n 2
 $ client -ORBSvcConf client.conf -n 4 -i 1000
 
-= Single threaded test:
-
-	The server uses a regular (but lock-free) reactor, the client
-  uses a single thread to issue all the requests; since no extra
-  threads are created all the locks can be disabled, minimizing
-  latency.
+$ st-client -i 1000 -k file://ior_file -ORBdebuglevel 0 \ 
+        -ORBSvcConf client-st-exclusive.conf
 
-  - Expected output:
-	As in the multi-threaded test, the client only prints the
-  results for its single thread.
+$ ami-latency-client -k file://ior_file -i 1000 \
+        -ORBSvcConf client-st-muxed.conf
 
-  - How to run:
-	You can use the run_test.pl script or:
+AMI Throughput Test:
+==================
+$ server -o ior_file -ORBEndpoint iiop://localhost:port \
+        -ORBSvcConf server.conf
 
-$ st_server -ORBSvcConf st_server.conf
-$ st_client -ORBSvcConf st_client.conf -i 1000
+$ ami-throughput-client -s -k file://ior_file -i 1000 \
+                -ORBSvcConf client-st-muxed.conf \
+                -ORBPreconnect iiop://localhost:port
diff --git a/TAO/performance-tests/Latency/ami-latency-client.cpp b/TAO/performance-tests/Latency/ami-latency-client.cpp
new file mode 100644
index 00000000000..ba66e05a575
--- /dev/null
+++ b/TAO/performance-tests/Latency/ami-latency-client.cpp
@@ -0,0 +1,320 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+#include "ace/Stats.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/Sched_Params.h"
+#include "testS.h"
+
+ACE_RCSID(Latency, client, "$Id$")
+
+const char *ior = "file://test.ior";
+
+int niterations = 5;
+
+int sleep_flag = 0;
+
+ACE_hrtime_t latency_base;
+
+ACE_hrtime_t throughput_base;
+
+ACE_Throughput_Stats throughput_stats;
+// Global throughput statistics.
+
+ACE_Time_Value sleep_time (0, 10000);
+
+int done = 0;
+
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "k:n:i:s");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+        // case 'n':
+        // nthreads = ACE_OS::atoi (get_opts.optarg);
+        // break;
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.optarg);
+        break;
+      case 's':
+        sleep_flag = 1;
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           // "-n <nthreads> "
+                           "-i <niterations> "
+                           "-v "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+class Handler : public POA_AMI_Test_Handler
+{
+public:
+  Handler (void) {};
+
+  void test_method (CORBA::ULongLong stamp,
+                    CORBA::Environment&)
+    {
+      ACE_hrtime_t now = ACE_OS::gethrtime ();
+      throughput_stats.sample (now - throughput_base,
+                               now - stamp);
+
+      done = 1;
+    };
+
+  ~Handler (void) {};
+};
+
+class Client
+{
+  // = TITLE
+  //     Run the client thread.
+  //
+  // = DESCRIPTION
+  //     Use the ACE_Task_Base class to run the client threads.
+  //
+public:
+  Client (void);
+  // ctor
+
+  void set (Test_ptr server,
+            int niterations,
+            CORBA::ORB_ptr orb,
+            AMI_Test_Handler_ptr reply_handler);
+  // Set the test attributes.
+
+  void accumulate_into (ACE_Throughput_Stats &throughput) const;
+  // Accumulate the throughput statistics into <throughput>
+
+  void dump_stats (const char* msg, ACE_UINT32 gsf);
+  // Accumulate the throughput statistics into <throughput>
+
+  // = The ACE_Task_Base methods....
+  virtual int svc (void);
+
+private:
+  Test_var server_;
+  // The server.
+
+  int niterations_;
+  // The number of iterations on each client thread.
+
+  CORBA::ORB_ptr orb_;
+  // Cache the ORB pointer.
+
+  AMI_Test_Handler_ptr reply_handler_;
+  // ReplyHandler object.
+};
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      ACE_DEBUG ((LM_DEBUG, "High res. timer calibration...."));
+      ACE_High_Res_Timer::calibrate ();
+      ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var object =
+        orb->string_to_object (ior, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Test_var server =
+        Test::_narrow (object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (server.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Object reference <%s> is nil\n",
+                             ior),
+                            1);
+        }
+
+      // ReplyHandler object.
+      Handler handler;
+      AMI_Test_Handler_var reply_handler = handler._this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Activate POA to handle the call back.
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Client client;
+
+      // Init the client object.
+      client.set (server.in (),
+                  niterations,
+                  orb,
+                  reply_handler.in ());
+
+      // Start the test.
+      client.svc ();
+
+      ACE_Throughput_Stats throughput;
+      char buf[64];
+
+      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+
+      client.accumulate_into (throughput);
+
+      ACE_OS::sprintf (buf, "Single Threaded:AMI");
+      client.dump_stats (buf, gsf);
+
+      throughput.dump_results ("Aggregated", gsf);
+
+      // server->shutdown (ACE_TRY_ENV);
+      // ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Catched exception:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+// ****************************************************************
+
+Client::Client (void)
+  : niterations_ (0),
+    orb_ (0),
+    reply_handler_ (0)
+{
+}
+
+void
+Client::set (Test_ptr server,
+             int niterations,
+             CORBA::ORB_ptr orb,
+             AMI_Test_Handler_ptr reply_handler)
+{
+  this->server_ = Test::_duplicate (server);
+  this->niterations_ = niterations;
+  this->orb_ = orb;
+  this->reply_handler_ = reply_handler;
+}
+
+int
+Client::svc (void)
+{
+  ACE_TRY_NEW_ENV
+    {
+      // @@ We should use "validate_connection" for this.
+      for (int j = 0; j < 100; ++j)
+        {
+          server_->_is_a ("IDL:Test:1.0", ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+
+      // Init global throughput base.
+      throughput_base = ACE_OS::gethrtime ();
+
+      for (size_t i = 0; i < this->niterations_; ++i)
+        {
+          // Get timestamp.
+          latency_base = ACE_OS::gethrtime ();
+
+          // Invoke asynchronous operation.
+          server_->sendc_test_method (this->reply_handler_,
+                                      ACE_OS::gethrtime (),
+                                      ACE_TRY_ENV);
+
+          if (sleep_flag)
+            // Spend 10 msecs running the ORB.
+            this->orb_->run (sleep_time);
+          else
+            while (!done)
+              this->orb_->perform_work ();
+
+          ACE_TRY_CHECK;
+
+          if (TAO_debug_level > 0 && i % 100 == 0)
+            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
+
+          done = 0;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Latency: exception raised");
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+void
+Client::accumulate_into (ACE_Throughput_Stats &t) const
+{
+  t.accumulate (throughput_stats);
+}
+
+void
+Client::dump_stats (const char* msg, ACE_UINT32 gsf)
+{
+  throughput_stats.dump_results (msg, gsf);
+}
diff --git a/TAO/performance-tests/Latency/ami-throughput-client.cpp b/TAO/performance-tests/Latency/ami-throughput-client.cpp
new file mode 100644
index 00000000000..f8b3b95e892
--- /dev/null
+++ b/TAO/performance-tests/Latency/ami-throughput-client.cpp
@@ -0,0 +1,375 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+#include "ace/Stats.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/Sched_Params.h"
+#include "testS.h"
+
+ACE_RCSID(Latency, client, "$Id$")
+
+const char *ior = "file://test.ior";
+
+size_t niterations = 5;
+
+int sleep_flag = 0;
+
+int done = 0;
+
+ACE_hrtime_t *latency_base_array;
+
+ACE_hrtime_t throughput_base;
+
+ACE_Throughput_Stats throughput_stats;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "k:n:i:s");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+        // case 'n':
+        // nthreads = ACE_OS::atoi (get_opts.optarg);
+        // break;
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.optarg);
+        break;
+      case 's':
+        sleep_flag = 1;
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           // "-n <nthreads> "
+                           "-i <niterations> "
+                           "-s "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+// *********************************************************************
+
+class Handler : public POA_AMI_Test_Handler
+{
+public:
+  Handler (CORBA::ORB_ptr orb)
+    : nreplies_received_ (0),
+      orb_ (orb)
+    {};
+
+  void test_method (CORBA::ULongLong stamp,
+                    CORBA::Environment &)
+    {
+      // Get the currect time.
+      ACE_hrtime_t now = ACE_OS::gethrtime ();
+      int i = this->nreplies_received_;
+
+      if (TAO_debug_level > 0)
+        fprintf (stderr,
+                 "Latency %llu %llu %llu\n",
+                 now, stamp, latency_base_array[i]);
+
+      // Take the sample.
+      throughput_stats.sample (now - throughput_base,
+                               now - stamp);
+
+      if (TAO_debug_level > 0 && i % 100 == 0)
+        ACE_DEBUG ((LM_DEBUG, "(%P|%t) received = %d\n", i));
+
+      // Inc count.
+      this->nreplies_received_++;
+
+      // Check for end.
+      if (this->nreplies_received_ == niterations)
+        {
+          done = 1;
+          if (sleep_flag)
+            orb_->shutdown ();
+        }
+    };
+
+  ~Handler (void) {};
+
+private:
+  size_t nreplies_received_;
+  // Number of replies received so far.
+
+  CORBA::ORB_ptr orb_;
+  // ORB pointer.
+};
+
+// *********************************************************************
+
+class Reply_Handler_Task : public ACE_Task_Base
+{
+  // = TITLE
+  //     Run the thread handling the reply.
+  //
+  // = DESCRIPTION
+  //     Use the ACE_Task_Base class to run the reply handling.
+  //
+public:
+  Reply_Handler_Task (void);
+  // Constructor.
+
+  void set (Test_ptr server,
+            int niterations,
+            CORBA::ORB_ptr orb,
+            AMI_Test_Handler_ptr reply_handler);
+  // Set the test attributes.
+
+  void accumulate_into (ACE_Throughput_Stats &throughput) const;
+  // Accumulate the throughput statistics into <throughput>
+
+  void dump_stats (const char* msg, ACE_UINT32 gsf);
+  // Accumulate the throughput statistics into <throughput>
+
+  // = The ACE_Task_Base methods....
+  virtual int svc (void);
+
+private:
+  Test_var server_;
+  // The server.
+
+  int niterations_;
+  // The number of iterations on each client thread.
+
+  CORBA::ORB_ptr orb_;
+  // Cache the ORB pointer.
+
+  AMI_Test_Handler_ptr reply_handler_;
+  // ReplyHandler object.
+};
+
+// *********************************************************************
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      ACE_DEBUG ((LM_DEBUG, "High res. timer calibration...."));
+      ACE_High_Res_Timer::calibrate ();
+      ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var object =
+        orb->string_to_object (ior, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Test_var server =
+        Test::_narrow (object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (server.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Object reference <%s> is nil\n",
+                             ior),
+                            1);
+        }
+
+      // ReplyHandler object.
+      Handler handler (orb);
+      AMI_Test_Handler_var reply_handler = handler._this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Activate POA to handle the call back.
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Initiate the Handler task to receive replies.
+
+      Reply_Handler_Task reply_handler_task;
+
+      // Init the Reply Handler task.
+      reply_handler_task.set (server.in (),
+                              niterations,
+                              orb,
+                              reply_handler.in ());
+
+      // Activate Reply Handler task.
+      if (reply_handler_task.activate (THR_BOUND | THR_SCHED_FIFO | THR_NEW_LWP | THR_JOINABLE,
+                                       1,
+                                       1,
+                                       priority + 1) != 0)
+        {
+          int priority =
+            (ACE_Sched_Params::priority_min (ACE_SCHED_OTHER)
+             + ACE_Sched_Params::priority_max (ACE_SCHED_OTHER)) / 2;
+
+          // Retry in the regular class:
+          if (reply_handler_task.activate (THR_NEW_LWP | THR_JOINABLE,
+                                           1,
+                                           1,
+                                           priority + 1) != 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "%p\n",
+                                 "Cannot activate client threads"),
+                                1);
+            }
+        }
+
+      // Allocate memory for latency base array.
+      ACE_NEW_RETURN (latency_base_array,
+                      ACE_hrtime_t [niterations],
+                      1);
+
+      // Init global throughput base.
+      throughput_base = ACE_OS::gethrtime ();
+
+      // Issue asynchronous invocations.
+      for (size_t i = 0; i < niterations; ++i)
+        {
+          // Get timestamp.
+          latency_base_array [i] = ACE_OS::gethrtime ();
+
+          // Invoke asynchronous operation.
+          server->sendc_test_method (reply_handler.in (),
+                                     latency_base_array [i],
+                                     ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          if (TAO_debug_level > 0 && i % 100 == 0)
+            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
+        }
+
+      // Wait for the Reply Handler task.
+      ACE_Thread_Manager::instance ()->wait ();
+
+      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
+
+      // Output statistics.
+
+      ACE_Throughput_Stats throughput;
+      char buf[64];
+      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+
+      reply_handler_task.accumulate_into (throughput);
+
+      ACE_OS::sprintf (buf, "Reply Handler Thread");
+      reply_handler_task.dump_stats (buf, gsf);
+
+      throughput.dump_results ("Aggregated", gsf);
+
+      // server->shutdown (ACE_TRY_ENV);
+      // ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Catched exception:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+// ****************************************************************
+
+Reply_Handler_Task::Reply_Handler_Task (void)
+  : niterations_ (0),
+    orb_ (0),
+    reply_handler_ (0)
+{
+}
+
+void
+Reply_Handler_Task::set (Test_ptr server,
+                         int niterations,
+                         CORBA::ORB_ptr orb,
+                         AMI_Test_Handler_ptr reply_handler)
+{
+  this->server_ = Test::_duplicate (server);
+  this->niterations_ = niterations;
+  this->orb_ = orb;
+  this->reply_handler_ = reply_handler;
+}
+
+int
+Reply_Handler_Task::svc (void)
+{
+  if (sleep_flag)
+    { 
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - starting receiver thread [1]\n"));
+      // Spend 10 msecs running the ORB.
+      this->orb_->run ();
+    }
+  else
+    {
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - starting receiver thread [2]\n"));
+      while (!done)
+        this->orb_->perform_work ();
+    }
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) - finished receiver thread\n"));
+  return 0;
+}
+
+void
+Reply_Handler_Task::accumulate_into (ACE_Throughput_Stats &t) const
+{
+  t.accumulate (throughput_stats);
+}
+
+void
+Reply_Handler_Task::dump_stats (const char* msg, ACE_UINT32 gsf)
+{
+  throughput_stats.dump_results (msg, gsf);
+}
diff --git a/TAO/performance-tests/Latency/client-mt-exclusive.conf b/TAO/performance-tests/Latency/client-mt-exclusive.conf
new file mode 100644
index 00000000000..2a75162271c
--- /dev/null
+++ b/TAO/performance-tests/Latency/client-mt-exclusive.conf
@@ -0,0 +1,2 @@
+# $Id$
+static Client_Strategy_Factory "-ORBclientconnectionhandler MT"
diff --git a/TAO/performance-tests/Latency/client-st-exclusive.conf b/TAO/performance-tests/Latency/client-st-exclusive.conf
new file mode 100644
index 00000000000..9a6166dfbb3
--- /dev/null
+++ b/TAO/performance-tests/Latency/client-st-exclusive.conf
@@ -0,0 +1,4 @@
+# $Id$
+static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
+
diff --git a/TAO/performance-tests/Latency/client-st-muxed.conf b/TAO/performance-tests/Latency/client-st-muxed.conf
new file mode 100644
index 00000000000..57fe621c5f5
--- /dev/null
+++ b/TAO/performance-tests/Latency/client-st-muxed.conf
@@ -0,0 +1,5 @@
+# $Id$
+static Resource_Factory "-ORBResources global -ORBReactorType select_mt -ORBInputCDRAllocator null"
+static Client_Strategy_Factory "-ORBClientConnectionHandler ST -ORBTransportMuxStrategy MUXED"
+
+
diff --git a/TAO/performance-tests/Latency/client.cpp b/TAO/performance-tests/Latency/client.cpp
index 9190bbdaca6..f978698f01f 100644
--- a/TAO/performance-tests/Latency/client.cpp
+++ b/TAO/performance-tests/Latency/client.cpp
@@ -13,10 +13,14 @@ const char *ior = "file://test.ior";
 int nthreads = 5;
 int niterations = 5;
 
+int sleep_flag = 0;
+
+ACE_Time_Value sleep_time (0, 10000);
+
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:");
+  ACE_Get_Opt get_opts (argc, argv, "k:n:i:s");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -31,6 +35,9 @@ parse_args (int argc, char *argv[])
       case 'i':
         niterations = ACE_OS::atoi (get_opts.optarg);
         break;
+      case 's':
+        sleep_flag = 1;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -161,8 +168,8 @@ main (int argc, char *argv[])
         }
       throughput.dump_results ("Aggregated", gsf);
 
-      server->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      // server->shutdown (ACE_TRY_ENV);
+      // ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -204,15 +211,27 @@ Client::svc (void)
 
       for (int i = 0; i < this->niterations_; ++i)
         {
+          // Record current time.
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
-          server_->test_method (ACE_TRY_ENV);
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
 
-          ACE_TRY_CHECK;
+          // Invoke method.
+          server_->test_method (latency_base,
+                                ACE_TRY_ENV);
 
+          // Grab timestamp again.
+          ACE_hrtime_t now = ACE_OS::gethrtime ();
+
+          // Record statistics.
           this->throughput_.sample (now - throughput_base,
                                     now - latency_base);
 
+          ACE_TRY_CHECK;
+
+          // Sleep for 10 msecs.
+          if (sleep_flag)
+            ACE_OS::sleep (sleep_time);
+
+
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
         }
diff --git a/TAO/performance-tests/Latency/client.dsp b/TAO/performance-tests/Latency/client.dsp
index bd2d6b56451..bff0796f72f 100644
--- a/TAO/performance-tests/Latency/client.dsp
+++ b/TAO/performance-tests/Latency/client.dsp
@@ -7,23 +7,22 @@
 CFG=Latency Tests Client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

+!MESSAGE

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "client.mak" CFG="Latency Tests Client - Win32 Debug"

-!MESSAGE 

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Latency Tests Client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Latency Tests Client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

+!MESSAGE "Latency Tests Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Latency Tests Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -77,7 +76,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

@@ -117,7 +116,6 @@ SOURCE=.\test.idl
 !IF  "$(CFG)" == "Latency Tests Client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -156,7 +154,6 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "Latency Tests Client - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -192,7 +189,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

diff --git a/TAO/performance-tests/Latency/run_test.pl b/TAO/performance-tests/Latency/run_test.pl
index b12d2ee472a..f8034c1fde2 100755
--- a/TAO/performance-tests/Latency/run_test.pl
+++ b/TAO/performance-tests/Latency/run_test.pl
@@ -13,11 +13,6 @@ $server_conf="client.conf";
 $threads='4';
 
 $iorfile = "test.ior";
-
-print STDERR "================ Multi-threaded test\n";
-
-unlink $iorfile;
-
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
                        " -ORBSvcConf server.conf"
                        . " -o $iorfile -n $threads");
@@ -51,41 +46,4 @@ if ($server != 0 || $client != 0) {
   exit 1;
 }
 
-print STDERR "================ Single-threaded test\n";
-
-unlink $iorfile;
-
-$SV = Process::Create ($EXEPREFIX."st_server$EXE_EXT ",
-                       " -ORBSvcConf st_server.conf"
-                       . " -o $iorfile");
-
-if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL = Process::Create ($EXEPREFIX."st_client$EXE_EXT ",
-                       " -ORBSvcConf st_client.conf "
-                       . " -k file://$iorfile "
-                       . " -i 1000");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
-
-unlink $iorfile;
-
-if ($server != 0 || $client != 0) {
-  exit 1;
-}
-
 exit 0;
diff --git a/TAO/performance-tests/Latency/server.conf b/TAO/performance-tests/Latency/server.conf
index 0a9c9ed5cf6..4757e8f3a1a 100644
--- a/TAO/performance-tests/Latency/server.conf
+++ b/TAO/performance-tests/Latency/server.conf
@@ -1,3 +1,4 @@
 # $Id$
 #
-static Resource_Factory "-ORBReactorType tp"
+# static Resource_Factory "-ORBReactorType tp"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationOfSystemids 0" 
diff --git a/TAO/performance-tests/Latency/server.cpp b/TAO/performance-tests/Latency/server.cpp
index 721930c7a9e..1275c0212fa 100644
--- a/TAO/performance-tests/Latency/server.cpp
+++ b/TAO/performance-tests/Latency/server.cpp
@@ -21,22 +21,22 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case 'n':
-	nthreads = ACE_OS::atoi (get_opts.optarg);
-	break;
+        nthreads = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'w':
-	workload = ACE_OS::atoi (get_opts.optarg);
-	break;
+        workload = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -71,10 +71,14 @@ main (int argc, char *argv[])
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+                                              priority);
+  
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                              priority);
 
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
   if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
                                               priority,
                                               ACE_SCOPE_PROCESS)) != 0)
@@ -121,23 +125,23 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
 
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
diff --git a/TAO/performance-tests/Latency/server.dsp b/TAO/performance-tests/Latency/server.dsp
index 5fb100cc3a2..bc62e5435f0 100644
--- a/TAO/performance-tests/Latency/server.dsp
+++ b/TAO/performance-tests/Latency/server.dsp
@@ -7,23 +7,22 @@
 CFG=Latency Tests Server - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

+!MESSAGE

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "server.mak" CFG="Latency Tests Server - Win32 Debug"

-!MESSAGE 

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Latency Tests Server - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Latency Tests Server - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

+!MESSAGE "Latency Tests Server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Latency Tests Server - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -77,7 +76,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

@@ -133,7 +132,6 @@ SOURCE=.\test.idl
 !IF  "$(CFG)" == "Latency Tests Server - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -172,7 +170,6 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "Latency Tests Server - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -208,7 +205,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

diff --git a/TAO/performance-tests/Latency/st_client.cpp b/TAO/performance-tests/Latency/st-client.cpp
index 64aaa4593db..8e7b1444ead 100644
--- a/TAO/performance-tests/Latency/st_client.cpp
+++ b/TAO/performance-tests/Latency/st-client.cpp
@@ -1,20 +1,25 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Task.h"
 #include "ace/Stats.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Sched_Params.h"
 #include "testC.h"
 
-ACE_RCSID(Latency, st_client, "$Id$")
+ACE_RCSID(Latency, client, "$Id$")
 
 const char *ior = "file://test.ior";
-int niterations = 100;
+int niterations = 5;
+
+int sleep_flag = 0;
+
+ACE_Time_Value sleep_time (0, 10000);
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:");
+  ACE_Get_Opt get_opts (argc, argv, "k:n:i:s");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -26,11 +31,15 @@ parse_args (int argc, char *argv[])
       case 'i':
         niterations = ACE_OS::atoi (get_opts.optarg);
         break;
+      case 's':
+        sleep_flag = 1;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
                            "-k <ior> "
+                           "-n <nthreads> "
                            "-i <niterations> "
                            "\n",
                            argv [0]),
@@ -60,9 +69,9 @@ public:
 
   void dump_stats (const char* msg, ACE_UINT32 gsf);
   // Accumulate the throughput statistics into <throughput>
-  
+
+  // = The ACE_Task_Base methods....
   int svc (void);
-  // Run the test...
 
 private:
   Test_var server_;
@@ -128,16 +137,25 @@ main (int argc, char *argv[])
         }
 
       Client client;
+
       client.set (server.in (), niterations);
+
       client.svc ();
 
-      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
+      ACE_Throughput_Stats throughput;
 
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      client.dump_stats ("Single thread", gsf);
 
-      server->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      client.accumulate_into (throughput);
+
+      char buf[64];
+      ACE_OS::sprintf (buf, "Single Theaded:SMI");
+      client.dump_stats (buf, gsf);
+
+      throughput.dump_results ("Aggregated", gsf);
+
+      // server->shutdown (ACE_TRY_ENV);
+      // ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -179,15 +197,25 @@ Client::svc (void)
 
       for (int i = 0; i < this->niterations_; ++i)
         {
+          // Record current time.
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
-          server_->test_method (ACE_TRY_ENV);
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
 
-          ACE_TRY_CHECK;
+          // Invoke method.
+          server_->test_method (latency_base,ACE_TRY_ENV);
+
+          // Grab timestamp again.
+          ACE_hrtime_t now = ACE_OS::gethrtime ();
 
+          // Record statistics.
           this->throughput_.sample (now - throughput_base,
                                     now - latency_base);
 
+          ACE_TRY_CHECK;
+
+          // Sleep for 10 msecs.
+          if (sleep_flag)
+            ACE_OS::sleep (sleep_time);
+
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
         }
diff --git a/TAO/performance-tests/Latency/st_client.conf b/TAO/performance-tests/Latency/st_client.conf
deleted file mode 100644
index b846f12ee3d..00000000000
--- a/TAO/performance-tests/Latency/st_client.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id$
-#
-# Please see $TAO_ROOT/docs/Options.html for details on these options.
-#
-
-static Resource_Factory "-ORBresources global -ORBReactorType select_st -ORBInputCDRAllocator null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
diff --git a/TAO/performance-tests/Latency/st_server.conf b/TAO/performance-tests/Latency/st_server.conf
deleted file mode 100644
index 143de668d76..00000000000
--- a/TAO/performance-tests/Latency/st_server.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-#
-static Resource_Factory "-ORBresources global -ORBReactorType select_st  -ORBInputCDRAllocator null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Latency/test.idl b/TAO/performance-tests/Latency/test.idl
index fb5e94ff048..a6dbfc7005e 100644
--- a/TAO/performance-tests/Latency/test.idl
+++ b/TAO/performance-tests/Latency/test.idl
@@ -4,7 +4,9 @@
 
 interface Test
 {
-  void test_method ();
+  unsigned long long test_method (in unsigned long long stamp);
 
-  oneway void shutdown ();
+  // void time_stamp (inout unsigned long index);
+
+  // oneway void shutdown ();
 };
diff --git a/TAO/performance-tests/Latency/test_i.cpp b/TAO/performance-tests/Latency/test_i.cpp
index c95525d7e0a..0401c153c6b 100644
--- a/TAO/performance-tests/Latency/test_i.cpp
+++ b/TAO/performance-tests/Latency/test_i.cpp
@@ -9,8 +9,9 @@
 
 ACE_RCSID(Latency, test_i, "$Id$")
 
-void
-Test_i::test_method (CORBA::Environment&) ACE_THROW_SPEC (())
+CORBA::ULongLong
+Test_i::test_method (CORBA::ULongLong stamp,
+                     CORBA::Environment&) ACE_THROW_SPEC (())
 {
   ACE_Time_Value tv (0, 0);
   for (int i = 0; i != this->workload_; ++i)
@@ -19,6 +20,13 @@ Test_i::test_method (CORBA::Environment&) ACE_THROW_SPEC (())
       ACE::is_prime (n, 2, n / 2);
       ACE_OS::sleep (tv);
     }
+  return stamp;
+}
+
+void
+Test_i::time_stamp (CORBA::ULong &, CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
 }
 
 void
diff --git a/TAO/performance-tests/Latency/test_i.h b/TAO/performance-tests/Latency/test_i.h
index a98ff85285b..2bade099ff6 100644
--- a/TAO/performance-tests/Latency/test_i.h
+++ b/TAO/performance-tests/Latency/test_i.h
@@ -31,9 +31,14 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (CORBA::Environment&)
+  CORBA::ULongLong test_method (CORBA::ULongLong stamp,
+                                CORBA::Environment&)
     ACE_THROW_SPEC (());
 
+  void time_stamp (CORBA::ULong & index,
+                   CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
   void shutdown (CORBA::Environment&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/performance-tests/POA/Demux/Makefile b/TAO/performance-tests/POA/Demux/Makefile
index 2ac7e4d3a9d..fe6dd78f768 100644
--- a/TAO/performance-tests/POA/Demux/Makefile
+++ b/TAO/performance-tests/POA/Demux/Makefile
@@ -43,6 +43,7 @@ SRC     = $(addsuffix .cpp,$(SVR_FILES)) \
           $(addsuffix .cpp,$(STAT_FILE))
 
 BIN2 = server client
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #### If the TAO orbsvcs library wasn't built with sufficient components,
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
index a08ad6f60e9..eb017178a87 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
@@ -22,6 +22,9 @@ LSRC = $(PROG_SRCS)
 TEST_OBJS = testC.o testS.o registration.o
 
 BIN = registration
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Pluggable/Makefile b/TAO/performance-tests/Pluggable/Makefile
index 116c6daf007..1530a12d821 100644
--- a/TAO/performance-tests/Pluggable/Makefile
+++ b/TAO/performance-tests/Pluggable/Makefile
@@ -34,6 +34,9 @@ PP_TEST_CLT_OBJS = PP_TestC.o \
 
 BIN = server \
       client
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index 9d4c63047e7..26a667bca9b 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -285,6 +285,8 @@ PP_Test_Client::shutdown_server (int do_shutdown)
           ACE_DEBUG ((LM_DEBUG, 
                       "server, please ACE_OS::exit"));
         }
+
+      return 0;
     }
   ACE_CATCHANY
     {
@@ -294,7 +296,7 @@ PP_Test_Client::shutdown_server (int do_shutdown)
       return -1;
     }
   ACE_ENDTRY;
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
@@ -328,6 +330,8 @@ PP_Test_Client::run_oneway (void)
           ACE_DEBUG ((LM_DEBUG, 
                       "server, please ACE_OS::exit"));
         }
+
+      return this->error_count_ == 0 ? 0 : 1;
     }
   ACE_CATCHANY
     {
@@ -337,7 +341,7 @@ PP_Test_Client::run_oneway (void)
       return -1;
     }
   ACE_ENDTRY;
-  return this->error_count_ == 0 ? 0 : 1;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
@@ -371,6 +375,8 @@ PP_Test_Client::run_void (void)
           ACE_DEBUG ((LM_DEBUG, 
                       "server, please ACE_OS::exit"));
         }
+
+      return this->error_count_ == 0 ? 0 : 1;
     }
   ACE_CATCHANY
     {
@@ -380,7 +386,7 @@ PP_Test_Client::run_void (void)
       return -1;
     }
   ACE_ENDTRY;
-  return this->error_count_ == 0 ? 0 : 1;
+  ACE_NOTREACHED (return 0;)
 }
 
 PP_Test_Client::~PP_Test_Client (void)
@@ -466,6 +472,8 @@ PP_Test_Client::init (int argc, char **argv)
                              "null objref returned by factory\n"),
                             -1);
         }
+
+      return 0;
     }
   ACE_CATCHANY
     {
@@ -474,6 +482,6 @@ PP_Test_Client::init (int argc, char **argv)
       return -1;
     }
   ACE_ENDTRY;
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp
index 657fce2b66d..e9b86f8e4bd 100644
--- a/TAO/performance-tests/Pluggable/server.cpp
+++ b/TAO/performance-tests/Pluggable/server.cpp
@@ -19,8 +19,8 @@ main (int argc, char *argv[])
 
   ACE_TRY
     {
-      int status = pp_test_server.init (argc,
-                                        argv,
+      int status = pp_test_server.init (argc, 
+                                        argv, 
                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -35,6 +35,8 @@ main (int argc, char *argv[])
           pp_test_server.run (ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
+
+        return 0;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
@@ -52,6 +54,5 @@ main (int argc, char *argv[])
     }
   ACE_ENDTRY;
   ACE_TIMEPROBE_PRINT;
-
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
diff --git a/TAO/performance-tests/Thruput/COOL/Makefile b/TAO/performance-tests/Thruput/COOL/Makefile
index f7578ee27a8..1ffc61fd6cb 100644
--- a/TAO/performance-tests/Thruput/COOL/Makefile
+++ b/TAO/performance-tests/Thruput/COOL/Makefile
@@ -18,6 +18,8 @@ CLT_OBJS = client.o ttcp.o utils.o
 
 LDLIBS	 = -lm -lOrb-mt -lposix4
 
+VLDLIBS	 = $(LDLIBS:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Thruput/CORBAplus/Makefile b/TAO/performance-tests/Thruput/CORBAplus/Makefile
index 233d90d4c8e..8bad8861b30 100644
--- a/TAO/performance-tests/Thruput/CORBAplus/Makefile
+++ b/TAO/performance-tests/Thruput/CORBAplus/Makefile
@@ -21,6 +21,11 @@ TTCP_SERVER_OBJS = ttcp.o ttcp_s.o server.o ttcp_i.o utils.o
 
 BIN = client server
 
+BUILD = $(BIN)
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Thruput/TAO/Makefile b/TAO/performance-tests/Thruput/TAO/Makefile
index 04c991378d1..7c9d811027f 100644
--- a/TAO/performance-tests/Thruput/TAO/Makefile
+++ b/TAO/performance-tests/Thruput/TAO/Makefile
@@ -25,6 +25,11 @@ TTCP_SERVER_OBJS = ttcpC.o ttcpS.o server.o ttcp_i.o utils.o tmplinst.o
 
 BIN = client server
 
+BUILD = $(BIN)
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 53112d286ea..6085c158beb 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -17,16 +17,6 @@ ifndef TAO_IDL
   TAO_IDL = $(TAO_ROOT)/TAO_IDL/tao_idl
 endif
 
-ifdef COMSPEC
-  #### Assume we're on a WIN32 host.
-  ifndef CPP_LOCATION
-    #### Assume we have Bourne shell and sed.  Otherwise, the user
-    #### should find out here that the CPP_LOCATION environment
-    #### variable must be set explicitly!
-    CPP_LOCATION := $(shell type $(CXX) | sed 's/.* is //')
-  endif # ! CPP_LOCATION
-endif # ! CPP_LOCATION
-
 
 ####
 #### Macro customization.
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
index 6a6493049ce..f7d35cfaddd 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -26,8 +26,6 @@
 
 #include "tao/ORB_Core.h"
 #include "tao/Server_Strategy_Factory.h"
-#include "tao/Connector_Registry.h"
-#include "tao/debug.h"
 
 #if !defined(__ACE_INLINE__)
 #include "tao/Acceptor_Impl.i"
@@ -35,39 +33,41 @@
 
 ACE_RCSID(tao, Acceptor_Impl, "$Id$")
 
-////////////////////////////////////////////////////////////////////////////////
-
-template <class SVC_HANDLER>
-TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core)
+template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
+TAO_Acceptor_Impl<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open (TAO_ORB_Core* orb_core,
+                              const ACE_PEER_ACCEPTOR_ADDR &local_address,
+                              int flags,
+                              int use_select,
+                              int reuse_addr)
 {
+  this->orb_core_ = orb_core;
+  return this->ACE_Acceptor<SVC_HANDLER,ACE_PEER_ACCEPTOR_2>::open 
+    (local_address,
+     this->orb_core_->reactor (),
+     flags,
+     use_select,
+     reuse_addr);
 }
 
-template <class SVC_HANDLER> int
-TAO_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
+template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
+TAO_Acceptor_Impl<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler (SVC_HANDLER *&sh)
 {
   if (sh == 0)
-    ACE_NEW_RETURN (sh,
-                    SVC_HANDLER (this->orb_core_),
-                    -1);
+    {
+      if (this->orb_core_ == 0)
+        this->orb_core_ = TAO_ORB_Core_instance ();
 
+      ACE_NEW_RETURN (sh,
+                      SVC_HANDLER (this->orb_core_),
+                      -1);
+    }
   return 0;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-
-template <class SVC_HANDLER>
-TAO_Concurrency_Strategy<SVC_HANDLER>::TAO_Concurrency_Strategy (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core)
-{
-}
-
-template <class SVC_HANDLER> int
-TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
-                                                             void *arg)
+template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
+TAO_Acceptor_Impl<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler (SVC_HANDLER *sh)
 {
-  if (this->ACE_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (sh,
-                                                                         arg) == -1)
+  if (this->ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler (sh) == -1)
     return -1;
 
   TAO_Server_Strategy_Factory *f =
@@ -77,70 +77,8 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
     return sh->activate (f->server_connection_thread_flags (),
                          f->server_connection_thread_count ());
 
-  return this->orb_core_->reactor ()->register_handler
+  return this->reactor ()->register_handler 
     (sh, ACE_Event_Handler::READ_MASK);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::TAO_Accept_Strategy (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core)
-{
-}
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-                                                             int restart)
-{
-  int result = ACCEPT_STRATEGY_BASE::open (local_addr,
-                                           restart);
-
-  if (result == 0)
-    return result;
-
-  // If the error occured due to the fact that the open handle limit
-  // was exhausted, then purge some "old" connections.
-  result = this->out_of_sockets_handler ();
-  if (result == -1)
-    return -1;
-
-  // If we are able to purge, try again.
-  return ACCEPT_STRATEGY_BASE::open (local_addr, restart);
-}
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_HANDLER *svc_handler)
-{
-  int result = ACCEPT_STRATEGY_BASE::accept_svc_handler (svc_handler);
-
-  if (result == 0)
-    return result;
-
-  // If the error occured due to the fact that the open handle limit
-  // was exhausted, then purge some "old" connections.
-  this->out_of_sockets_handler ();
-
-  return result;
-}
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (void)
-{
-  if (ACE::out_of_handles (errno))
-    {
-      // Close some cached connections by explicitly purging the
-      // connection cache maintained by the connectors in the
-      // connector registry.
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Purging connections from Connectors in Connector Registry...\n"));
-
-      return this->orb_core_->connector_registry ()->purge_connections ();
-    }
-
-  return -1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 #endif /* TAO_ACCEPTOR_IMPL_C */
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h
index 063e05baf22..de100f75f2d 100644
--- a/TAO/tao/Acceptor_Impl.h
+++ b/TAO/tao/Acceptor_Impl.h
@@ -24,69 +24,49 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-template <class SVC_HANDLER>
-class TAO_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER>
+template<class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> class TAO_Acceptor_Impl : public ACE_Acceptor<SVC_HANDLER,ACE_PEER_ACCEPTOR_2>
 {
   // = TITLE
-  //     Creates a Svc_Handler and set the ORB_Core pointer on it.
+  //   Helper class to implement the acceptors in TAO
+  //
+  // = DESCRIPTION
+  //   TAO pluggable protocols framework provide an abstraction to
+  //   represent any kind of acceptor object, the implementation of
+  //   that acceptor is left for the pluggable protocol implementor,
+  //   but the most common case would be to use an ACE_Acceptor<>
+  //   instantiated over the right Svc_Handlers.
+  //   But the Svc_Handlers must inherit the <orb_core> that owns the
+  //   acceptor, though this could be implemented in each pluggable
+  //   protocol we believe that this class would simplify that task
+  //   and work in most cases.  Pluggable protocol implementors are,
+  //   of course, free to use something else.
+  //
 public:
-  TAO_Creation_Strategy (TAO_ORB_Core *orb_core);
+  // = Initialization and termination methods.
+  TAO_Acceptor_Impl (ACE_Reactor * = 0,
+                     int use_select = 1);
   // Constructor.
 
-  int make_svc_handler (SVC_HANDLER *&sh);
-  // Create a SVC_HANDLER  and set the ORB_Core pointer on it.
+  TAO_Acceptor_Impl (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+                     ACE_Reactor * = ACE_Reactor::instance (),
+                     int flags = 0,
+                     int use_select = 1,
+                     int reuse_addr = 1);
+  // The constructors, just delegate to the base class.
 
-protected:
-  TAO_ORB_Core *orb_core_;
-  // Pointer to the ORB Core.
-};
-
-template <class SVC_HANDLER>
-class TAO_Concurrency_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER>
-{
-  // = TITLE
-  //     Activates the Svc_Handler, and then if specified by the
-  //     TAO_Server_Strategy_Factory, it activates the Svc_Handler to
-  //     run in its own thread.
-public:
-  TAO_Concurrency_Strategy (TAO_ORB_Core *orb_core);
-  // Constructor.
-
-  int activate_svc_handler (SVC_HANDLER *svc_handler,
-                            void *arg);
-  // Activates the Svc_Handler, and then if specified by the
-  // TAO_Server_Strategy_Factory, it activates the Svc_Handler to run
-  // in its own thread.
+  int open (TAO_ORB_Core* orb_core,
+            const ACE_PEER_ACCEPTOR_ADDR &,
+            int flags = 0,
+            int use_select = 1,
+            int reuse_addr = 1);
+  // Initialize the ORB_Core.
 
 protected:
-  TAO_ORB_Core *orb_core_;
-  // Pointer to the ORB Core.
-};
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-class TAO_Accept_Strategy : public ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>
-{
-public:
-
-  TAO_Accept_Strategy (TAO_ORB_Core *orb_core);
-  // Constructor.
-
-  int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-            int restart = 0);
-  // Initialize the <peer_acceptor_> with <local_addr>.  If the
-  // process runs out of handles, purge some "old" connections.
-
-  int accept_svc_handler (SVC_HANDLER *svc_handler);
-  // Delegates to the <accept> method of the PEER_ACCEPTOR. If the
-  // process runs out of handles, purge some "old" connections.
-
-protected:
-  int out_of_sockets_handler (void);
-  // Handler which deals with purging "old" connections.
-
-  typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> ACCEPT_STRATEGY_BASE;
-  // Base class.
+  // = See $ACE_ROOT/ace/Acceptor.h for the documentation.
+  virtual int make_svc_handler (SVC_HANDLER *&sh);
+  virtual int activate_svc_handler (SVC_HANDLER *svc_handler);
 
+private:
   TAO_ORB_Core *orb_core_;
   // Pointer to the ORB Core.
 };
diff --git a/TAO/tao/Acceptor_Impl.i b/TAO/tao/Acceptor_Impl.i
index cfa1da318d3..7cafd44c6d7 100644
--- a/TAO/tao/Acceptor_Impl.i
+++ b/TAO/tao/Acceptor_Impl.i
@@ -1 +1,26 @@
 // $Id$
+
+template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_INLINE
+TAO_Acceptor_Impl<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::
+    TAO_Acceptor_Impl (ACE_Reactor *reactor,
+                       int use_select)
+  : ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> (reactor, use_select),
+    orb_core_ (0)
+{
+}
+
+template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_INLINE
+TAO_Acceptor_Impl<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::
+    TAO_Acceptor_Impl (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+                       ACE_Reactor * reactor,
+                       int flags,
+                       int use_select,
+                       int reuse_addr)
+  : ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> (local_addr,
+                                                    reactor,
+                                                    flags,
+                                                    use_select,
+                                                    reuse_addr),
+    orb_core_ (0)
+{
+}
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index c3be42fef06..67c38d5434c 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -257,22 +257,14 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core)
   TAO_ProtocolFactorySetItor end =
     orb_core->protocol_factories ()->end ();
 
-  // loop through all the loaded protocols...
+  // loop through loaded protocols looking for protocol_prefix
   for (TAO_ProtocolFactorySetItor i =
          orb_core->protocol_factories ()->begin ();
        i != end;
        ++i)
     {
-      // if the protocol requires an explicit -ORBendpoint option then 
-      // don't use it, otherwise open a default endpoint for that
-      // protocol, this solves the problem with persistent endpoints
-      // (such as UNIX domain rendesvouz points), that are not cleaned 
-      // up if the server crashes.
-      if (!(*i)->factory ()->requires_explicit_endpoint ())
-        {
-          if (this->open_default (orb_core, i) != 0)
-            return -1;
-        }
+      if (this->open_default (orb_core, i) != 0)
+        return -1;
     }
 
   return 0;
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index 09ccca9491e..b8d29e1dc69 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -21,11 +21,6 @@
 #define TAO_ACCEPTOR_REGISTRY_H
 
 #include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/corbafwd.h"
 #include "tao/Typecode.h"
 #include "tao/Resource_Factory.h"
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index f036e6cc5ed..2dab86bf915 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -19,11 +19,6 @@
 #define TAO_ANY_H
 
 #include "tao/CDR.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Environment.h"
 #include "tao/Object.h"
 
diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h
index d0206890101..6ec6a1f5518 100644
--- a/TAO/tao/Asynch_Invocation.h
+++ b/TAO/tao/Asynch_Invocation.h
@@ -14,7 +14,7 @@
 //
 // = AUTHOR
 //   Carlos O'Ryan <coryan@cs.wustl.edu> and Alexander Babu Arulanthu
-//   <alex@cs.wustl.edu>
+//   <alex@cs.wustl.edu> 
 //
 // ============================================================================
 
@@ -23,10 +23,6 @@
 
 #include "tao/Invocation.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
 #include "tao/MessagingC.h"
 
@@ -72,7 +68,7 @@ public:
 
   //   TAO_InputCDR &inp_stream (void);
   //   // Return the underlying input stream.
-  //
+  // 
   //   void get_value (CORBA::TypeCode_ptr tc,
   //                   void *value,
   //                   CORBA_Environment &TAO_IN_ENV =
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 5023c0284a4..54819e1c36b 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -45,11 +45,6 @@
 #define TAO_CDR_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Typecode.h"
 
 class TAO_ORB_Core;
diff --git a/TAO/tao/CDR_Interpreter.h b/TAO/tao/CDR_Interpreter.h
index 027cf34ee02..1151e54a9f6 100644
--- a/TAO/tao/CDR_Interpreter.h
+++ b/TAO/tao/CDR_Interpreter.h
@@ -22,10 +22,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 // Useful typedefs.
 typedef size_t TAO_attribute_calculator (TAO_InputCDR *stream,
                                          size_t &alignment,
@@ -110,13 +106,13 @@ public:
   static size_t calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
                                                 TAO_InputCDR *original_stream,
                                                 size_t &alignment,
-                                                CORBA_Environment &ACE_TRY_ENV =
+                                                CORBA_Environment &ACE_TRY_ENV = 
                                                   TAO_default_environment ());
   static size_t calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
                                                   TAO_InputCDR *stream,
                                                   CORBA::TCKind kind,
                                                   size_t &alignment,
-                                                  CORBA_Environment &ACE_TRY_ENV =
+                                                  CORBA_Environment &ACE_TRY_ENV = 
                                                     TAO_default_environment ());
   // For a given typecode, figure out its size and alignment needs.
   // This version is used mostly when traversing other typecodes, and
@@ -150,7 +146,7 @@ public:
   static size_t calc_struct_and_except_attributes (TAO_InputCDR *stream,
                                                    size_t &alignment,
                                                    CORBA::Boolean is_exception,
-                                                   CORBA_Environment &ACE_TRY_ENV =
+                                                   CORBA_Environment &ACE_TRY_ENV = 
                                                     TAO_default_environment ());
   // Given typecode bytes for a structure (or exception), figure out
   // its alignment and size; return size, alignment is an 'out'
@@ -169,7 +165,7 @@ public:
 
   static size_t calc_struct_attributes (TAO_InputCDR *stream,
                                         size_t &alignment,
-                                        CORBA_Environment &ACE_TRY_ENV =
+                                        CORBA_Environment &ACE_TRY_ENV = 
                                           TAO_default_environment ());
   // Calculate size and alignment for a structure.
 
@@ -177,7 +173,7 @@ public:
 #if defined (TAO_NO_COPY_OCTET_SEQUENCES)
   static size_t calc_seq_attributes (TAO_InputCDR *stream,
                                      size_t &alignment,
-                                     CORBA_Environment &ACE_TRY_ENV =
+                                     CORBA_Environment &ACE_TRY_ENV = 
                                       TAO_default_environment ());
   // Calculate size and alignment for a sequence, most of them have
   // the same requirements, but for the sequences of Octets that are
@@ -186,14 +182,14 @@ public:
 
   static size_t calc_exception_attributes (TAO_InputCDR *stream,
                                            size_t &alignment,
-                                           CORBA_Environment &ACE_TRY_ENV =
+                                           CORBA_Environment &ACE_TRY_ENV = 
                                             TAO_default_environment ());
   // Calculate size and alignment for an exception.
 
 
   static size_t calc_union_attributes (TAO_InputCDR *stream,
                                        size_t &alignment,
-                                       CORBA_Environment &ACE_TRY_ENV =
+                                       CORBA_Environment &ACE_TRY_ENV = 
                                         TAO_default_environment ());
   // Calculate size and alignment for a CORBA discriminated union.
   //
@@ -206,13 +202,13 @@ public:
 
   static size_t calc_alias_attributes (TAO_InputCDR *stream,
                                        size_t &alignment,
-                                       CORBA_Environment &ACE_TRY_ENV =
+                                       CORBA_Environment &ACE_TRY_ENV = 
                                         TAO_default_environment ());
   // Calculate size and alignment for a typedeffed type.
 
   static size_t calc_array_attributes (TAO_InputCDR *stream,
                                        size_t &alignment,
-                                       CORBA_Environment &ACE_TRY_ENV =
+                                       CORBA_Environment &ACE_TRY_ENV = 
                                         TAO_default_environment ());
   // Calculate size and alignment of an array.  (All such arrays are
   // described as single dimensional, even though the IDL definition
@@ -222,7 +218,7 @@ public:
   static CORBA::Boolean match_value (CORBA::TCKind kind,
                                      TAO_InputCDR *tc_stream,
                                      const void *value,
-                                     CORBA_Environment &ACE_TRY_ENV =
+                                     CORBA_Environment &ACE_TRY_ENV = 
                                       TAO_default_environment ());
   // Cast the discriminant values to the right type and compare them.
 
@@ -230,7 +226,7 @@ public:
   calc_key_union_attributes (TAO_InputCDR *stream,
                              size_t &overall_alignment,
                              size_t &discrim_size_with_pad,
-                             CORBA_Environment &ACE_TRY_ENV =
+                             CORBA_Environment &ACE_TRY_ENV = 
                               TAO_default_environment ());
 
 
diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
index 8d6411f972d..55ed1a5e707 100644
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ b/TAO/tao/Client_Strategy_Factory.cpp
@@ -19,7 +19,7 @@ TAO_Client_Strategy_Factory::create_profile_lock (void)
 }
 
 TAO_Transport_Mux_Strategy *
-TAO_Client_Strategy_Factory::create_transport_mux_strategy (TAO_ORB_Core *)
+TAO_Client_Strategy_Factory::create_transport_mux_strategy (TAO_Transport *)
 {
   return 0;
 }
@@ -29,9 +29,3 @@ TAO_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *)
 {
   return 0;
 }
-
-ACE_Lock *
-TAO_Client_Strategy_Factory::create_cached_connector_lock (void)
-{
-  return 0;
-}
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
index d4b0cbfdda5..2f799cfc7f8 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -19,10 +19,6 @@
 
 #include "ace/Service_Object.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/corbafwd.h"
 
 class ACE_Lock;
@@ -49,14 +45,11 @@ public:
   // <TAO_GIOP_Invocation::location_forward> and the
   // <TAO_GIOP_Invocation::start>.
 
-  virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_ORB_Core *orb_core);
+  virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport);
   // Create the correct client request muxing strategy.
 
   virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
   // Create the correct client <wait_for_reply> strategy.
-
-  virtual ACE_Lock *create_cached_connector_lock (void);
-  // Create the lock to be used by the cached connector.
 };
 
 #endif /* TAO_CLIENT_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 5a368c11210..c2d6eb18b48 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -111,7 +111,7 @@ int
 TAO_Connector_Registry::preconnect (TAO_ORB_Core *orb_core,
                                     TAO_PreconnectSet &preconnections)
 {
-  // Put the preconnects in a form that makes it simple for protocol
+  // Put the preconnects in a form that makes it simple for protocol 
   // implementers to parse.
   if (this->preprocess_preconnects (orb_core, preconnections) != 0)
     {
@@ -162,9 +162,9 @@ TAO_Connector_Registry::preprocess_preconnects (TAO_ORB_Core *orb_core,
   //   uiop://1.1@/tmp/foobar,/tmp/chicken,/tmp/soup
   //   iiop://1.0@localhost,1.1@mopbucket
   //
-  // The four elements in the preconnect set will be squeezed into two
+  // The four elements in the preconnect set will be squeezed into two 
   // elements, in this case. This is done to simplify the preconnect
-  // parsing code in each protocol specific connector and to make sure
+  // parsing code in each protocol specific connector and to make sure 
   // that all preconnections are established during the first
   // attempt.  Otherwise, secondary attempts to establish
   // preconnections will not be successful since all preconnections
@@ -401,26 +401,6 @@ TAO_Connector_Registry::object_key_delimiter (const char *ior)
   return 0;
 }
 
-int
-TAO_Connector_Registry::purge_connections (void)
-{
-  TAO_ConnectorSetItor end =
-    this->connectors_.end ();
-
-  TAO_ConnectorSetItor iterator =
-    this->connectors_.begin ();
-
-  for (;
-       iterator != end ;
-       iterator++)
-    {
-      if ((*iterator)->purge_connections () == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Node<TAO_Connector*>;
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index d5e39254b49..c2a7504a4c1 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -21,11 +21,6 @@
 #define TAO_CONNECTOR_REGISTRY_H
 
 #include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/corbafwd.h"
 #include "tao/Typecode.h"
 #include "tao/params.h"
@@ -103,13 +98,10 @@ public:
   // Obtain the object key delimiter used by the protocol specified in
   // the provided URL style IOR.
 
-  int purge_connections (void);
-  // Purge "old" connections.
-
 private:
   int preprocess_preconnects (TAO_ORB_Core *orb_core,
                               TAO_PreconnectSet &preconnects);
-  // Put the preconnects in a form that makes it simple for protocol
+  // Put the preconnects in a form that makes it simple for protocol 
   // implementers to parse.
 
 private:
diff --git a/TAO/tao/Context.h b/TAO/tao/Context.h
index 81bb68d36e2..e992f4d94fb 100644
--- a/TAO/tao/Context.h
+++ b/TAO/tao/Context.h
@@ -22,10 +22,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 class TAO_Export CORBA_Context
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 267f3951893..37d8d4c123d 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -32,10 +32,6 @@
 
 #include "tao/Object.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if defined(_MSC_VER)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index 8750d67984c..0dcf8fe11d2 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -27,10 +27,6 @@
 
 #include "tao/orbconf.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 #include "tao/corbafwd.h"
diff --git a/TAO/tao/DynAny_i.cpp b/TAO/tao/DynAny_i.cpp
index e7ccfafc6bd..bc1cbf0aaf9 100644
--- a/TAO/tao/DynAny_i.cpp
+++ b/TAO/tao/DynAny_i.cpp
@@ -739,15 +739,13 @@ TAO_DynAny_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
 CORBA::Any_ptr
 TAO_DynAny_i::get_any (CORBA::Environment& ACE_TRY_ENV)
 {
-  CORBA_Any_ptr tmp = 0;
+  CORBA_Any_var val;
 
-  ACE_NEW_THROW_EX (tmp,
+  ACE_NEW_THROW_EX (val.out (),
                     CORBA_Any,
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
-  CORBA_Any_var val = tmp;
-
   if (!(this->value_ >>= *val.out ()))
     {
       val = 0;
diff --git a/TAO/tao/DynAny_i.h b/TAO/tao/DynAny_i.h
index 3ecafe45dfd..e0305bb5898 100644
--- a/TAO/tao/DynAny_i.h
+++ b/TAO/tao/DynAny_i.h
@@ -19,10 +19,6 @@
 
 #include "tao/orbconf.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 #include "tao/corbafwd.h"
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp
index 99b0e42a76b..c241308ca64 100644
--- a/TAO/tao/DynUnion_i.cpp
+++ b/TAO/tao/DynUnion_i.cpp
@@ -104,18 +104,17 @@ TAO_DynUnion_i::~TAO_DynUnion_i (void)
 CORBA::Boolean
 TAO_DynUnion_i::set_as_default (CORBA::Environment& ACE_TRY_ENV)
 {
-  if ((CORBA::Long) this->current_index_
-      == this->type_->default_index (ACE_TRY_ENV))
+  if ((CORBA::Long) this->current_index_ == this->type_->default_index (ACE_TRY_ENV))
     return 1;
   else
     return 0;
 }
 
 void
-TAO_DynUnion_i::set_as_default (CORBA::Boolean /* set_as_default */,
-                                CORBA::Environment &)
+TAO_DynUnion_i::set_as_default (CORBA::Boolean set_as_default,
+                                CORBA::Environment&)
 {
-  // set_as_default should be treated as read-only and
+  // Set_as_default should be treated as read-only and
   // probably will be in a future spec. For now, since
   // the IDL compiler generated the virtual function,
   // we override it as a no-op.
diff --git a/TAO/tao/DynUnion_i.h b/TAO/tao/DynUnion_i.h
index 738fa7aa308..a595087d7b4 100644
--- a/TAO/tao/DynUnion_i.h
+++ b/TAO/tao/DynUnion_i.h
@@ -19,10 +19,6 @@
 
 #include "tao/orbconf.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 #include "tao/DynUnion_i_T.h"
@@ -240,7 +236,7 @@ private:
 
   class Char_extractor : public DU_Extractor_base
   {
-  public:
+  public: 
     CORBA::Boolean check_match (const CORBA_Any &inside_any,
                                 const CORBA_Any &outside_any);
   private:
diff --git a/TAO/tao/DynUnion_i_T.cpp b/TAO/tao/DynUnion_i_T.cpp
index d333840f89f..f216650db74 100644
--- a/TAO/tao/DynUnion_i_T.cpp
+++ b/TAO/tao/DynUnion_i_T.cpp
@@ -17,7 +17,6 @@
 #define TAO_DYNUNION_I_T_C
 
 #include "tao/DynUnion_i_T.h"
-#include "tao/Any.h"
 
 // Method of template class that serves as a functor for all that
 // compares Anys constructed from all legal discriminator types - some
diff --git a/TAO/tao/DynUnion_i_T.h b/TAO/tao/DynUnion_i_T.h
index 548c487ffa5..d8d941fb3ec 100644
--- a/TAO/tao/DynUnion_i_T.h
+++ b/TAO/tao/DynUnion_i_T.h
@@ -18,10 +18,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 class DU_Extractor_base
 {
   // = TITLE
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 4c63735ef29..e586cd5a534 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -271,10 +271,8 @@ CORBA_SystemException::_tao_errno (int errno_value)
       return TAO_ENOENT_MINOR_CODE;
     case EBADF:
       return TAO_EBADF_MINOR_CODE;
-#if (ENOSYS != EFAULT)
     case ENOSYS:
       return TAO_ENOSYS_MINOR_CODE;
-#endif /* ENOSYS != EFAULT */
     case EPERM:
       return TAO_EPERM_MINOR_CODE;
     case EAFNOSUPPORT:
@@ -291,8 +289,6 @@ CORBA_SystemException::_tao_errno (int errno_value)
       return TAO_EBUSY_MINOR_CODE;
     case EEXIST:
       return TAO_EEXIST_MINOR_CODE;
-    case EINVAL:
-      return TAO_EINVAL_MINOR_CODE;
     default:
       // Mask off bottom 7 bits and return them.
       return errno_value & 0x7F;
@@ -436,9 +432,6 @@ CORBA_SystemException::_info (void) const
         case TAO_EEXIST_MINOR_CODE:
           errno_indication = "EEXIST";
           break;
-        case TAO_EINVAL_MINOR_CODE:
-          errno_indication = "EINVAL";
-          break;
         default:
           {
             // 7 bits of some other errno.
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 92eff500cf8..93c199c070d 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -22,17 +22,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// This is used in the implementation of the _raise methods
-#if defined (TAO_HAS_EXCEPTIONS)
-#define TAO_RAISE(EXCEPTION) throw EXCEPTION
-#else
-#define TAO_RAISE(EXCEPTION)
-#endif /* TAO_HAS_EXCEPTIONS */
-
 class CORBA_Any;
 
 class TAO_Export CORBA_Exception
diff --git a/TAO/tao/Forwarding_Servant.h b/TAO/tao/Forwarding_Servant.h
index 20b2eb7022c..b093f1d28c6 100644
--- a/TAO/tao/Forwarding_Servant.h
+++ b/TAO/tao/Forwarding_Servant.h
@@ -21,10 +21,6 @@
 
 #include "tao/orbconf.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 #include "tao/Servant_Base.h"
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index 490cafc4964..ff8995e5190 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -227,43 +227,37 @@ TAO_GIOP::dump_msg (const char *label,
 {
   if (TAO_debug_level >= 5)
     {
+      // Message name.
       const char *message_name = "UNKNOWN MESSAGE";
       u_long slot = ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET];
       if (slot < sizeof (names)/sizeof(names[0]))
         message_name = names [slot];
+
+      // Byte order.
       int byte_order = ptr[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x01;
+      
+      // request/reply id.
+      CORBA::ULong tmp = 0;
+      CORBA::ULong *id = &tmp;
+      if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP::Request ||
+          ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP::Reply)
+        {
+          // @@ Only works if ServiceContextList is empty....
+          id = ACE_reinterpret_cast (CORBA::ULong *,
+                                     (char * ) (ptr + TAO_GIOP_HEADER_LEN + 4));
+        }
+
+      // Print.
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P | %t):%s GIOP v%c.%c msg, %d data bytes, %s endian, %s",
+                  "(%P | %t):%s GIOP v%c.%c msg, %d data bytes, %s endian, %s = %d\n",
                   label,
                   digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]],
                   digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]],
                   len - TAO_GIOP_HEADER_LEN,
                   (byte_order == TAO_ENCAP_BYTE_ORDER) ? "my" : "other",
-                  message_name));
-
-      if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP::Request)
-        {
-          // @@ Only works if ServiceContextList is empty....
-          const CORBA::ULong *request_id =
-            ACE_reinterpret_cast (const CORBA::ULong *,
-                                  ptr + TAO_GIOP_HEADER_LEN + 4);
-          ACE_DEBUG ((LM_DEBUG,
-                      " = %d\n",
-                      *request_id));
-        }
-      else if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP::Reply)
-        {
-          const CORBA::ULong *request_id =
-            ACE_reinterpret_cast (const CORBA::ULong *,
-                                  ptr + TAO_GIOP_HEADER_LEN + 4);
-          ACE_DEBUG ((LM_DEBUG,
-                      " = %d\n",
-                      *request_id));
-        }
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    "\n"));
-
+                  message_name,
+                  *id));
+      
       if (TAO_debug_level >= 10)
         ACE_HEX_DUMP ((LM_DEBUG,
                        (const char *) ptr,
@@ -879,7 +873,8 @@ int
 TAO_GIOP::process_server_message (TAO_Transport *transport,
                                   TAO_ORB_Core *orb_core,
                                   TAO_InputCDR &input,
-                                  const TAO_GIOP_Message_State &state)
+                                  const CORBA::Octet &message_type,
+                                  const TAO_GIOP_Version &giop_version)
 {
   char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
 #if defined(ACE_HAS_PURIFY)
@@ -897,8 +892,8 @@ TAO_GIOP::process_server_message (TAO_Transport *transport,
                         orb_core->to_unicode ());
 
   TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END);
-
-  switch (state.message_type)
+  
+  switch (message_type)
     {
     case TAO_GIOP::Request:
       // The following two routines will either raise an exception
@@ -907,14 +902,14 @@ TAO_GIOP::process_server_message (TAO_Transport *transport,
                                                orb_core,
                                                input,
                                                output,
-                                               state.giop_version);
+                                               giop_version);
 
     case TAO_GIOP::LocateRequest:
       return TAO_GIOP::process_server_locate (transport,
                                               orb_core,
                                               input,
                                               output,
-                                              state.giop_version);
+                                              giop_version);
 
     case TAO_GIOP::MessageError:
       if (TAO_debug_level > 0)
@@ -932,7 +927,7 @@ TAO_GIOP::process_server_message (TAO_Transport *transport,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO (%P|%t) Illegal message received by server\n"));
-      return TAO_GIOP::send_error (state.giop_version, transport);
+      return TAO_GIOP::send_error (giop_version, transport);
     }
 
   TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END);
@@ -983,17 +978,10 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
                                  0,
                                  0);
 
-          // @@ This debugging output should *NOT* be used since the
-          //    object key string is not null terminated, nor can it
-          //    be null terminated without copying.  No copying should 
-          //    be done since performance is somewhat important here.
-          //    So, just remove the debugging output entirely.
-          //
-          //           if (TAO_debug_level > 0)
-          //             ACE_DEBUG ((LM_DEBUG,
-          //                         "Simple Object key %s. "
-          //                         "Doing the Table Lookup ...\n",
-          //                         object_id.c_str ()));
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "Simple Object key %s. Doing the Table Lookup ...\n",
+                        object_id.c_str ()));
 
           CORBA::Object_ptr object_reference =
             CORBA::Object::_nil ();
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
index 1386791b8e7..52fef3fc723 100644
--- a/TAO/tao/GIOP.h
+++ b/TAO/tao/GIOP.h
@@ -189,7 +189,7 @@ public:
   // Constructor.
   // The parameters are used to initialize the InputCDR stream
 
-  void reset (int reset_contents = 1);
+  void reset (void);
   // Reset the message header state and prepare it to receive the next
   // event.
   // already read.
@@ -479,11 +479,13 @@ public:
                           TAO_GIOP_ServiceContextList& reply_ctx,
                           CORBA::ULong& request_id,
                           CORBA::ULong& reply_status);
+
   static int process_server_message (TAO_Transport *transport,
                                      TAO_ORB_Core *orb_core,
                                      TAO_InputCDR &input,
-                                     const TAO_GIOP_Message_State& state);
-
+                                     const CORBA::Octet &message_type,
+                                     const TAO_GIOP_Version &giop_version);
+  
   static int process_server_request (TAO_Transport *transport,
                                      TAO_ORB_Core* orb_core,
                                      TAO_InputCDR &input,
diff --git a/TAO/tao/GIOP.i b/TAO/tao/GIOP.i
index 75b3fa19eab..f04f67a3295 100644
--- a/TAO/tao/GIOP.i
+++ b/TAO/tao/GIOP.i
@@ -63,13 +63,12 @@ TAO_GIOP_Version::operator!= (const TAO_GIOP_Version &src)
 // ****************************************************************
 
 ACE_INLINE void
-TAO_GIOP_Message_State::reset (int reset_contents)
+TAO_GIOP_Message_State::reset (void)
 {
   this->message_size = 0;
   this->current_offset = 0;
   this->more_fragments = 0;
-  if (reset_contents)
-    this->cdr.reset_contents ();
+  this->cdr.reset_contents ();
 }
 
 ACE_INLINE int
diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp
index 14d91565b0f..4aec0252627 100644
--- a/TAO/tao/GIOP_Server_Request.cpp
+++ b/TAO/tao/GIOP_Server_Request.cpp
@@ -10,7 +10,6 @@
 #include "tao/NVList.h"
 #include "tao/Principal.h"
 #include "tao/ORB_Core.h"
-#include "tao/ORB.h"
 #include "tao/Timeprobe.h"
 #include "tao/Any.h"
 
diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h
index 8aecef49e3a..5d6b4269b9f 100644
--- a/TAO/tao/GIOP_Server_Request.h
+++ b/TAO/tao/GIOP_Server_Request.h
@@ -22,11 +22,6 @@
 #define TAO_GIOP_SERVER_REQUEST_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Server_Request.h"
 #include "tao/Principal.h"
 
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index a9d0df1dcdb..bde9b999deb 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -32,21 +32,11 @@ ACE_RCSID(tao, IIOP_Acceptor, "$Id$")
 TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void)
   : TAO_Acceptor (TAO_IOP_TAG_INTERNET_IOP),
     base_acceptor_ (),
-    creation_strategy_ (0),
-    concurrency_strategy_ (0),
-    accept_strategy_ (0),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
     orb_core_ (0)
 {
 }
 
-TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
-{
-  delete this->creation_strategy_;
-  delete this->concurrency_strategy_;
-  delete this->accept_strategy_;
-}
-
 // TODO =
 //    2) For V1.[1,2] there are tagged components
 //    3) Create multiple profiles for wild carded endpoints (may be multiple
@@ -152,23 +142,7 @@ TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
 {
   this->orb_core_ = orb_core;
 
-  ACE_NEW_RETURN (this->creation_strategy_,
-                  TAO_IIOP_CREATION_STRATEGY (this->orb_core_),
-                  -1);
-
-  ACE_NEW_RETURN (this->concurrency_strategy_,
-                  TAO_IIOP_CONCURRENCY_STRATEGY (this->orb_core_),
-                  -1);
-
-  ACE_NEW_RETURN (this->accept_strategy_,
-                  TAO_IIOP_ACCEPT_STRATEGY (this->orb_core_),
-                  -1);
-
-  if (this->base_acceptor_.open (addr,
-                                 this->orb_core_->reactor (),
-                                 this->creation_strategy_,
-                                 this->accept_strategy_,
-                                 this->concurrency_strategy_) == -1)
+  if (this->base_acceptor_.open (orb_core, addr) == -1)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -237,26 +211,12 @@ TAO_IIOP_Acceptor::endpoint_count (void)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Acceptor<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Accept_Strategy<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Creation_Strategy<TAO_IIOP_Server_Connection_Handler>;
-template class ACE_Concurrency_Strategy<TAO_IIOP_Server_Connection_Handler>;
-template class ACE_Scheduling_Strategy<TAO_IIOP_Server_Connection_Handler>;
-template class TAO_Creation_Strategy<TAO_IIOP_Server_Connection_Handler>;
-template class TAO_Concurrency_Strategy<TAO_IIOP_Server_Connection_Handler>;
-template class TAO_Accept_Strategy<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Acceptor<TAO_IIOP_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>;
+template class TAO_Acceptor_Impl<TAO_IIOP_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Acceptor<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_IIOP_Server_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_IIOP_Server_Connection_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<TAO_IIOP_Server_Connection_Handler>
-#pragma instantiate TAO_Creation_Strategy<TAO_IIOP_Server_Connection_Handler>
-#pragma instantiate TAO_Concurrency_Strategy<TAO_IIOP_Server_Connection_Handler>
-#pragma instantiate TAO_Accept_Strategy<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Acceptor<TAO_IIOP_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>
+#pragma instantiate TAO_Acceptor_Impl<TAO_IIOP_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index c45e93d7fbd..79f3d6b96e0 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -21,11 +21,6 @@
 #define TAO_IIOP_ACCEPTOR_H
 
 #include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/IIOP_Connect.h"
 #include "tao/Acceptor_Impl.h"
 
@@ -43,11 +38,11 @@ class TAO_Export TAO_IIOP_Acceptor : public TAO_Acceptor
   //   The IIOP-specific bridge class for the concrete acceptor.
   //
 public:
-  TAO_IIOP_Acceptor (void);
-  // Constructor.
+  // TAO_IIOP_Acceptor (ACE_INET_Addr &addr);
+  // Create Acceptor object using addr.
 
-  ~TAO_IIOP_Acceptor (void);
-  // Destructor.
+  TAO_IIOP_Acceptor (void);
+  // Create Acceptor object using addr.
 
   virtual int open (TAO_ORB_Core *orb_core,
                     int version_major,
@@ -79,10 +74,7 @@ public:
   // @@ Helper method for the implementation repository, should go
   //    away
 
-  typedef ACE_Strategy_Acceptor<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_BASE_ACCEPTOR;
-  typedef TAO_Creation_Strategy<TAO_IIOP_Server_Connection_Handler> TAO_IIOP_CREATION_STRATEGY;
-  typedef TAO_Concurrency_Strategy<TAO_IIOP_Server_Connection_Handler> TAO_IIOP_CONCURRENCY_STRATEGY;
-  typedef TAO_Accept_Strategy<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_ACCEPT_STRATEGY;
+  typedef TAO_Acceptor_Impl<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_BASE_ACCEPTOR;
 
 private:
   int open_i (TAO_ORB_Core* orb_core,
@@ -93,11 +85,6 @@ private:
   TAO_IIOP_BASE_ACCEPTOR base_acceptor_;
   // the concrete acceptor, as a pointer to it's base class.
 
-  TAO_IIOP_CREATION_STRATEGY *creation_strategy_;
-  TAO_IIOP_CONCURRENCY_STRATEGY *concurrency_strategy_;
-  TAO_IIOP_ACCEPT_STRATEGY *accept_strategy_;
-  // Acceptor strategies.
-
   ACE_INET_Addr address_;
   ACE_CString host_;
   // Cache the information about the endpoint serviced by this
diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp
index fa6615cbc5c..db71e7f2f50 100644
--- a/TAO/tao/IIOP_Connect.cpp
+++ b/TAO/tao/IIOP_Connect.cpp
@@ -236,10 +236,26 @@ TAO_IIOP_Server_Connection_Handler::handle_input (ACE_HANDLE)
   if (result == 0 || result == -1)
     return result;
 
+  // = Take out all the information from the <message_state> and reset
+  //   it so that nested upcall on the same Transport can be handled.
+
+  // Copy message type.
+  CORBA::Octet message_type = this->transport_.message_state_.message_type;
+  
+  // Copy version.
+  TAO_GIOP_Version giop_version = this->transport_.message_state_.giop_version;
+  
+  // Steal the input CDR from the message state.
+  TAO_InputCDR input_cdr (this->transport_.message_state_.cdr);
+  
+  // Reset the message state.
+  this->transport_.message_state_.reset ();
+  
   result = TAO_GIOP::process_server_message (this->transport (),
                                              this->orb_core_,
-                                             this->transport_.message_state_.cdr,
-                                             this->transport_.message_state_);
+                                             input_cdr,
+                                             message_type,
+                                             giop_version);
   if (result != -1)
     {
       this->transport_.message_state_.reset ();
diff --git a/TAO/tao/IIOP_Connect.h b/TAO/tao/IIOP_Connect.h
index 41dbfff674f..c53c2315c84 100644
--- a/TAO/tao/IIOP_Connect.h
+++ b/TAO/tao/IIOP_Connect.h
@@ -38,7 +38,7 @@ class TAO_ORB_Core;
 class TAO_ORB_Core_TSS_Resources;
 
 
-typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+typedef ACE_Svc_Handler<TAO_SOCK_STREAM, ACE_NULL_SYNCH>
         TAO_SVC_HANDLER;
 
 // ****************************************************************
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index c1b655ec1f4..7e77bf21ab9 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -1,6 +1,18 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
+// ============================================================================
+//
+// = LIBRARY
+//
+// = FILENAME
+//
+// = DESCRIPTION
+//
+// = AUTHOR
+//
+// ============================================================================
+
 #include "tao/IIOP_Connector.h"
 #include "tao/IIOP_Profile.h"
 #include "tao/GIOP.h"
@@ -33,18 +45,20 @@ TAO_IIOP_Connect_Creation_Strategy::make_svc_handler (
                           this->orb_core_),
                       -1);
     }
-
   return 0;
 }
 
 // ****************************************************************
 
+typedef ACE_Cached_Connect_Strategy<TAO_IIOP_Client_Connection_Handler,
+                                    TAO_SOCK_CONNECTOR,
+                                    TAO_Cached_Connector_Lock>
+        TAO_CACHED_CONNECT_STRATEGY;
+
 TAO_IIOP_Connector::TAO_IIOP_Connector (void)
   : TAO_Connector (TAO_IOP_TAG_INTERNET_IOP),
     base_connector_ (),
-    orb_core_ (0),
-    cached_connect_strategy_ (0),
-    caching_strategy_ (0)
+    orb_core_ (0)
 {
 }
 
@@ -58,12 +72,8 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
                   TAO_Cached_Connector_Lock (this->orb_core_),
                   -1);
 
-  int result = this->make_caching_strategy ();
-  if (result == -1)
-    return -1;
-
-  this->cached_connect_strategy_ =
-    new CACHED_CONNECT_STRATEGY (*this->caching_strategy_,
+  TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy =
+    new TAO_CACHED_CONNECT_STRATEGY (
         new TAO_IIOP_Connect_Creation_Strategy (this->orb_core_->thr_mgr (),
                                                 this->orb_core_),
         0,
@@ -73,22 +83,20 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
 
   return this->base_connector_.open (this->orb_core_->reactor (),
                                      &this->null_creation_strategy_,
-                                     this->cached_connect_strategy_,
+                                     cached_connect_strategy,
                                      &this->null_activation_strategy_);
 }
 
 int
 TAO_IIOP_Connector::close (void)
 {
-  //
-  // @@ Can we delete the strategies that the connector uses before we
-  // close the connector itself??
-  //
+  TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy =
+    ACE_dynamic_cast (TAO_CACHED_CONNECT_STRATEGY *,
+                      this->base_connector_.connect_strategy ());
 
   // Zap the creation strategy that we created earlier
-  delete this->cached_connect_strategy_->creation_strategy ();
-  delete this->cached_connect_strategy_;
-  delete this->caching_strategy_;
+  delete cached_connect_strategy->creation_strategy ();
+  delete cached_connect_strategy;
 
   this->base_connector_.close ();
   return 0;
@@ -123,6 +131,7 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile,
   // object; but we obtain the transport in the <result>
   // variable. Other threads may modify the hint, but we are not
   // affected.
+  errno = 0;
   if (this->base_connector_.connect (iiop_profile->hint (),
                                      result,
                                      oa,
@@ -343,14 +352,17 @@ TAO_IIOP_Connector::check_prefix (const char *endpoint)
   if (!endpoint || !*endpoint)
     return -1;  // Failure
 
-  const char protocol[] = "iiop";
-  // This is valid for any protocol beginning with `iiop'.
+  const char *protocol[] = { "iiop", "iioploc" };
+  // This is valid for any protocol beginning with `iiop' or `iioploc'.
 
   // Check for the proper prefix in the IOR.  If the proper prefix isn't
   // in the IOR then it is not an IOR we can use.
   if (ACE_OS::strncasecmp (endpoint,
-                           protocol,
-                           ACE_OS::strlen (protocol)) == 0)
+                           protocol[0],
+                           ACE_OS::strlen (protocol[0])) == 0 ||
+      ACE_OS::strncasecmp (endpoint,
+                           protocol[1],
+                           ACE_OS::strlen (protocol[1])) == 0)
     {
       return 0;  // Success
     }
@@ -366,104 +378,10 @@ TAO_IIOP_Connector::object_key_delimiter (void) const
   return TAO_IIOP_Profile::object_key_delimiter;
 }
 
-int
-TAO_IIOP_Connector::purge_connections (void)
-{
-  return this->cached_connect_strategy_->purge_connections ();
-}
-
-#define TAO_HANDLER TAO_IIOP_Client_Connection_Handler
-#define TAO_SVC_TUPLE ACE_Svc_Tuple<TAO_HANDLER>
-#define TAO_ADDR TAO_IIOP_Connector::ADDR
-#define TAO_HASH_KEY TAO_IIOP_Connector::HASH_KEY
-#define TAO_COMPARE_KEYS TAO_IIOP_Connector::COMPARE_KEYS
-#define TAO_ATTRIBUTES TAO_IIOP_Connector::ATTRIBUTES
-#define TAO_CACHED_HANDLER TAO_IIOP_Connector::CACHED_HANDLER
-#define TAO_HASH_MAP TAO_IIOP_Connector::HASH_MAP
-#define TAO_HASH_MAP_ITERATOR TAO_IIOP_Connector::HASH_MAP_ITERATOR
-#define TAO_HASH_MAP_REVERSE_ITERATOR TAO_IIOP_Connector::HASH_MAP_REVERSE_ITERATOR
-#define TAO_CACHING_UTILITY TAO_IIOP_Connector::CACHING_UTILITY
-#define TAO_CACHING_STRATEGY TAO_IIOP_Connector::CACHING_STRATEGY
-#define TAO_CACHED_CONNECT_STRATEGY TAO_IIOP_Connector::CACHED_CONNECT_STRATEGY
-
-typedef ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-        TAO_IIOP_LRU_CACHING_STRATEGY;
-
-#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-typedef TAO_IIOP_LRU_CACHING_STRATEGY
-        TAO_IIOP_CACHING_STRATEGY;
-#else
-typedef ACE_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-        TAO_IIOP_CACHING_STRATEGY;
-typedef ACE_LFU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-        TAO_IIOP_LFU_CACHING_STRATEGY;
-typedef ACE_FIFO_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-        TAO_IIOP_FIFO_CACHING_STRATEGY;
-typedef ACE_Null_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-        TAO_IIOP_NULL_CACHING_STRATEGY;
-typedef ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_LRU_CACHING_STRATEGY>
-        TAO_IIOP_LRU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_LFU_CACHING_STRATEGY>
-        TAO_IIOP_LFU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_FIFO_CACHING_STRATEGY>
-        TAO_IIOP_FIFO_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_NULL_CACHING_STRATEGY>
-        TAO_IIOP_NULL_CACHING_STRATEGY_ADAPTER;
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-int
-TAO_IIOP_Connector::make_caching_strategy (void)
-{
-
-  TAO_Resource_Factory *resource_factory =
-    this->orb_core_->resource_factory ();
-
-#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-  ACE_NEW_RETURN (this->caching_strategy_,
-                  TAO_IIOP_CACHING_STRATEGY,
-                  -1);
-
-#else
-
-  switch (resource_factory->connection_caching_strategy_type ())
-    {
-    case TAO_Resource_Factory::NOOP:
-      ACE_NEW_RETURN (this->caching_strategy_,
-                      TAO_IIOP_NULL_CACHING_STRATEGY_ADAPTER,
-                      -1);
-      break;
-
-    default:
-    case TAO_Resource_Factory::LRU:
-      ACE_NEW_RETURN (this->caching_strategy_,
-                      TAO_IIOP_LRU_CACHING_STRATEGY_ADAPTER,
-                      -1);
-      break;
-
-    case TAO_Resource_Factory::LFU:
-      ACE_NEW_RETURN (this->caching_strategy_,
-                      TAO_IIOP_LFU_CACHING_STRATEGY_ADAPTER,
-                      -1);
-      break;
-
-    case TAO_Resource_Factory::FIFO:
-      ACE_NEW_RETURN (this->caching_strategy_,
-                      TAO_IIOP_FIFO_CACHING_STRATEGY_ADAPTER,
-                      -1);
-      break;
-    }
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-  this->caching_strategy_->purge_percent (resource_factory->purge_percentage ());
-  return 0;
-}
-
-//
-// The TAO_Cached_Connector_Lock template instantiations are in
-// Resource_Factory.cpp.
-//
+#define TAO_SVC_TUPLE ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler>
+#define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR, TAO_Cached_Connector_Lock>
+#define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -471,81 +389,49 @@ template class ACE_Node<ACE_INET_Addr>;
 template class ACE_Unbounded_Stack<ACE_INET_Addr>;
 template class ACE_Unbounded_Stack_Iterator<ACE_INET_Addr>;
 
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
-template class ACE_NOOP_Creation_Strategy<TAO_HANDLER>;
-template class ACE_Concurrency_Strategy<TAO_HANDLER>;
-template class ACE_Connect_Strategy<TAO_HANDLER, ACE_SOCK_CONNECTOR>;
-template class ACE_Connector<TAO_HANDLER, ACE_SOCK_CONNECTOR>;
-template class ACE_Creation_Strategy<TAO_HANDLER>;
-template class ACE_Hash_Map_Entry<TAO_ADDR, TAO_HANDLER *>;
-template class ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >;
-template class ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >;
-template class ACE_Map_Entry<ACE_HANDLE, TAO_SVC_TUPLE *>;
-template class ACE_Map_Manager<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_NOOP_Concurrency_Strategy<TAO_HANDLER>;
-template class ACE_Recycling_Strategy<TAO_HANDLER>;
-template class ACE_Strategy_Connector<TAO_HANDLER, ACE_SOCK_CONNECTOR>;
+template class ACE_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>;
+template class ACE_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
+template class ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
+template class ACE_NOOP_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>;
+template class ACE_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>;
+template class ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>;
+template class ACE_Recycling_Strategy<TAO_IIOP_Client_Connection_Handler>;
+template class ACE_Connector<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
+
+template class ACE_Node<TAO_IIOP_Client_Connection_Handler *>;
+
+template class ACE_Svc_Handler<TAO_SOCK_STREAM, ACE_NULL_SYNCH>;
+template class CACHED_CONNECT_STRATEGY;
+template class REFCOUNTED_HASH_RECYCLABLE_ADDR;
+template class ACE_Map_Manager<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator_Base<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Reverse_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
 template class TAO_SVC_TUPLE;
 
-template class ACE_Pair<TAO_HANDLER *, TAO_ATTRIBUTES>;
-template class ACE_Reference_Pair<TAO_ADDR, TAO_HANDLER *>;
-template class ACE_Hash_Map_Entry<TAO_ADDR, TAO_CACHED_HANDLER>;
-
-template class ACE_Hash_Map_Manager<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Manager<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-
-// = Caching_Strategy
-template class ACE_Hash_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
-
-template class ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
-
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-template class ACE_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
-template class ACE_LFU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
-template class ACE_FIFO_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
-template class ACE_Null_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
-
-template class ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_LRU_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_LFU_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_FIFO_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_NULL_CACHING_STRATEGY>;
-
-template class ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_HASH_MAP_ITERATOR, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
-template class ACE_Cache_Map_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
-template class ACE_Cache_Map_Reverse_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
-
-#else
-
-template class ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-template class ACE_Cached_Connect_Strategy_Ex<TAO_HANDLER, ACE_SOCK_CONNECTOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES, TAO_Cached_Connector_Lock>;
-template class ACE_Cached_Connect_Strategy<TAO_HANDLER, ACE_SOCK_CONNECTOR, TAO_Cached_Connector_Lock>;
-
-template class ACE_Cleanup_Strategy<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP>;
-template class ACE_Recyclable_Handler_Cleanup_Strategy<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP>;
-template class ACE_Recyclable_Handler_Caching_Utility<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP, TAO_HASH_MAP_ITERATOR, TAO_ATTRIBUTES>;
+template class ACE_Map_Entry<int, TAO_SVC_TUPLE*>;
+
+template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *>;
+template class ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
+template class ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
+
+#if defined(ACE_HAS_THREADS)
+template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
+#endif /* ACE_HAS_THREADS */
+
+template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -553,80 +439,47 @@ template class ACE_Recyclable_Handler_Caching_Utility<TAO_ADDR, TAO_CACHED_HANDL
 #pragma instantiate ACE_Unbounded_Stack<ACE_INET_Addr>
 #pragma instantiate ACE_Unbounded_Stack_Iterator<ACE_INET_Addr>
 
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-#pragma instantiate ACE_NOOP_Creation_Strategy<TAO_HANDLER>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_HANDLER>
-#pragma instantiate ACE_Connect_Strategy<TAO_HANDLER, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connector<TAO_HANDLER, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_HANDLER>
-#pragma instantiate ACE_Hash_Map_Entry<TAO_ADDR, TAO_HANDLER *>
-#pragma instantiate ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >
-#pragma instantiate ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >
-#pragma instantiate ACE_Map_Entry<ACE_HANDLE, TAO_SVC_TUPLE *>
-#pragma instantiate ACE_Map_Manager<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_HANDLER>
-#pragma instantiate ACE_Recycling_Strategy<TAO_HANDLER>
-#pragma instantiate ACE_Strategy_Connector<TAO_HANDLER, ACE_SOCK_CONNECTOR>
-#pragma instantiate TAO_SVC_TUPLE
-
-#pragma instantiate ACE_Pair<TAO_HANDLER *, TAO_ATTRIBUTES>
-#pragma instantiate ACE_Reference_Pair<TAO_ADDR, TAO_HANDLER *>
-#pragma instantiate ACE_Hash_Map_Entry<TAO_ADDR, TAO_CACHED_HANDLER>
-
-#pragma instantiate ACE_Hash_Map_Manager<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Manager<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-
-// = Caching_Strategy
-#pragma instantiate ACE_Hash_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
-
-#pragma instantiate ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
+#pragma instantiate ACE_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>
+#pragma instantiate ACE_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
+#pragma instantiate ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
+#pragma instantiate ACE_NOOP_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>
+#pragma instantiate ACE_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>
+#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>
+#pragma instantiate ACE_Recycling_Strategy<TAO_IIOP_Client_Connection_Handler>
+#pragma instantiate ACE_Connector<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
+#pragma instantiate ACE_Node<TAO_IIOP_Client_Connection_Handler *>
 
-#pragma instantiate ACE_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-#pragma instantiate ACE_LFU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-#pragma instantiate ACE_FIFO_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-#pragma instantiate ACE_Null_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-
-#pragma instantiate ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_LRU_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_LFU_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_FIFO_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_NULL_CACHING_STRATEGY>
-
-#pragma instantiate ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_HASH_MAP_ITERATOR, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
-
-#else
-
-#pragma instantiate ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-#pragma instantiate ACE_Cached_Connect_Strategy_Ex<TAO_HANDLER, ACE_SOCK_CONNECTOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES, TAO_Cached_Connector_Lock>
-#pragma instantiate ACE_Cached_Connect_Strategy<TAO_HANDLER, ACE_SOCK_CONNECTOR, TAO_Cached_Connector_Lock>
-
-#pragma instantiate ACE_Cleanup_Strategy<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP>
-#pragma instantiate ACE_Recyclable_Handler_Cleanup_Strategy<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP>
-#pragma instantiate ACE_Recyclable_Handler_Caching_Utility<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP, TAO_HASH_MAP_ITERATOR, TAO_ATTRIBUTES>
+#pragma instantiate ACE_Svc_Handler<TAO_SOCK_STREAM, ACE_NULL_SYNCH>
+#pragma instantiate CACHED_CONNECT_STRATEGY
+#pragma instantiate REFCOUNTED_HASH_RECYCLABLE_ADDR
+#pragma instantiate TAO_SVC_TUPLE
+#pragma instantiate ACE_Map_Manager<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Iterator_Base<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Reverse_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Entry<int, TAO_SVC_TUPLE*>
+
+#pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *>
+#pragma instantiate ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>
+#pragma instantiate ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>
+
+#if defined(ACE_HAS_THREADS)
+#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
+#endif /* ACE_HAS_THREADS */
+
+#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index c3c168778b8..39265a10519 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -21,24 +21,11 @@
 #define TAO_IIOP_CONNECTOR_H
 
 #include "ace/Connector.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "ace/SOCK_Connector.h"
 #include "tao/Pluggable.h"
 #include "tao/IIOP_Connect.h"
-#include "tao/Resource_Factory.h"
-
-#if defined(__GNUC__) && __GNUC__ == 2 && __GNUC_MINOR__ < 8
-#define ACE_HAS_BROKEN_EXTENDED_TEMPLATES
-#endif /* __GNUC__ */
 
-#include "ace/Cached_Connect_Strategy_T.h"
-
-typedef ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler,
-                               ACE_SOCK_CONNECTOR>
+typedef ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
         TAO_IIOP_BASE_CONNECTOR;
 
 // ****************************************************************
@@ -96,9 +83,6 @@ public:
 
   virtual char object_key_delimiter (void) const;
 
-  virtual int purge_connections (void);
-  // Purge "old" connections.
-
 protected:
   // = More TAO_Connector methods, please check the documentation on
   //   Pluggable.h
@@ -106,66 +90,7 @@ protected:
                              TAO_Profile *&,
                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
 
-  virtual int make_caching_strategy (void);
-  // According to the option specified, create the appropriate caching
-  // strategy used for purging unused connections from the connection
-  // cache.
-
-public:
-
-  // = Connection Caching Strategy.
-  typedef size_t ATTRIBUTES;
-  typedef ACE_Pair<TAO_IIOP_Client_Connection_Handler *,
-                   ATTRIBUTES>
-          CACHED_HANDLER;
-  typedef ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-          ADDR;
-  typedef ACE_Hash<ADDR> HASH_KEY;
-  typedef ACE_Equal_To<ADDR> COMPARE_KEYS;
-
-  typedef ACE_Hash_Map_Manager_Ex<ADDR,
-                                  CACHED_HANDLER,
-                                  HASH_KEY,
-                                  COMPARE_KEYS,
-                                  ACE_Null_Mutex>
-          HASH_MAP;
-  typedef ACE_Hash_Map_Iterator_Ex<ADDR,
-                                   CACHED_HANDLER,
-                                   HASH_KEY,
-                                   COMPARE_KEYS,
-                                   ACE_Null_Mutex>
-          HASH_MAP_ITERATOR;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<ADDR,
-                                           CACHED_HANDLER,
-                                           HASH_KEY,
-                                           COMPARE_KEYS,
-                                           ACE_Null_Mutex>
-          HASH_MAP_REVERSE_ITERATOR;
-
-  typedef ACE_Recyclable_Handler_Caching_Utility<ADDR,
-                                                 CACHED_HANDLER,
-                                                 HASH_MAP,
-                                                 HASH_MAP_ITERATOR,
-                                                 ATTRIBUTES>
-          CACHING_UTILITY;
-
-#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-  typedef ACE_LRU_Caching_Strategy<ATTRIBUTES,
-                                   CACHING_UTILITY>
-          CACHING_STRATEGY;
-#else
-  typedef ACE_Caching_Strategy<ATTRIBUTES,
-                               CACHING_UTILITY>
-          CACHING_STRATEGY;
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-  typedef ACE_Cached_Connect_Strategy_Ex<TAO_IIOP_Client_Connection_Handler,
-                                         ACE_SOCK_CONNECTOR,
-                                         CACHING_STRATEGY,
-                                         ATTRIBUTES,
-                                         TAO_Cached_Connector_Lock>
-          CACHED_CONNECT_STRATEGY;
-
+protected:
   typedef ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>
         TAO_NULL_ACTIVATION_STRATEGY;
 
@@ -176,18 +101,11 @@ private:
   TAO_NULL_ACTIVATION_STRATEGY null_activation_strategy_;
   TAO_NULL_CREATION_STRATEGY null_creation_strategy_;
 
-  TAO_IIOP_BASE_CONNECTOR base_connector_;
+  TAO_IIOP_BASE_CONNECTOR  base_connector_;
   // The connector initiating connection requests for IIOP.
 
   TAO_ORB_Core *orb_core_;
   // ORB Core.
-
-  CACHED_CONNECT_STRATEGY *cached_connect_strategy_;
-  // Cached connect strategy.
-
-  CACHING_STRATEGY *caching_strategy_;
-  // Caching strategy which decides the order of removal of entries
-  // from the connection cache.
 };
 
 #endif  /* TAO_IIOP_CONNECTOR_H */
diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp
index cfcc66f5f7b..bba5b7ac057 100644
--- a/TAO/tao/IIOP_Factory.cpp
+++ b/TAO/tao/IIOP_Factory.cpp
@@ -67,12 +67,6 @@ TAO_IIOP_Protocol_Factory::make_connector (void)
   return connector;
 }
 
-int
-TAO_IIOP_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 0;
-}
-
 ACE_STATIC_SVC_DEFINE (TAO_IIOP_Protocol_Factory,
                        ASYS_TEXT ("IIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
index 99064e46151..93f533bc809 100644
--- a/TAO/tao/IIOP_Factory.h
+++ b/TAO/tao/IIOP_Factory.h
@@ -41,10 +41,12 @@ public:
   virtual const char *prefix (void) const;
   // Returns the prefix used by the protocol.
 
-  // = Check Protocol_Factory.h for a description of these methods.
+  // Factory methods
   virtual TAO_Acceptor  *make_acceptor (void);
+  // Create an acceptor
+
   virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
+  // Create a connector
 
 private:
   int major_;
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 5e5d7d90de2..9a721c2528e 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -408,7 +408,7 @@ TAO_IIOP_Profile::to_string (CORBA::Environment &)
                   1 /* colon separator */ +
                   5 /* port number */ +
                   1 /* object key separator */ +
-                  ACE_OS::strlen (key.in ()));
+                  ACE_OS::strlen (key));
 
   CORBA::String buf = CORBA::string_alloc (buflen);
 
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 351350b7a3c..de1e980cb26 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -21,11 +21,6 @@
 #define TAO_IIOP_PROFILE_H
 
 #include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Pluggable.h"
 #include "tao/Object_KeyC.h"
 #include "tao/GIOP.h"
@@ -71,7 +66,7 @@ public:
 
   TAO_IIOP_Profile (const char *string,
                     TAO_ORB_Core *orb_core,
-                    CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   // Create object using a string ior.
 
   TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile);
@@ -87,10 +82,10 @@ public:
   // Destructor is to be called only through <_decr_refcnt>.
 
   int parse_string (const char *string,
-                    CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   // Initialize this object using the given input string.
 
-  CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV);
   // Return a string representation for this profile.
   // client must deallocate memory.
 
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index c0f3c05aea1..cfffb34a181 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -21,11 +21,6 @@
 #define TAO_IIOP_TRANSPORT_H
 
 #include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/GIOP.h"
 
 // Forward decls.
diff --git a/TAO/tao/IORManipulation.cpp b/TAO/tao/IORManipulation.cpp
index a78a2025ab9..623c06e2808 100644
--- a/TAO/tao/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation.cpp
@@ -88,8 +88,7 @@ TAO_IOR_Manipulation_impl::merge_iors (
 
       // If the object type_is's differ then raise an exception.
       if (type_id.in () && iors[i]->_stubobj ()->type_id.in () &&
-          ACE_OS::strcmp (type_id.in (),
-                          iors[i]->_stubobj ()->type_id.in ()))
+          ACE_OS::strcmp (type_id, iors[i]->_stubobj ()->type_id))
         ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
                           CORBA::Object::_nil ());
 
@@ -169,8 +168,7 @@ TAO_IOR_Manipulation_impl::remove_profiles (
   // First verify they are the same type!
   CORBA::String_var type_id = ior1->_stubobj ()->type_id;
   if (type_id.in () && ior2->_stubobj ()->type_id.in () &&
-      ACE_OS::strcmp (type_id.in (),
-                      ior2->_stubobj ()->type_id.in ()))
+      ACE_OS::strcmp (type_id, ior2->_stubobj ()->type_id))
     ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
                       CORBA::Object::_nil ());
 
diff --git a/TAO/tao/IORManipulation.h b/TAO/tao/IORManipulation.h
index ddaa5152995..c7616d8ec75 100644
--- a/TAO/tao/IORManipulation.h
+++ b/TAO/tao/IORManipulation.h
@@ -21,11 +21,6 @@
 #define TAO_IOR_MANIPULATION_H
 
 #include "tao/Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/IORS.h"
 
 class TAO_IOR_Manipulation_impl : public POA_TAO_IOP::TAO_IOR_Manipulation
diff --git a/TAO/tao/IOR_LookupTable.cpp b/TAO/tao/IOR_LookupTable.cpp
index a38d57030cb..c3fe0ab115f 100644
--- a/TAO/tao/IOR_LookupTable.cpp
+++ b/TAO/tao/IOR_LookupTable.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
 #include "tao/IOR_LookupTable.h"
-#include "tao/ObjectIDList.h"
 #include "tao/debug.h"
 
 ACE_RCSID(tao, IOR_TableLookup, "$Id$")
 
-// = Initialization and termination methods.
+  // = Initialization and termination methods.
 TAO_IOR_LookupTable::TAO_IOR_LookupTable (void)
-  : table_ ()
 {
 }
 
@@ -30,7 +28,7 @@ TAO_IOR_LookupTable::add_ior (const ACE_CString &object_name,
                               const ACE_CString &ior)
 {
   // Make an entry in the table.
-  switch (this->table_.bind (object_name, ior))
+  switch (this->hash_map_.bind (object_name, ior))
     {
     case 1 : // object name already exists in the table.
       if (TAO_debug_level > 0)
@@ -61,68 +59,15 @@ TAO_IOR_LookupTable::find_ior (const ACE_CString &object_name,
   // returns 0 on success.
   //        -1 on failure.
 
-  // @@ This debugging output should *NOT* be used since the
-  //    object key string is not null terminated, nor can it
-  //    be null terminated without copying.  No copying should 
-  //    be done since performance is somewhat important here.
-  //    So, just remove the debugging output entirely.
-  //
-  //   if (TAO_debug_level > 0)
-  //     ACE_DEBUG ((LM_DEBUG,
-  //                 "TAO (%P|%t) IOR Table find <%s>\n",
-  //                 object_name.c_str ()));
-
-  return this->table_.find (object_name, ior);
-
-}
-
-
-CORBA_ORB_ObjectIdList_ptr
-TAO_IOR_LookupTable::list_initial_services (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Unsupported initial services should NOT be included in the below list!
-  const char *initial_services[] = { TAO_LIST_OF_INITIAL_SERVICES };
-  // Make sure the "terminating" zero is the last array element so
-  // that there is a stop condition when iterating through the list.
-
-  const size_t initial_services_size =
-    sizeof (initial_services) / sizeof (initial_services[0]);
-
-  const size_t total_size =
-    initial_services_size + this->table_.current_size ();
-
-  CORBA_ORB_ObjectIdList_ptr tmp = 0;
-
-  ACE_NEW_THROW_EX (tmp,
-                    CORBA_ORB_ObjectIdList (total_size),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  CORBA_ORB_ObjectIdList_var list = tmp;
-
-  size_t index = 0;
-  // Index for ObjectIdList members.
-
-  // Iterate over TAO's "built-in" initial references.
-  for (index = 0; index < initial_services_size; ++index)
-    list[index] = initial_services[index];
-
-  // Now iterate over the initial references created by the user and
-  // add them to the sequence.
-  TAO_IOR_Map::iterator first = this->table_.begin ();
-  TAO_IOR_Map::iterator last  = this->table_.end ();
-
-  for (TAO_IOR_Map::iterator i = first;
-       i != last;
-       ++i, ++index)
-      list[index] = (*i).int_id_.c_str ();
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "TAO (%P|%t) IOR Table find <%s>\n",
+                object_name.c_str ()));
 
-  list->length (total_size);
+  return this->hash_map_.find (object_name, ior);
 
-  return list._retn ();
 }
 
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Hash_Map_Manager<ACE_CString, ACE_CString, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
diff --git a/TAO/tao/IOR_LookupTable.h b/TAO/tao/IOR_LookupTable.h
index 7bbc6628605..73da0738ada 100644
--- a/TAO/tao/IOR_LookupTable.h
+++ b/TAO/tao/IOR_LookupTable.h
@@ -4,17 +4,16 @@
 // ============================================================================
 //
 // = LIBRARY
-//     TAO
+//    TAO/orbsvcs/orbsvcs
 //
 // = FILENAME
-//     IOR_LookupTable.h
+//   IOR_LookupTable.h
 //
 // = DESCRIPTION
-//     Contains the class that defines the IOR lookup table.
+//   Contains the class that defines the IOR lookup table.
 //
 // = AUTHOR
-//     Vishal Kachroo
-//     Ossama Othman
+//   Vishal Kachroo.
 //
 // ============================================================================
 
@@ -31,6 +30,7 @@
 
 class TAO_Export TAO_IOR_LookupTable
 {
+  
   //   Represents a table for the IOR lookups, given the object keys. A
   //   Hash_Map_Manager is being used currently for the table. This
   //   could be changed/added-on-to by other data structures like a file
@@ -62,17 +62,11 @@ public:
   // Locate <object_name> and pass out parameter via <ior>.  If the IOR is
   // found, return 0. Return -1 if not found.
 
-  CORBA_ORB_ObjectIdList_ptr list_initial_services (
-              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Returns a sequence of ObjectIds that lists which objects have
-  // references available via the initial references mechanism.
-
-  typedef ACE_Hash_Map_Manager<ACE_CString,
-                               ACE_CString,
-                               ACE_Null_Mutex> TAO_IOR_Map;
-
 private:
-  TAO_IOR_Map table_;
+
+  ACE_Hash_Map_Manager<ACE_CString,
+    ACE_CString,
+    ACE_Null_Mutex> hash_map_;
   // Maintains the table of object_names -> IORs.
 };
 
diff --git a/TAO/tao/InconsistentTypeCodeC.h b/TAO/tao/InconsistentTypeCodeC.h
index dcdcf0b9865..b826fd382eb 100644
--- a/TAO/tao/InconsistentTypeCodeC.h
+++ b/TAO/tao/InconsistentTypeCodeC.h
@@ -27,10 +27,6 @@
 
 #include "tao/orbconf.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 #include "tao/Exception.h"
diff --git a/TAO/tao/Interface.pidl b/TAO/tao/Interface.pidl
deleted file mode 100644
index e338817b36d..00000000000
--- a/TAO/tao/Interface.pidl
+++ /dev/null
@@ -1,589 +0,0 @@
-//$Id$
-#pragma prefix "omg.org"
-
-module CORBA {
-  typedef string Identifier;
-  typedef string ScopedName;
-  typedef string RepositoryId;
-
-enum DefinitionKind {
-	dk_none, dk_all,
-	dk_Attribute, dk_Constant, dk_Exception, dk_Interface,
-	dk_Module, dk_Operation, dk_Typedef,
-	dk_Alias, dk_Struct, dk_Union, dk_Enum,
-	dk_Primitive, dk_String, dk_Sequence, dk_Array,
-	dk_Repository,
-	dk_Wstring, dk_Fixed,
-        dk_Value, 
-        dk_ValueBox, dk_ValueMember, 
-        dk_Native
- };
-
-interface IRObject {
-	// read interface
-	readonly attribute DefinitionKind def_kind;
-	// write interface
-	void destroy ();
- };
-
-typedef string VersionSpec;
-
-  interface Contained;
-  interface Repository;
-  interface Container;
-
- interface Contained : IRObject {
-	// read/write interface
-
-	attribute RepositoryId id;
-	attribute Identifier name;
-	attribute VersionSpec version;
-
-	// read interface
-
-	readonly attribute Container defined_in;
-	readonly attribute ScopedName absolute_name;
-	readonly attribute Repository containing_repository;
-
-	struct Description {
-	DefinitionKind kind;
-	any value; 
-	}; 
-
-	Description describe ();
-
-	// write interface
-
-	void move (
-		in Container new_container,
-		in Identifier new_name,
-		in VersionSpec new_version
-		   );
- 	 };
-
-	interface ModuleDef;
-  	interface ConstantDef;
-  	interface IDLType;
-  	interface StructDef;
-  	interface UnionDef;
-  	interface EnumDef;
-        interface AliasDef;
-  	interface InterfaceDef;
-        interface ExceptionDef; 
-        interface NativeDef;
-	typedef sequence <InterfaceDef> InterfaceDefSeq;
-        interface ValueDef; 
-        typedef sequence <ValueDef> ValueDefSeq; 
-        interface ValueBoxDef;
-
- 	typedef sequence <Contained> ContainedSeq;
-
-   		struct StructMember {
-		Identifier name;
-		TypeCode type;
-		IDLType type_def;
- 	 };
-
- 	 typedef sequence <StructMember> StructMemberSeq;
-        struct Initializer { 
-                StructMemberSeq members; 
-        }; 
-        typedef sequence <Initializer> InitializerSeq;
-
-		struct UnionMember {
-		Identifier name;
-		any label;
-		TypeCode type;
-		IDLType type_def;
-		};
-
- 	 typedef sequence <UnionMember> UnionMemberSeq;
-
- 	 typedef sequence <Identifier> EnumMemberSeq;
-
-	interface Container : IRObject {
-	// read interface
-
-	Contained lookup ( in ScopedName search_name);
-
-	ContainedSeq contents (
-		 in DefinitionKind limit_type,
-		 in boolean exclude_inherited
-	  );
-
-	ContainedSeq lookup_name (
-		in Identifier search_name, 
-		in long levels_to_search, 
-		in DefinitionKind limit_type,
-		in boolean exclude_inherited
-	 );
-
-	struct Description {
-	Contained contained_object; 
-	DefinitionKind kind;
-		any value; 
-	};
-
-	typedef sequence<Description> DescriptionSeq;
-
-	DescriptionSeq describe_contents (
-		in DefinitionKind limit_type,
-		in boolean exclude_inherited,
-		in long max_returned_objs
-	  );
-
-	// write interface
- 
-	ModuleDef create_module (
-		in RepositoryId id,
-		in Identifier name,
-		in VersionSpec version
-	 );
- 
-	ConstantDef create_constant (
-		in RepositoryId id,
-		in Identifier name,
-		in VersionSpec version,
-		in IDLType type,
-		in any value
-	 );
- 
-	StructDef create_struct (
-		in RepositoryId id,
-		in Identifier name,
-		in VersionSpec version,
-		in StructMemberSeq members
-	 );
- 
-	UnionDef create_union (
-		in RepositoryId id,
-		in Identifier name,
-		in VersionSpec version,
-		in IDLType discriminator_type,
-		in UnionMemberSeq members
-	 );
- 
-	EnumDef create_enum (
-		in RepositoryId id,
-		in Identifier name,
-		in VersionSpec version,
-		in EnumMemberSeq members
-	 );
- 
-	AliasDef create_alias (
-		in RepositoryId id,
-		in Identifier name,
-		in VersionSpec version,
-		in IDLType original_type
-	 );
- 
-	InterfaceDef create_interface (
-		in RepositoryId id,
-		in Identifier name,
-		in VersionSpec version,
-		in InterfaceDefSeq base_interfaces
-	   );
-
-        ValueDef create_value( 
-        in RepositoryId id, 
-        in Identifier name, 
-        in VersionSpec version, 
-        in boolean is_custom, 
-        in boolean is_abstract, 
-        in ValueDef base_value,        
-        in boolean is_truncatable, 
-        in ValueDefSeq abstract_base_values, 
-        in InterfaceDef supported_interface, 
-        in InitializerSeq initializers );
-
-        ValueBoxDef create_value_box( 
-        in RepositoryId id,
-        in Identifier name, 
-        in VersionSpec version, 
-        in IDLType original_type_def );
-
-	ExceptionDef create_exception(
-		in RepositoryId id,
-		in Identifier name,
-		in VersionSpec version,
-		in StructMemberSeq members
-	);
- };
-
-
-   interface IDLType : IRObject {
-	readonly attribute TypeCode type;
-  };
-
-
-  interface PrimitiveDef;
-  interface StringDef;
-  interface SequenceDef;
-  interface ArrayDef;
-  interface WstringDef; 
-  interface FixedDef;
-
-   enum PrimitiveKind {
-	pk_null, pk_void, pk_short, pk_long, pk_ushort, pk_ulong,
-	pk_float, pk_double, pk_boolean, pk_char, pk_octet,
-	pk_any, pk_TypeCode, pk_Principal, pk_string, pk_objref,
-	pk_longlong, pk_ulonglong, pk_longdouble, pk_wchar, pk_wstring
-   };
-
- interface Repository : Container {
-	// read interface
-
-	Contained lookup_id (in RepositoryId search_id);
-
-	PrimitiveDef get_primitive (in PrimitiveKind kind);
-
-	// write interface
-
-	StringDef create_string (in unsigned long bound);
-
-	WstringDef create_wstring (in unsigned long bound);
-
-	SequenceDef create_sequence (
-		in unsigned long bound,
-	 	in IDLType element_type
-	  );
-
-	ArrayDef create_array (
-		in unsigned long length,
-		in IDLType element_type
-	 );
-        
-	FixedDef create_fixed (
-		in unsigned short digits,
-		 in short scale
-	  );
-   };
-
-  interface ModuleDef : Container, Contained {
-   };
-
-   struct ModuleDescription {
-	Identifier name; 
-	RepositoryId id; 
-	RepositoryId defined_in;
-	VersionSpec version;
-  };
-
-
-  interface ConstantDef : Contained {
-	readonly attribute TypeCode type;
-	attribute IDLType type_def;
-	attribute any value;
-   };
-
- struct ConstantDescription {
-	Identifier name; 
-	RepositoryId id; 
-	RepositoryId defined_in; 
-	VersionSpec version;
-	TypeCode type; 
-	any value; 
-    };
-
-
-  	interface TypedefDef : Contained, IDLType {
-   };
-
-   struct TypeDescription {
-	Identifier name; 
-	RepositoryId id; 
-	RepositoryId defined_in; 
-	VersionSpec version;
-	TypeCode type; 
-   };
-
-
-    interface StructDef : TypedefDef, Container {
-	attribute StructMemberSeq members;
-	};
-
-
-
- interface UnionDef : TypedefDef, Container {
-	readonly attribute TypeCode discriminator_type;
-	attribute IDLType discriminator_type_def;
-	attribute UnionMemberSeq members;
-    };
-
-
-  interface EnumDef : TypedefDef {
-	attribute EnumMemberSeq members;
-  };
-
-
-   interface AliasDef : TypedefDef {
-	attribute IDLType original_type_def;
-  };
-
-
- interface PrimitiveDef: IDLType {
-	readonly attribute PrimitiveKind kind;
- };
-
-
- interface StringDef : IDLType {
-	attribute unsigned long bound;
-  };
-
-interface WstringDef : IDLType {
-	attribute unsigned long bound;
- };
-
- interface FixedDef : IDLType {
-	attribute unsigned short digits;
-	attribute short scale;
- };
-
- interface SequenceDef : IDLType {
-	attribute unsigned long bound;
-	readonly attribute TypeCode element_type;
-	attribute IDLType element_type_def;
-  };
-
-
- interface ArrayDef : IDLType {
-	attribute unsigned long length;
-	readonly attribute TypeCode element_type;
-	attribute IDLType element_type_def;
- };
-
-
-  interface ExceptionDef : Contained, Container {
-	readonly attribute TypeCode type;
-	attribute StructMemberSeq members;
- };
-
-struct ExceptionDescription {
-Identifier name; 
-	RepositoryId id; 
-	RepositoryId defined_in; 
-	VersionSpec version;
-	TypeCode type; 
-  	};
-enum AttributeMode {ATTR_NORMAL, ATTR_READONLY};
-
-  	interface AttributeDef : Contained {
-	readonly attribute TypeCode type;
-	attribute IDLType type_def;
-	attribute AttributeMode mode;
-   };
-
-   	struct AttributeDescription {
-	Identifier name; 
-	RepositoryId id; 
-	RepositoryId defined_in; 
-	VersionSpec version;
-	TypeCode type;
-	AttributeMode mode; 
-   };
-
-
-  enum OperationMode {OP_NORMAL, OP_ONEWAY};
-
-  enum ParameterMode {PARAM_IN, PARAM_OUT, PARAM_INOUT};
-   	struct ParameterDescription {
-	Identifier name; 
-	TypeCode type; 
-	IDLType type_def;
-	ParameterMode mode;
- };
- typedef sequence <ParameterDescription> ParDescriptionSeq;
-
- typedef Identifier ContextIdentifier;
- typedef sequence <ContextIdentifier> ContextIdSeq;
-
- typedef sequence <ExceptionDef> ExceptionDefSeq;
- typedef sequence <ExceptionDescription> ExcDescriptionSeq;
-
- interface OperationDef : Contained { 
-	readonly attribute TypeCode result;
-	attribute IDLType result_def;
-	attribute ParDescriptionSeq params;
-	attribute OperationMode mode; 
-	attribute ContextIdSeq contexts;
-	attribute ExceptionDefSeq exceptions;
-  };
-
- struct OperationDescription {
-	Identifier name; 
-	RepositoryId id; 
-	RepositoryId defined_in; 
-	VersionSpec version;
-	TypeCode result; 
-	OperationMode mode; 
-	ContextIdSeq contexts; 
-	ParDescriptionSeq parameters;
-	ExcDescriptionSeq exceptions;
- 	};
-
-
- typedef sequence <RepositoryId> RepositoryIdSeq;
- typedef sequence <OperationDescription> OpDescriptionSeq;
- typedef sequence <AttributeDescription> AttrDescriptionSeq;
-
-interface InterfaceDef : Container, Contained, IDLType {
-	// read/write interface
-
-	attribute InterfaceDefSeq base_interfaces;
-
-	// read interface
-
-	boolean is_a (in RepositoryId interface_id);
-
-	struct FullInterfaceDescription {
-	 	Identifier name;
-	 	RepositoryId id;
-	 	RepositoryId defined_in;
-	  	VersionSpec version;
-	   	OpDescriptionSeq operations;
-	   	AttrDescriptionSeq attributes;
-	   	RepositoryIdSeq base_interfaces;
-	  	TypeCode type;
-                boolean is_abstract;
-	};
-
-	FullInterfaceDescription describe_interface();
-
-	// write interface
-
-	AttributeDef create_attribute (
-	   	 in RepositoryId id,
-		 in Identifier name,
-	 	 in VersionSpec version,
-	 	 in IDLType type,
-	 	 in AttributeMode mode
-	 	 );
-
-	OperationDef create_operation (
-	    	in RepositoryId id,
-	   	in Identifier name,
-	   	in VersionSpec version,
-	   	in IDLType result,
-	   	in OperationMode mode, 
-	   	in ParDescriptionSeq params,
-	    	in ExceptionDefSeq exceptions,
-	   	in ContextIdSeq contexts
-	   );
-   };
-
- 	struct InterfaceDescription {
-		Identifier name; 
-		RepositoryId id; 
-		RepositoryId defined_in; 
-		VersionSpec version;
-		RepositoryIdSeq base_interfaces;
-                boolean is_abstract;    
-	};
-
-
-        typedef short Visibility; 
-        const Visibility PRIVATE_MEMBER = 0; 
-        const Visibility PUBLIC_MEMBER = 1; 
-        
-        struct ValueMember { 
-        Identifier name; 
-        RepositoryId id; 
-        RepositoryId defined_in; 
-        VersionSpec version; 
-        TypeCode type; 
-        IDLType type_def; 
-        Visibility access; }; 
-        
-        typedef sequence <ValueMember> ValueMemberSeq; 
-        interface ValueMemberDef : Contained { 
-        readonly attribute TypeCode type; 
-        attribute IDLType type_def; 
-        attribute Visibility access; }; 
-
-        interface ValueDef : Container, Contained, IDLType { 
-        
-        // read/write interface 
-        attribute InterfaceDef supported_interface; 
-        attribute InitializerSeq initializers;
-
-        attribute ValueDef base_value; 
-        attribute ValueDefSeq abstract_base_values; 
-        attribute boolean is_abstract; 
-        attribute boolean is_custom; 
-        attribute boolean is_truncatable; 
-
-        // read interface 
-        boolean is_a( in RepositoryId value_id );
-	
-        struct FullValueDescription { 
-        Identifier name; 
-        RepositoryId id; 
-        boolean is_abstract; 
-        boolean is_custom; 
-        RepositoryId defined_in; 
-        VersionSpec version; 
-        OpDescriptionSeq operations; 
-        AttrDescriptionSeq attributes; 
-        ValueMemberSeq members; 
-        InitializerSeq initializers; 
-        RepositoryIdSeq supported_interfaces; 
-        RepositoryIdSeq abstract_base_values; 
-        boolean is_truncatable; 
-        RepositoryId base_value; 
-        TypeCode type; };
-
-        FullValueDescription describe_value(); 
-        
-        ValueMemberDef create_value_member( 
-        in RepositoryId id, 
-        in Identifier name, 
-        in VersionSpec version, 
-        in IDLType type, 
-        in Visibility access ); 
-        
-        AttributeDef create_attribute( 
-        in RepositoryId id, 
-        in Identifier name, 
-        in VersionSpec version, 
-        in IDLType type, 
-        in AttributeMode mode );
-
-        OperationDef create_operation ( 
-        in RepositoryId id, 
-        in Identifier name, 
-        in VersionSpec version,
-
-        in IDLType result, 
-        in OperationMode mode, 
-        in ParDescriptionSeq params, 
-        in ExceptionDefSeq exceptions, 
-        in ContextIdSeq contexts ); 
-        
-        };
-
-       struct ValueDescription 
-       { 
-         Identifier name; 
-         RepositoryId id; 
-         boolean is_abstract; 
-         boolean is_custom; 
-         RepositoryId defined_in; 
-         VersionSpec version; 
-         RepositoryId supported_interface; 
-         RepositoryIdSeq abstract_base_values; 
-         boolean is_truncatable; 
-         RepositoryId base_value; 
-       }; 
-
-       interface ValueBoxDef : IDLType 
-       { attribute IDLType original_type_def; };
-
-       
-
-       typedef short ValueModifier; 
-       const ValueModifier VM_NONE = 0; 
-       const ValueModifier VM_CUSTOM = 1; 
-       const ValueModifier VM_ABSTRACT = 2; 
-       const ValueModifier VM_TRUNCATABLE = 3;
-
-        };
diff --git a/TAO/tao/InterfaceC.cpp b/TAO/tao/InterfaceC.cpp
deleted file mode 100644
index 10d58fbddf3..00000000000
--- a/TAO/tao/InterfaceC.cpp
+++ /dev/null
@@ -1,17277 +0,0 @@
-/* -*- C++ -*- */
-//$Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "InterfaceC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "InterfaceC.i"
-#endif /* !defined INLINE */
-
-static const CORBA::Long _oc_CORBA_Identifier[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-  11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-  CORBA::tk_string, 
-  0U, // string length
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Identifier (CORBA::tk_alias, sizeof (_oc_CORBA_Identifier), (char *) &_oc_CORBA_Identifier, 0, sizeof (CORBA::Identifier));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Identifier, &_tc_TAO_tc_CORBA_Identifier)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_ScopedName[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5363), ACE_NTOHL (0x6f706564), ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ScopedName:1.0
-  11, ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65644e61), ACE_NTOHL (0x6d650000),  // name = ScopedName
-  CORBA::tk_string, 
-  0U, // string length
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ScopedName (CORBA::tk_alias, sizeof (_oc_CORBA_ScopedName), (char *) &_oc_CORBA_ScopedName, 0, sizeof (CORBA::ScopedName));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ScopedName, &_tc_TAO_tc_CORBA_ScopedName)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_RepositoryId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-  13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-  CORBA::tk_string, 
-  0U, // string length
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryId (CORBA::tk_alias, sizeof (_oc_CORBA_RepositoryId), (char *) &_oc_CORBA_RepositoryId, 0, sizeof (CORBA::RepositoryId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryId, &_tc_TAO_tc_CORBA_RepositoryId)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_DefinitionKind[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4465), ACE_NTOHL (0x66696e69), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4b696e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
-  15, ACE_NTOHL (0x44656669), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x6f6e4b69), ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-  24, // member count
-  8, ACE_NTOHL (0x646b5f6e), ACE_NTOHL (0x6f6e6500),  // name = dk_none
-  7, ACE_NTOHL (0x646b5f61), ACE_NTOHL (0x6c6c0000),  // name = dk_all
-  13, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x0),  // name = dk_Attribute
-  12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7400),  // name = dk_Constant
-  13, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = dk_Exception
-  13, ACE_NTOHL (0x646b5f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x0),  // name = dk_Interface
-  10, ACE_NTOHL (0x646b5f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65000000),  // name = dk_Module
-  13, ACE_NTOHL (0x646b5f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = dk_Operation
-  11, ACE_NTOHL (0x646b5f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65660000),  // name = dk_Typedef
-  9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x0),  // name = dk_Alias
-  10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74000000),  // name = dk_Struct
-  9, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x0),  // name = dk_Union
-  8, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-  13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0),  // name = dk_Primitive
-  10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000),  // name = dk_String
-  12, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-  9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x0),  // name = dk_Array
-  14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000),  // name = dk_Repository
-  11, ACE_NTOHL (0x646b5f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-  9, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x0),  // name = dk_Fixed
-  9, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0),  // name = dk_Value
-  12, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-  15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-  10, ACE_NTOHL (0x646b5f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65000000),  // name = dk_Native
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DefinitionKind (CORBA::tk_enum, sizeof (_oc_CORBA_DefinitionKind), (char *) &_oc_CORBA_DefinitionKind, 0, sizeof (CORBA::DefinitionKind));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DefinitionKind, &_tc_TAO_tc_CORBA_DefinitionKind)
-TAO_NAMESPACE_END
-CORBA::IRObject_ptr CORBA::IRObject::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::IRObject::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::IRObject::_nil ());
-  if (is_a == 0)
-    return CORBA::IRObject::_nil ();
-  return CORBA::IRObject::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::IRObject_ptr CORBA::IRObject::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::IRObject::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_IRObject_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_IRObject_ptr retv = _TAO_collocation_CORBA_IRObject_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::IRObject(stub);
-}
-
-CORBA::IRObject_ptr 
-CORBA::IRObject::_duplicate (CORBA::IRObject_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::DefinitionKind CORBA::IRObject::def_kind (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::DefinitionKind _tao_retval = (CORBA::DefinitionKind)0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""def_kind",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::IRObject::destroy (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "destroy",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::IRObject::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/IRObject:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_IRObject[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4952), ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/IRObject:1.0
-  9, ACE_NTOHL (0x49524f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0),  // name = IRObject
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_IRObject (CORBA::tk_objref, sizeof (_oc_CORBA_IRObject), (char *) &_oc_CORBA_IRObject, 0, sizeof (CORBA::IRObject));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IRObject, &_tc_TAO_tc_CORBA_IRObject)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_VersionSpec[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-  12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-  CORBA::tk_string, 
-  0U, // string length
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_VersionSpec (CORBA::tk_alias, sizeof (_oc_CORBA_VersionSpec), (char *) &_oc_CORBA_VersionSpec, 0, sizeof (CORBA::VersionSpec));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_VersionSpec, &_tc_TAO_tc_CORBA_VersionSpec)
-TAO_NAMESPACE_END
-CORBA::Contained_ptr CORBA::Contained::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::Contained::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Contained:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Contained::_nil ());
-  if (is_a == 0)
-    return CORBA::Contained::_nil ();
-  return CORBA::Contained::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::Contained_ptr CORBA::Contained::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::Contained::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_Contained_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_Contained_ptr retv = _TAO_collocation_CORBA_Contained_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::Contained(stub);
-}
-
-CORBA::Contained_ptr 
-CORBA::Contained::_duplicate (CORBA::Contained_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-char * CORBA::Contained::id (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  char* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""id",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::Contained::id (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""id",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-char * CORBA::Contained::name (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  char* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""name",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::Contained::name (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""name",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << name)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-char * CORBA::Contained::version (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  char* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""version",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::Contained::version (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""version",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << version)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Container_ptr CORBA::Contained::defined_in (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Container_ptr _tao_retval = CORBA::Container::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""defined_in",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-char * CORBA::Contained::absolute_name (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  char* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""absolute_name",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Repository_ptr CORBA::Contained::containing_repository (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Repository_ptr _tao_retval = CORBA::Repository::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""containing_repository",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-static const CORBA::Long _oc_CORBA_Contained_Description[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746169), ACE_NTOHL (0x6e65642f), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained/Description:1.0
-  12, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00),  // name = Description
-  2, // member count
-  5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0),  // name = kind
-  CORBA::tk_enum, // typecode kind
-  472, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4465), ACE_NTOHL (0x66696e69), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4b696e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
-    15, ACE_NTOHL (0x44656669), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x6f6e4b69), ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-    24, // member count
-    8, ACE_NTOHL (0x646b5f6e), ACE_NTOHL (0x6f6e6500),  // name = dk_none
-    7, ACE_NTOHL (0x646b5f61), ACE_NTOHL (0x6c6c0000),  // name = dk_all
-    13, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x0),  // name = dk_Attribute
-    12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7400),  // name = dk_Constant
-    13, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = dk_Exception
-    13, ACE_NTOHL (0x646b5f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x0),  // name = dk_Interface
-    10, ACE_NTOHL (0x646b5f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65000000),  // name = dk_Module
-    13, ACE_NTOHL (0x646b5f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = dk_Operation
-    11, ACE_NTOHL (0x646b5f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65660000),  // name = dk_Typedef
-    9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x0),  // name = dk_Alias
-    10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74000000),  // name = dk_Struct
-    9, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x0),  // name = dk_Union
-    8, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-    13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0),  // name = dk_Primitive
-    10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000),  // name = dk_String
-    12, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-    9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x0),  // name = dk_Array
-    14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000),  // name = dk_Repository
-    11, ACE_NTOHL (0x646b5f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-    9, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x0),  // name = dk_Fixed
-    9, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0),  // name = dk_Value
-    12, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-    15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-    10, ACE_NTOHL (0x646b5f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65000000),  // name = dk_Native
-
-  6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_any,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained_Description (CORBA::tk_struct, sizeof (_oc_CORBA_Contained_Description), (char *) &_oc_CORBA_Contained_Description, 0, sizeof (CORBA::Contained::Description));
-CORBA::TypeCode_ptr CORBA::Contained::_tc_Description = &_tc_TAO_tc_CORBA_Contained_Description;
-
-CORBA::Contained::Description * CORBA::Contained::describe (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Contained::Description* _tao_retval = 0;
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::Contained::Description, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "describe",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::Contained::move (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "move",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << new_container) &&
-          (_tao_out << new_name) &&
-          (_tao_out << new_version)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::Contained::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Contained:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_Contained[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746169), ACE_NTOHL (0x6e65643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
-  10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = Contained
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained (CORBA::tk_objref, sizeof (_oc_CORBA_Contained), (char *) &_oc_CORBA_Contained, 0, sizeof (CORBA::Contained));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Contained, &_tc_TAO_tc_CORBA_Contained)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_
-
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::InterfaceDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::InterfaceDef **old = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA::InterfaceDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA::InterfaceDef **tmp = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::InterfaceDef::_nil ();
-    }
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA::InterfaceDef **tmp = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::InterfaceDef::_nil ();
-    }
-  }
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA::InterfaceDef **tmp = ACE_static_cast (CORBA::InterfaceDef**, target);
-    *tmp = CORBA::InterfaceDef::_narrow (src, ACE_TRY_ENV);
-  }
-
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_upcast (void *src) const
-  {
-    CORBA::InterfaceDef **tmp = ACE_static_cast (CORBA::InterfaceDef**, src);
-    return *tmp;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INTERFACEDEFSEQ_CS_)
-#define _CORBA_INTERFACEDEFSEQ_CS_
-
-// *************************************************************
-// CORBA::InterfaceDefSeq
-// *************************************************************
-
-CORBA::InterfaceDefSeq::CORBA_InterfaceDefSeq (void)
-{}
-CORBA::InterfaceDefSeq::CORBA_InterfaceDefSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::InterfaceDefSeq::CORBA_InterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::InterfaceDef_ptr *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::InterfaceDefSeq::CORBA_InterfaceDefSeq (const CORBA_InterfaceDefSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::InterfaceDefSeq::~CORBA_InterfaceDefSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_InterfaceDefSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f496e), ACE_NTOHL (0x74657266), ACE_NTOHL (0x61636544), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InterfaceDefSeq:1.0
-  16, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x53657100),  // name = InterfaceDefSeq
-  CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f496e), ACE_NTOHL (0x74657266), ACE_NTOHL (0x61636544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-      13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = InterfaceDef
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDefSeq (CORBA::tk_alias, sizeof (_oc_CORBA_InterfaceDefSeq), (char *) &_oc_CORBA_InterfaceDefSeq, 0, sizeof (CORBA::InterfaceDefSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDefSeq, &_tc_TAO_tc_CORBA_InterfaceDefSeq)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_
-
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ValueDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::ValueDef **old = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA::ValueDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA::ValueDef **tmp = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::ValueDef::_nil ();
-    }
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA::ValueDef **tmp = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::ValueDef::_nil ();
-    }
-  }
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA::ValueDef **tmp = ACE_static_cast (CORBA::ValueDef**, target);
-    *tmp = CORBA::ValueDef::_narrow (src, ACE_TRY_ENV);
-  }
-
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_upcast (void *src) const
-  {
-    CORBA::ValueDef **tmp = ACE_static_cast (CORBA::ValueDef**, src);
-    return *tmp;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEDEFSEQ_CS_)
-#define _CORBA_VALUEDEFSEQ_CS_
-
-// *************************************************************
-// CORBA::ValueDefSeq
-// *************************************************************
-
-CORBA::ValueDefSeq::CORBA_ValueDefSeq (void)
-{}
-CORBA::ValueDefSeq::CORBA_ValueDefSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ValueDef,CORBA::ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ValueDefSeq::CORBA_ValueDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ValueDef_ptr *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ValueDef,CORBA::ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ValueDefSeq::CORBA_ValueDefSeq (const CORBA_ValueDefSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ValueDef,CORBA::ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ValueDefSeq::~CORBA_ValueDefSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_ValueDefSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c756544), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueDefSeq:1.0
-  12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x53657100),  // name = ValueDefSeq
-  CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c756544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-      9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = ValueDef
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDefSeq (CORBA::tk_alias, sizeof (_oc_CORBA_ValueDefSeq), (char *) &_oc_CORBA_ValueDefSeq, 0, sizeof (CORBA::ValueDefSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDefSeq, &_tc_TAO_tc_CORBA_ValueDefSeq)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_
-
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::Contained **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::Contained **old = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA::Contained::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA::Contained **tmp = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Contained::_nil ();
-    }
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA::Contained **tmp = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Contained::_nil ();
-    }
-  }
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA::Contained **tmp = ACE_static_cast (CORBA::Contained**, target);
-    *tmp = CORBA::Contained::_narrow (src, ACE_TRY_ENV);
-  }
-
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_upcast (void *src) const
-  {
-    CORBA::Contained **tmp = ACE_static_cast (CORBA::Contained**, src);
-    return *tmp;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_CONTAINEDSEQ_CS_)
-#define _CORBA_CONTAINEDSEQ_CS_
-
-// *************************************************************
-// CORBA::ContainedSeq
-// *************************************************************
-
-CORBA::ContainedSeq::CORBA_ContainedSeq (void)
-{}
-CORBA::ContainedSeq::CORBA_ContainedSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ContainedSeq::CORBA_ContainedSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Contained_ptr *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ContainedSeq::CORBA_ContainedSeq (const CORBA_ContainedSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ContainedSeq::~CORBA_ContainedSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_ContainedSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746169), ACE_NTOHL (0x6e656453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContainedSeq:1.0
-  13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0),  // name = ContainedSeq
-  CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746169), ACE_NTOHL (0x6e65643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
-      10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = Contained
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ContainedSeq (CORBA::tk_alias, sizeof (_oc_CORBA_ContainedSeq), (char *) &_oc_CORBA_ContainedSeq, 0, sizeof (CORBA::ContainedSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContainedSeq, &_tc_TAO_tc_CORBA_ContainedSeq)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_StructMember[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72756374), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-  13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = StructMember
-  3, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMember (CORBA::tk_struct, sizeof (_oc_CORBA_StructMember), (char *) &_oc_CORBA_StructMember, 0, sizeof (CORBA::StructMember));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructMember, &_tc_TAO_tc_CORBA_StructMember)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CS_
-
-  void
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::StructMember* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::StructMember *old = ACE_reinterpret_cast (CORBA::StructMember *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::StructMember *tmp = ACE_reinterpret_cast (CORBA::StructMember *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ_CS_)
-#define _CORBA_STRUCTMEMBERSEQ_CS_
-
-// *************************************************************
-// CORBA::StructMemberSeq
-// *************************************************************
-
-CORBA::StructMemberSeq::CORBA_StructMemberSeq (void)
-{}
-CORBA::StructMemberSeq::CORBA_StructMemberSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::StructMemberSeq::CORBA_StructMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA::StructMember *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::StructMemberSeq::CORBA_StructMemberSeq (const CORBA_StructMemberSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::StructMemberSeq::~CORBA_StructMemberSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72756374), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-  16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-  CORBA::tk_sequence, // typecode kind
-  264, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    248, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72756374), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-      13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = StructMember
-      3, // member count
-      5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-        0U, // string length
-
-      5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-      9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMemberSeq (CORBA::tk_alias, sizeof (_oc_CORBA_StructMemberSeq), (char *) &_oc_CORBA_StructMemberSeq, 0, sizeof (CORBA::StructMemberSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructMemberSeq, &_tc_TAO_tc_CORBA_StructMemberSeq)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_Initializer[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f496e), ACE_NTOHL (0x69746961), ACE_NTOHL (0x6c697a65), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
-  12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200),  // name = Initializer
-  1, // member count
-  8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300),  // name = members
-  CORBA::tk_alias, // typecode kind for typedefs
-  340, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72756374), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-    16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-    CORBA::tk_sequence, // typecode kind
-    264, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      248, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72756374), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-        13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = StructMember
-        3, // member count
-        5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
-        5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
-
-        9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-        CORBA::tk_objref, // typecode kind
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-          8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-
-      0U,
-
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Initializer (CORBA::tk_struct, sizeof (_oc_CORBA_Initializer), (char *) &_oc_CORBA_Initializer, 0, sizeof (CORBA::Initializer));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Initializer, &_tc_TAO_tc_CORBA_Initializer)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CS_
-
-  void
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::Initializer* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::Initializer *old = ACE_reinterpret_cast (CORBA::Initializer *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::Initializer *tmp = ACE_reinterpret_cast (CORBA::Initializer *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INITIALIZERSEQ_CS_)
-#define _CORBA_INITIALIZERSEQ_CS_
-
-// *************************************************************
-// CORBA::InitializerSeq
-// *************************************************************
-
-CORBA::InitializerSeq::CORBA_InitializerSeq (void)
-{}
-CORBA::InitializerSeq::CORBA_InitializerSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::InitializerSeq::CORBA_InitializerSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Initializer *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::InitializerSeq::CORBA_InitializerSeq (const CORBA_InitializerSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::InitializerSeq::~CORBA_InitializerSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_InitializerSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f496e), ACE_NTOHL (0x69746961), ACE_NTOHL (0x6c697a65), ACE_NTOHL (0x72536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
-  15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000),  // name = InitializerSeq
-  CORBA::tk_sequence, // typecode kind
-  440, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    424, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f496e), ACE_NTOHL (0x69746961), ACE_NTOHL (0x6c697a65), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
-      12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200),  // name = Initializer
-      1, // member count
-      8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300),  // name = members
-      CORBA::tk_alias, // typecode kind for typedefs
-      340, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72756374), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-        16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-        CORBA::tk_sequence, // typecode kind
-        264, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_struct, // typecode kind
-          248, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72756374), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-            13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = StructMember
-            3, // member count
-            5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-              11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-              CORBA::tk_string, 
-              0U, // string length
-
-            5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
-
-            9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-            CORBA::tk_objref, // typecode kind
-            52, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-              8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-
-          0U,
-
-
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InitializerSeq (CORBA::tk_alias, sizeof (_oc_CORBA_InitializerSeq), (char *) &_oc_CORBA_InitializerSeq, 0, sizeof (CORBA::InitializerSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InitializerSeq, &_tc_TAO_tc_CORBA_InitializerSeq)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_UnionMember[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f556e), ACE_NTOHL (0x696f6e4d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
-  12, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657200),  // name = UnionMember
-  4, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  6, ACE_NTOHL (0x6c616265), ACE_NTOHL (0x6c000000),  // name = label
-  CORBA::tk_any,
-
-  5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMember (CORBA::tk_struct, sizeof (_oc_CORBA_UnionMember), (char *) &_oc_CORBA_UnionMember, 0, sizeof (CORBA::UnionMember));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionMember, &_tc_TAO_tc_CORBA_UnionMember)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CS_
-
-  void
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::UnionMember* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::UnionMember *old = ACE_reinterpret_cast (CORBA::UnionMember *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::UnionMember *tmp = ACE_reinterpret_cast (CORBA::UnionMember *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_UNIONMEMBERSEQ_CS_)
-#define _CORBA_UNIONMEMBERSEQ_CS_
-
-// *************************************************************
-// CORBA::UnionMemberSeq
-// *************************************************************
-
-CORBA::UnionMemberSeq::CORBA_UnionMemberSeq (void)
-{}
-CORBA::UnionMemberSeq::CORBA_UnionMemberSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::UnionMemberSeq::CORBA_UnionMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA::UnionMember *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::UnionMemberSeq::CORBA_UnionMemberSeq (const CORBA_UnionMemberSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::UnionMemberSeq::~CORBA_UnionMemberSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f556e), ACE_NTOHL (0x696f6e4d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x72536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/UnionMemberSeq:1.0
-  15, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000),  // name = UnionMemberSeq
-  CORBA::tk_sequence, // typecode kind
-  276, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    260, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f556e), ACE_NTOHL (0x696f6e4d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
-      12, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657200),  // name = UnionMember
-      4, // member count
-      5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-        0U, // string length
-
-      6, ACE_NTOHL (0x6c616265), ACE_NTOHL (0x6c000000),  // name = label
-      CORBA::tk_any,
-
-      5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-      9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMemberSeq (CORBA::tk_alias, sizeof (_oc_CORBA_UnionMemberSeq), (char *) &_oc_CORBA_UnionMemberSeq, 0, sizeof (CORBA::UnionMemberSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionMemberSeq, &_tc_TAO_tc_CORBA_UnionMemberSeq)
-TAO_NAMESPACE_END
-
-#if !defined (_CORBA_ENUMMEMBERSEQ_CS_)
-#define _CORBA_ENUMMEMBERSEQ_CS_
-
-// *************************************************************
-// CORBA::EnumMemberSeq
-// *************************************************************
-
-CORBA::EnumMemberSeq::CORBA_EnumMemberSeq (void)
-{}
-CORBA::EnumMemberSeq::CORBA_EnumMemberSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::EnumMemberSeq::CORBA_EnumMemberSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::EnumMemberSeq::CORBA_EnumMemberSeq (const CORBA_EnumMemberSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::EnumMemberSeq::~CORBA_EnumMemberSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_EnumMemberSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f456e), ACE_NTOHL (0x756d4d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/EnumMemberSeq:1.0
-  14, ACE_NTOHL (0x456e756d), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x71000000),  // name = EnumMemberSeq
-  CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-      11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-      CORBA::tk_string, 
-      0U, // string length
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_EnumMemberSeq (CORBA::tk_alias, sizeof (_oc_CORBA_EnumMemberSeq), (char *) &_oc_CORBA_EnumMemberSeq, 0, sizeof (CORBA::EnumMemberSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumMemberSeq, &_tc_TAO_tc_CORBA_EnumMemberSeq)
-TAO_NAMESPACE_END
-CORBA::Container_ptr CORBA::Container::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::Container::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Container:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Container::_nil ());
-  if (is_a == 0)
-    return CORBA::Container::_nil ();
-  return CORBA::Container::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::Container_ptr CORBA::Container::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::Container::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_Container_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_Container_ptr retv = _TAO_collocation_CORBA_Container_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::Container(stub);
-}
-
-CORBA::Container_ptr 
-CORBA::Container::_duplicate (CORBA::Container_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::Contained_ptr CORBA::Container::lookup (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Contained_ptr _tao_retval = CORBA::Contained::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "lookup",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << search_name)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ContainedSeq * CORBA::Container::contents (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ContainedSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::ContainedSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "contents",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << limit_type) &&
-          (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ContainedSeq * CORBA::Container::lookup_name (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ContainedSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::ContainedSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "lookup_name",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << search_name) &&
-          (_tao_out << levels_to_search) &&
-          (_tao_out << limit_type) &&
-          (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-static const CORBA::Long _oc_CORBA_Container_Description[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746169), ACE_NTOHL (0x6e65722f), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
-  12, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00),  // name = Description
-  3, // member count
-  17, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x645f6f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0),  // name = contained_object
-  CORBA::tk_objref, // typecode kind
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746169), ACE_NTOHL (0x6e65643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
-    10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = Contained
-
-  5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0),  // name = kind
-  CORBA::tk_enum, // typecode kind
-  472, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4465), ACE_NTOHL (0x66696e69), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4b696e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
-    15, ACE_NTOHL (0x44656669), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x6f6e4b69), ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-    24, // member count
-    8, ACE_NTOHL (0x646b5f6e), ACE_NTOHL (0x6f6e6500),  // name = dk_none
-    7, ACE_NTOHL (0x646b5f61), ACE_NTOHL (0x6c6c0000),  // name = dk_all
-    13, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x0),  // name = dk_Attribute
-    12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7400),  // name = dk_Constant
-    13, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = dk_Exception
-    13, ACE_NTOHL (0x646b5f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x0),  // name = dk_Interface
-    10, ACE_NTOHL (0x646b5f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65000000),  // name = dk_Module
-    13, ACE_NTOHL (0x646b5f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = dk_Operation
-    11, ACE_NTOHL (0x646b5f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65660000),  // name = dk_Typedef
-    9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x0),  // name = dk_Alias
-    10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74000000),  // name = dk_Struct
-    9, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x0),  // name = dk_Union
-    8, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-    13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0),  // name = dk_Primitive
-    10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000),  // name = dk_String
-    12, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-    9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x0),  // name = dk_Array
-    14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000),  // name = dk_Repository
-    11, ACE_NTOHL (0x646b5f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-    9, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x0),  // name = dk_Fixed
-    9, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0),  // name = dk_Value
-    12, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-    15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-    10, ACE_NTOHL (0x646b5f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65000000),  // name = dk_Native
-
-  6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_any,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_Description (CORBA::tk_struct, sizeof (_oc_CORBA_Container_Description), (char *) &_oc_CORBA_Container_Description, 0, sizeof (CORBA::Container::Description));
-CORBA::TypeCode_ptr CORBA::Container::_tc_Description = &_tc_TAO_tc_CORBA_Container_Description;
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_
-
-  void
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::Container::Description* tmp = 0;
-    tmp = CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::Container::Description *old = ACE_reinterpret_cast (CORBA::Container::Description *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::Container::Description *tmp = ACE_reinterpret_cast (CORBA::Container::Description *,this->buffer_);
-    
-    CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ_CS_
-
-// *************************************************************
-// CORBA::Container::DescriptionSeq
-// *************************************************************
-
-CORBA::Container::DescriptionSeq::DescriptionSeq (void)
-{}
-CORBA::Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Container::Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Container::Description *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Container::Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Container::Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::Container::DescriptionSeq::~DescriptionSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746169), ACE_NTOHL (0x6e65722f), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/Container/DescriptionSeq:1.0
-  15, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000),  // name = DescriptionSeq
-  CORBA::tk_sequence, // typecode kind
-  684, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    668, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746169), ACE_NTOHL (0x6e65722f), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
-      12, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00),  // name = Description
-      3, // member count
-      17, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x645f6f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0),  // name = contained_object
-      CORBA::tk_objref, // typecode kind
-      56, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746169), ACE_NTOHL (0x6e65643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
-        10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = Contained
-
-      5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0),  // name = kind
-      CORBA::tk_enum, // typecode kind
-      472, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4465), ACE_NTOHL (0x66696e69), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4b696e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
-        15, ACE_NTOHL (0x44656669), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x6f6e4b69), ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-        24, // member count
-        8, ACE_NTOHL (0x646b5f6e), ACE_NTOHL (0x6f6e6500),  // name = dk_none
-        7, ACE_NTOHL (0x646b5f61), ACE_NTOHL (0x6c6c0000),  // name = dk_all
-        13, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x0),  // name = dk_Attribute
-        12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7400),  // name = dk_Constant
-        13, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = dk_Exception
-        13, ACE_NTOHL (0x646b5f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x0),  // name = dk_Interface
-        10, ACE_NTOHL (0x646b5f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65000000),  // name = dk_Module
-        13, ACE_NTOHL (0x646b5f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = dk_Operation
-        11, ACE_NTOHL (0x646b5f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65660000),  // name = dk_Typedef
-        9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x0),  // name = dk_Alias
-        10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74000000),  // name = dk_Struct
-        9, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x0),  // name = dk_Union
-        8, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-        13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0),  // name = dk_Primitive
-        10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000),  // name = dk_String
-        12, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-        9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x0),  // name = dk_Array
-        14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000),  // name = dk_Repository
-        11, ACE_NTOHL (0x646b5f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-        9, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x0),  // name = dk_Fixed
-        9, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0),  // name = dk_Value
-        12, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-        15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-        10, ACE_NTOHL (0x646b5f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65000000),  // name = dk_Native
-
-      6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000),  // name = value
-      CORBA::tk_any,
-
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (CORBA::tk_alias, sizeof (_oc_CORBA_Container_DescriptionSeq), (char *) &_oc_CORBA_Container_DescriptionSeq, 0, sizeof (CORBA::Container::DescriptionSeq));
-CORBA::TypeCode_ptr CORBA::Container::_tc_DescriptionSeq = &_tc_TAO_tc_CORBA_Container_DescriptionSeq;
-
-CORBA::Container::DescriptionSeq * CORBA::Container::describe_contents (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Container::DescriptionSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::Container::DescriptionSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "describe_contents",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << limit_type) &&
-          (_tao_out << CORBA::Any::from_boolean (exclude_inherited)) &&
-          (_tao_out << max_returned_objs)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ModuleDef_ptr CORBA::Container::create_module (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ModuleDef_ptr _tao_retval = CORBA::ModuleDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_module",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ConstantDef_ptr CORBA::Container::create_constant (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ConstantDef_ptr _tao_retval = CORBA::ConstantDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_constant",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << type) &&
-          (_tao_out << value)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::StructDef_ptr CORBA::Container::create_struct (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::StructDef_ptr _tao_retval = CORBA::StructDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_struct",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << members)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::UnionDef_ptr CORBA::Container::create_union (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::UnionDef_ptr _tao_retval = CORBA::UnionDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_union",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << discriminator_type) &&
-          (_tao_out << members)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::EnumDef_ptr CORBA::Container::create_enum (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::EnumDef_ptr _tao_retval = CORBA::EnumDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_enum",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << members)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::AliasDef_ptr CORBA::Container::create_alias (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::AliasDef_ptr _tao_retval = CORBA::AliasDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_alias",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << original_type)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::InterfaceDef_ptr CORBA::Container::create_interface (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::InterfaceDef_ptr _tao_retval = CORBA::InterfaceDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_interface",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << base_interfaces)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ValueDef_ptr CORBA::Container::create_value (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    CORBA::InterfaceDef_ptr supported_interface,
-    const CORBA::InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ValueDef_ptr _tao_retval = CORBA::ValueDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_value",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
-          (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
-          (_tao_out << base_value) &&
-          (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
-          (_tao_out << abstract_base_values) &&
-          (_tao_out << supported_interface) &&
-          (_tao_out << initializers)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ValueBoxDef_ptr CORBA::Container::create_value_box (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ValueBoxDef_ptr _tao_retval = CORBA::ValueBoxDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_value_box",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << original_type_def)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ExceptionDef_ptr CORBA::Container::create_exception (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ExceptionDef_ptr _tao_retval = CORBA::ExceptionDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_exception",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << members)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean CORBA::Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::Container::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Container:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_Container[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746169), ACE_NTOHL (0x6e65723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container:1.0
-  10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x72000000),  // name = Container
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Container (CORBA::tk_objref, sizeof (_oc_CORBA_Container), (char *) &_oc_CORBA_Container, 0, sizeof (CORBA::Container));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Container, &_tc_TAO_tc_CORBA_Container)
-TAO_NAMESPACE_END
-CORBA::IDLType_ptr CORBA::IDLType::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::IDLType::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IDLType:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
-  if (is_a == 0)
-    return CORBA::IDLType::_nil ();
-  return CORBA::IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::IDLType_ptr CORBA::IDLType::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::IDLType::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_IDLType_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_IDLType_ptr retv = _TAO_collocation_CORBA_IDLType_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::IDLType(stub);
-}
-
-CORBA::IDLType_ptr 
-CORBA::IDLType::_duplicate (CORBA::IDLType_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::TypeCode_ptr CORBA::IDLType::type (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::TypeCode_ptr _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""type",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean CORBA::IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::IDLType::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/IDLType:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_IDLType[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-  8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_IDLType (CORBA::tk_objref, sizeof (_oc_CORBA_IDLType), (char *) &_oc_CORBA_IDLType, 0, sizeof (CORBA::IDLType));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IDLType, &_tc_TAO_tc_CORBA_IDLType)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_PrimitiveKind[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5072), ACE_NTOHL (0x696d6974), ACE_NTOHL (0x6976654b), ACE_NTOHL (0x696e643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PrimitiveKind:1.0
-  14, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x69746976), ACE_NTOHL (0x654b696e), ACE_NTOHL (0x64000000),  // name = PrimitiveKind
-  21, // member count
-  8, ACE_NTOHL (0x706b5f6e), ACE_NTOHL (0x756c6c00),  // name = pk_null
-  8, ACE_NTOHL (0x706b5f76), ACE_NTOHL (0x6f696400),  // name = pk_void
-  9, ACE_NTOHL (0x706b5f73), ACE_NTOHL (0x686f7274), ACE_NTOHL (0x0),  // name = pk_short
-  8, ACE_NTOHL (0x706b5f6c), ACE_NTOHL (0x6f6e6700),  // name = pk_long
-  10, ACE_NTOHL (0x706b5f75), ACE_NTOHL (0x73686f72), ACE_NTOHL (0x74000000),  // name = pk_ushort
-  9, ACE_NTOHL (0x706b5f75), ACE_NTOHL (0x6c6f6e67), ACE_NTOHL (0x0),  // name = pk_ulong
-  9, ACE_NTOHL (0x706b5f66), ACE_NTOHL (0x6c6f6174), ACE_NTOHL (0x0),  // name = pk_float
-  10, ACE_NTOHL (0x706b5f64), ACE_NTOHL (0x6f75626c), ACE_NTOHL (0x65000000),  // name = pk_double
-  11, ACE_NTOHL (0x706b5f62), ACE_NTOHL (0x6f6f6c65), ACE_NTOHL (0x616e0000),  // name = pk_boolean
-  8, ACE_NTOHL (0x706b5f63), ACE_NTOHL (0x68617200),  // name = pk_char
-  9, ACE_NTOHL (0x706b5f6f), ACE_NTOHL (0x63746574), ACE_NTOHL (0x0),  // name = pk_octet
-  7, ACE_NTOHL (0x706b5f61), ACE_NTOHL (0x6e790000),  // name = pk_any
-  12, ACE_NTOHL (0x706b5f54), ACE_NTOHL (0x79706543), ACE_NTOHL (0x6f646500),  // name = pk_TypeCode
-  13, ACE_NTOHL (0x706b5f50), ACE_NTOHL (0x72696e63), ACE_NTOHL (0x6970616c), ACE_NTOHL (0x0),  // name = pk_Principal
-  10, ACE_NTOHL (0x706b5f73), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000),  // name = pk_string
-  10, ACE_NTOHL (0x706b5f6f), ACE_NTOHL (0x626a7265), ACE_NTOHL (0x66000000),  // name = pk_objref
-  12, ACE_NTOHL (0x706b5f6c), ACE_NTOHL (0x6f6e676c), ACE_NTOHL (0x6f6e6700),  // name = pk_longlong
-  13, ACE_NTOHL (0x706b5f75), ACE_NTOHL (0x6c6f6e67), ACE_NTOHL (0x6c6f6e67), ACE_NTOHL (0x0),  // name = pk_ulonglong
-  14, ACE_NTOHL (0x706b5f6c), ACE_NTOHL (0x6f6e6764), ACE_NTOHL (0x6f75626c), ACE_NTOHL (0x65000000),  // name = pk_longdouble
-  9, ACE_NTOHL (0x706b5f77), ACE_NTOHL (0x63686172), ACE_NTOHL (0x0),  // name = pk_wchar
-  11, ACE_NTOHL (0x706b5f77), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000),  // name = pk_wstring
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PrimitiveKind (CORBA::tk_enum, sizeof (_oc_CORBA_PrimitiveKind), (char *) &_oc_CORBA_PrimitiveKind, 0, sizeof (CORBA::PrimitiveKind));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveKind, &_tc_TAO_tc_CORBA_PrimitiveKind)
-TAO_NAMESPACE_END
-CORBA::Repository_ptr CORBA::Repository::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::Repository::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Repository:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Repository::_nil ());
-  if (is_a == 0)
-    return CORBA::Repository::_nil ();
-  return CORBA::Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::Repository_ptr CORBA::Repository::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::Repository::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_Repository_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_Repository_ptr retv = _TAO_collocation_CORBA_Repository_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::Repository(stub);
-}
-
-CORBA::Repository_ptr 
-CORBA::Repository::_duplicate (CORBA::Repository_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::Contained_ptr CORBA::Repository::lookup_id (
-    const char * search_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Contained_ptr _tao_retval = CORBA::Contained::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "lookup_id",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << search_id)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::PrimitiveDef_ptr CORBA::Repository::get_primitive (
-    CORBA::PrimitiveKind kind,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::PrimitiveDef_ptr _tao_retval = CORBA::PrimitiveDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "get_primitive",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << kind)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::StringDef_ptr CORBA::Repository::create_string (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::StringDef_ptr _tao_retval = CORBA::StringDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_string",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << bound)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::WstringDef_ptr CORBA::Repository::create_wstring (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::WstringDef_ptr _tao_retval = CORBA::WstringDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_wstring",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << bound)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::SequenceDef_ptr CORBA::Repository::create_sequence (
-    CORBA::ULong bound,
-    CORBA::IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::SequenceDef_ptr _tao_retval = CORBA::SequenceDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_sequence",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << bound) &&
-          (_tao_out << element_type)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ArrayDef_ptr CORBA::Repository::create_array (
-    CORBA::ULong length,
-    CORBA::IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ArrayDef_ptr _tao_retval = CORBA::ArrayDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_array",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << length) &&
-          (_tao_out << element_type)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::FixedDef_ptr CORBA::Repository::create_fixed (
-    CORBA::UShort digits,
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::FixedDef_ptr _tao_retval = CORBA::FixedDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_fixed",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << digits) &&
-          (_tao_out << scale)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean CORBA::Repository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::Repository::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Repository:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_Repository[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Repository:1.0
-  11, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72790000),  // name = Repository
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Repository (CORBA::tk_objref, sizeof (_oc_CORBA_Repository), (char *) &_oc_CORBA_Repository, 0, sizeof (CORBA::Repository));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Repository, &_tc_TAO_tc_CORBA_Repository)
-TAO_NAMESPACE_END
-CORBA::ModuleDef_ptr CORBA::ModuleDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ModuleDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ModuleDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::ModuleDef::_nil ());
-  if (is_a == 0)
-    return CORBA::ModuleDef::_nil ();
-  return CORBA::ModuleDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::ModuleDef_ptr CORBA::ModuleDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ModuleDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_ModuleDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_ModuleDef_ptr retv = _TAO_collocation_CORBA_ModuleDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::ModuleDef(stub);
-}
-
-CORBA::ModuleDef_ptr 
-CORBA::ModuleDef::_duplicate (CORBA::ModuleDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::Boolean CORBA::ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::ModuleDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ModuleDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_ModuleDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4d6f), ACE_NTOHL (0x64756c65), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ModuleDef:1.0
-  10, ACE_NTOHL (0x4d6f6475), ACE_NTOHL (0x6c654465), ACE_NTOHL (0x66000000),  // name = ModuleDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ModuleDef (CORBA::tk_objref, sizeof (_oc_CORBA_ModuleDef), (char *) &_oc_CORBA_ModuleDef, 0, sizeof (CORBA::ModuleDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ModuleDef, &_tc_TAO_tc_CORBA_ModuleDef)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_ModuleDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4d6f), ACE_NTOHL (0x64756c65), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ModuleDescription:1.0
-  18, ACE_NTOHL (0x4d6f6475), ACE_NTOHL (0x6c654465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e000000),  // name = ModuleDescription
-  4, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3, ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ModuleDescription (CORBA::tk_struct, sizeof (_oc_CORBA_ModuleDescription), (char *) &_oc_CORBA_ModuleDescription, 0, sizeof (CORBA::ModuleDescription));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ModuleDescription, &_tc_TAO_tc_CORBA_ModuleDescription)
-TAO_NAMESPACE_END
-CORBA::ConstantDef_ptr CORBA::ConstantDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ConstantDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstantDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ());
-  if (is_a == 0)
-    return CORBA::ConstantDef::_nil ();
-  return CORBA::ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::ConstantDef_ptr CORBA::ConstantDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ConstantDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_ConstantDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_ConstantDef_ptr retv = _TAO_collocation_CORBA_ConstantDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::ConstantDef(stub);
-}
-
-CORBA::ConstantDef_ptr 
-CORBA::ConstantDef::_duplicate (CORBA::ConstantDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::TypeCode_ptr CORBA::ConstantDef::type (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::TypeCode_ptr _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""type",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::IDLType_ptr CORBA::ConstantDef::type_def (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ConstantDef::type_def (
-    CORBA::IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << type_def)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Any * CORBA::ConstantDef::value (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Any* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ConstantDef::value (
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""value",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << value)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::ConstantDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::ConstantDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ConstantDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_ConstantDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e737461), ACE_NTOHL (0x6e744465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ConstantDef:1.0
-  12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x74616e74), ACE_NTOHL (0x44656600),  // name = ConstantDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstantDef (CORBA::tk_objref, sizeof (_oc_CORBA_ConstantDef), (char *) &_oc_CORBA_ConstantDef, 0, sizeof (CORBA::ConstantDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstantDef, &_tc_TAO_tc_CORBA_ConstantDef)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_ConstantDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e737461), ACE_NTOHL (0x6e744465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e3a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ConstantDescription:1.0
-  20, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x74616e74), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00),  // name = ConstantDescription
-  6, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3, ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-  5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_any,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstantDescription (CORBA::tk_struct, sizeof (_oc_CORBA_ConstantDescription), (char *) &_oc_CORBA_ConstantDescription, 0, sizeof (CORBA::ConstantDescription));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstantDescription, &_tc_TAO_tc_CORBA_ConstantDescription)
-TAO_NAMESPACE_END
-CORBA::TypedefDef_ptr CORBA::TypedefDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::TypedefDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/TypedefDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypedefDef::_nil ());
-  if (is_a == 0)
-    return CORBA::TypedefDef::_nil ();
-  return CORBA::TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::TypedefDef_ptr CORBA::TypedefDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::TypedefDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_TypedefDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_TypedefDef_ptr retv = _TAO_collocation_CORBA_TypedefDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::TypedefDef(stub);
-}
-
-CORBA::TypedefDef_ptr 
-CORBA::TypedefDef::_duplicate (CORBA::TypedefDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::Boolean CORBA::TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::TypedefDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/TypedefDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_TypedefDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5479), ACE_NTOHL (0x70656465), ACE_NTOHL (0x66446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/TypedefDef:1.0
-  11, ACE_NTOHL (0x54797065), ACE_NTOHL (0x64656644), ACE_NTOHL (0x65660000),  // name = TypedefDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_TypedefDef (CORBA::tk_objref, sizeof (_oc_CORBA_TypedefDef), (char *) &_oc_CORBA_TypedefDef, 0, sizeof (CORBA::TypedefDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypedefDef, &_tc_TAO_tc_CORBA_TypedefDef)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_TypeDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5479), ACE_NTOHL (0x70654465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e3a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/TypeDescription:1.0
-  16, ACE_NTOHL (0x54797065), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00),  // name = TypeDescription
-  5, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3, ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-  5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_TypeDescription (CORBA::tk_struct, sizeof (_oc_CORBA_TypeDescription), (char *) &_oc_CORBA_TypeDescription, 0, sizeof (CORBA::TypeDescription));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypeDescription, &_tc_TAO_tc_CORBA_TypeDescription)
-TAO_NAMESPACE_END
-CORBA::StructDef_ptr CORBA::StructDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::StructDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StructDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::StructDef::_nil ());
-  if (is_a == 0)
-    return CORBA::StructDef::_nil ();
-  return CORBA::StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::StructDef_ptr CORBA::StructDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::StructDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_StructDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_StructDef_ptr retv = _TAO_collocation_CORBA_StructDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::StructDef(stub);
-}
-
-CORBA::StructDef_ptr 
-CORBA::StructDef::_duplicate (CORBA::StructDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::StructMemberSeq * CORBA::StructDef::members (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::StructMemberSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::StructMemberSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""members",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::StructDef::members (
-    const CORBA::StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""members",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << members)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::StructDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::StructDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/StructDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_StructDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72756374), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StructDef:1.0
-  10, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744465), ACE_NTOHL (0x66000000),  // name = StructDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StructDef (CORBA::tk_objref, sizeof (_oc_CORBA_StructDef), (char *) &_oc_CORBA_StructDef, 0, sizeof (CORBA::StructDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructDef, &_tc_TAO_tc_CORBA_StructDef)
-TAO_NAMESPACE_END
-CORBA::UnionDef_ptr CORBA::UnionDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::UnionDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/UnionDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::UnionDef::_nil ());
-  if (is_a == 0)
-    return CORBA::UnionDef::_nil ();
-  return CORBA::UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::UnionDef_ptr CORBA::UnionDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::UnionDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_UnionDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_UnionDef_ptr retv = _TAO_collocation_CORBA_UnionDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::UnionDef(stub);
-}
-
-CORBA::UnionDef_ptr 
-CORBA::UnionDef::_duplicate (CORBA::UnionDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::TypeCode_ptr _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""discriminator_type",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::IDLType_ptr CORBA::UnionDef::discriminator_type_def (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""discriminator_type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::UnionDef::discriminator_type_def (
-    CORBA::IDLType_ptr discriminator_type_def,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""discriminator_type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << discriminator_type_def)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::UnionMemberSeq * CORBA::UnionDef::members (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::UnionMemberSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::UnionMemberSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""members",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::UnionDef::members (
-    const CORBA::UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""members",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << members)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::UnionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::UnionDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/UnionDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_UnionDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f556e), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/UnionDef:1.0
-  9, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = UnionDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionDef (CORBA::tk_objref, sizeof (_oc_CORBA_UnionDef), (char *) &_oc_CORBA_UnionDef, 0, sizeof (CORBA::UnionDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionDef, &_tc_TAO_tc_CORBA_UnionDef)
-TAO_NAMESPACE_END
-CORBA::EnumDef_ptr CORBA::EnumDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::EnumDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/EnumDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::EnumDef::_nil ());
-  if (is_a == 0)
-    return CORBA::EnumDef::_nil ();
-  return CORBA::EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::EnumDef_ptr CORBA::EnumDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::EnumDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_EnumDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_EnumDef_ptr retv = _TAO_collocation_CORBA_EnumDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::EnumDef(stub);
-}
-
-CORBA::EnumDef_ptr 
-CORBA::EnumDef::_duplicate (CORBA::EnumDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::EnumMemberSeq * CORBA::EnumDef::members (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::EnumMemberSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::EnumMemberSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""members",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::EnumDef::members (
-    const CORBA::EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""members",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << members)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::EnumDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::EnumDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/EnumDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_EnumDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f456e), ACE_NTOHL (0x756d4465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/EnumDef:1.0
-  8, ACE_NTOHL (0x456e756d), ACE_NTOHL (0x44656600),  // name = EnumDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_EnumDef (CORBA::tk_objref, sizeof (_oc_CORBA_EnumDef), (char *) &_oc_CORBA_EnumDef, 0, sizeof (CORBA::EnumDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumDef, &_tc_TAO_tc_CORBA_EnumDef)
-TAO_NAMESPACE_END
-CORBA::AliasDef_ptr CORBA::AliasDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::AliasDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AliasDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::AliasDef::_nil ());
-  if (is_a == 0)
-    return CORBA::AliasDef::_nil ();
-  return CORBA::AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::AliasDef_ptr CORBA::AliasDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::AliasDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_AliasDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_AliasDef_ptr retv = _TAO_collocation_CORBA_AliasDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::AliasDef(stub);
-}
-
-CORBA::AliasDef_ptr 
-CORBA::AliasDef::_duplicate (CORBA::AliasDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::IDLType_ptr CORBA::AliasDef::original_type_def (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""original_type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::AliasDef::original_type_def (
-    CORBA::IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""original_type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << original_type_def)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::AliasDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::AliasDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/AliasDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_AliasDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f416c), ACE_NTOHL (0x69617344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AliasDef:1.0
-  9, ACE_NTOHL (0x416c6961), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = AliasDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AliasDef (CORBA::tk_objref, sizeof (_oc_CORBA_AliasDef), (char *) &_oc_CORBA_AliasDef, 0, sizeof (CORBA::AliasDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AliasDef, &_tc_TAO_tc_CORBA_AliasDef)
-TAO_NAMESPACE_END
-CORBA::PrimitiveDef_ptr CORBA::PrimitiveDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::PrimitiveDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PrimitiveDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::PrimitiveDef::_nil ());
-  if (is_a == 0)
-    return CORBA::PrimitiveDef::_nil ();
-  return CORBA::PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::PrimitiveDef_ptr CORBA::PrimitiveDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::PrimitiveDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_PrimitiveDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_PrimitiveDef_ptr retv = _TAO_collocation_CORBA_PrimitiveDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::PrimitiveDef(stub);
-}
-
-CORBA::PrimitiveDef_ptr 
-CORBA::PrimitiveDef::_duplicate (CORBA::PrimitiveDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::PrimitiveKind CORBA::PrimitiveDef::kind (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::PrimitiveKind _tao_retval = (CORBA::PrimitiveKind)0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""kind",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean CORBA::PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::PrimitiveDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PrimitiveDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_PrimitiveDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5072), ACE_NTOHL (0x696d6974), ACE_NTOHL (0x69766544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/PrimitiveDef:1.0
-  13, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x69746976), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = PrimitiveDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PrimitiveDef (CORBA::tk_objref, sizeof (_oc_CORBA_PrimitiveDef), (char *) &_oc_CORBA_PrimitiveDef, 0, sizeof (CORBA::PrimitiveDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveDef, &_tc_TAO_tc_CORBA_PrimitiveDef)
-TAO_NAMESPACE_END
-CORBA::StringDef_ptr CORBA::StringDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::StringDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StringDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::StringDef::_nil ());
-  if (is_a == 0)
-    return CORBA::StringDef::_nil ();
-  return CORBA::StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::StringDef_ptr CORBA::StringDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::StringDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_StringDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_StringDef_ptr retv = _TAO_collocation_CORBA_StringDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::StringDef(stub);
-}
-
-CORBA::StringDef_ptr 
-CORBA::StringDef::_duplicate (CORBA::StringDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::ULong CORBA::StringDef::bound (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ULong _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""bound",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::StringDef::bound (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""bound",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << bound)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::StringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::StringDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/StringDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_StringDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72696e67), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringDef:1.0
-  10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e674465), ACE_NTOHL (0x66000000),  // name = StringDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StringDef (CORBA::tk_objref, sizeof (_oc_CORBA_StringDef), (char *) &_oc_CORBA_StringDef, 0, sizeof (CORBA::StringDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringDef, &_tc_TAO_tc_CORBA_StringDef)
-TAO_NAMESPACE_END
-CORBA::WstringDef_ptr CORBA::WstringDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::WstringDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/WstringDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::WstringDef::_nil ());
-  if (is_a == 0)
-    return CORBA::WstringDef::_nil ();
-  return CORBA::WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::WstringDef_ptr CORBA::WstringDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::WstringDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_WstringDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_WstringDef_ptr retv = _TAO_collocation_CORBA_WstringDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::WstringDef(stub);
-}
-
-CORBA::WstringDef_ptr 
-CORBA::WstringDef::_duplicate (CORBA::WstringDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::ULong CORBA::WstringDef::bound (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ULong _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""bound",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::WstringDef::bound (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""bound",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << bound)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::WstringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::WstringDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/WstringDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_WstringDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5773), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WstringDef:1.0
-  11, ACE_NTOHL (0x57737472), ACE_NTOHL (0x696e6744), ACE_NTOHL (0x65660000),  // name = WstringDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_WstringDef (CORBA::tk_objref, sizeof (_oc_CORBA_WstringDef), (char *) &_oc_CORBA_WstringDef, 0, sizeof (CORBA::WstringDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WstringDef, &_tc_TAO_tc_CORBA_WstringDef)
-TAO_NAMESPACE_END
-CORBA::FixedDef_ptr CORBA::FixedDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::FixedDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/FixedDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::FixedDef::_nil ());
-  if (is_a == 0)
-    return CORBA::FixedDef::_nil ();
-  return CORBA::FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::FixedDef_ptr CORBA::FixedDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::FixedDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_FixedDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_FixedDef_ptr retv = _TAO_collocation_CORBA_FixedDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::FixedDef(stub);
-}
-
-CORBA::FixedDef_ptr 
-CORBA::FixedDef::_duplicate (CORBA::FixedDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::UShort CORBA::FixedDef::digits (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::UShort _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""digits",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::FixedDef::digits (
-    CORBA::UShort digits,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""digits",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << digits)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Short CORBA::FixedDef::scale (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Short _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""scale",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::FixedDef::scale (
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""scale",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << scale)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::FixedDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/FixedDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_FixedDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4669), ACE_NTOHL (0x78656444), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/FixedDef:1.0
-  9, ACE_NTOHL (0x46697865), ACE_NTOHL (0x64446566), ACE_NTOHL (0x0),  // name = FixedDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_FixedDef (CORBA::tk_objref, sizeof (_oc_CORBA_FixedDef), (char *) &_oc_CORBA_FixedDef, 0, sizeof (CORBA::FixedDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FixedDef, &_tc_TAO_tc_CORBA_FixedDef)
-TAO_NAMESPACE_END
-CORBA::SequenceDef_ptr CORBA::SequenceDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::SequenceDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/SequenceDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::SequenceDef::_nil ());
-  if (is_a == 0)
-    return CORBA::SequenceDef::_nil ();
-  return CORBA::SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::SequenceDef_ptr CORBA::SequenceDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::SequenceDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_SequenceDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_SequenceDef_ptr retv = _TAO_collocation_CORBA_SequenceDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::SequenceDef(stub);
-}
-
-CORBA::SequenceDef_ptr 
-CORBA::SequenceDef::_duplicate (CORBA::SequenceDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::ULong CORBA::SequenceDef::bound (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ULong _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""bound",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::SequenceDef::bound (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""bound",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << bound)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::TypeCode_ptr _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""element_type",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::IDLType_ptr CORBA::SequenceDef::element_type_def (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""element_type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::SequenceDef::element_type_def (
-    CORBA::IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""element_type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << element_type_def)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::SequenceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::SequenceDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/SequenceDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_SequenceDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5365), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x63654465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SequenceDef:1.0
-  12, ACE_NTOHL (0x53657175), ACE_NTOHL (0x656e6365), ACE_NTOHL (0x44656600),  // name = SequenceDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_SequenceDef (CORBA::tk_objref, sizeof (_oc_CORBA_SequenceDef), (char *) &_oc_CORBA_SequenceDef, 0, sizeof (CORBA::SequenceDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SequenceDef, &_tc_TAO_tc_CORBA_SequenceDef)
-TAO_NAMESPACE_END
-CORBA::ArrayDef_ptr CORBA::ArrayDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ArrayDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ArrayDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::ArrayDef::_nil ());
-  if (is_a == 0)
-    return CORBA::ArrayDef::_nil ();
-  return CORBA::ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::ArrayDef_ptr CORBA::ArrayDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ArrayDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_ArrayDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_ArrayDef_ptr retv = _TAO_collocation_CORBA_ArrayDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::ArrayDef(stub);
-}
-
-CORBA::ArrayDef_ptr 
-CORBA::ArrayDef::_duplicate (CORBA::ArrayDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::ULong CORBA::ArrayDef::length (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ULong _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""length",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ArrayDef::length (
-    CORBA::ULong length,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""length",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << length)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::TypeCode_ptr _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""element_type",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::IDLType_ptr CORBA::ArrayDef::element_type_def (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""element_type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ArrayDef::element_type_def (
-    CORBA::IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""element_type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << element_type_def)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::ArrayDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ArrayDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_ArrayDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4172), ACE_NTOHL (0x72617944), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ArrayDef:1.0
-  9, ACE_NTOHL (0x41727261), ACE_NTOHL (0x79446566), ACE_NTOHL (0x0),  // name = ArrayDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ArrayDef (CORBA::tk_objref, sizeof (_oc_CORBA_ArrayDef), (char *) &_oc_CORBA_ArrayDef, 0, sizeof (CORBA::ArrayDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ArrayDef, &_tc_TAO_tc_CORBA_ArrayDef)
-TAO_NAMESPACE_END
-CORBA::ExceptionDef_ptr CORBA::ExceptionDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ExceptionDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ExceptionDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ());
-  if (is_a == 0)
-    return CORBA::ExceptionDef::_nil ();
-  return CORBA::ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::ExceptionDef_ptr CORBA::ExceptionDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ExceptionDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_ExceptionDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_ExceptionDef_ptr retv = _TAO_collocation_CORBA_ExceptionDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::ExceptionDef(stub);
-}
-
-CORBA::ExceptionDef_ptr 
-CORBA::ExceptionDef::_duplicate (CORBA::ExceptionDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::TypeCode_ptr _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""type",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::StructMemberSeq * CORBA::ExceptionDef::members (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::StructMemberSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::StructMemberSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""members",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ExceptionDef::members (
-    const CORBA::StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""members",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << members)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::ExceptionDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ExceptionDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_ExceptionDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDef:1.0
-  13, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = ExceptionDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDef (CORBA::tk_objref, sizeof (_oc_CORBA_ExceptionDef), (char *) &_oc_CORBA_ExceptionDef, 0, sizeof (CORBA::ExceptionDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDef, &_tc_TAO_tc_CORBA_ExceptionDef)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_ExceptionDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-  21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ExceptionDescription
-  5, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3, ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-  5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDescription (CORBA::tk_struct, sizeof (_oc_CORBA_ExceptionDescription), (char *) &_oc_CORBA_ExceptionDescription, 0, sizeof (CORBA::ExceptionDescription));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDescription, &_tc_TAO_tc_CORBA_ExceptionDescription)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_AttributeMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74726962), ACE_NTOHL (0x7574654d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-  14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000),  // name = AttributeMode
-  2, // member count
-  12, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f4e4f52), ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-  14, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f524541), ACE_NTOHL (0x444f4e4c), ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeMode (CORBA::tk_enum, sizeof (_oc_CORBA_AttributeMode), (char *) &_oc_CORBA_AttributeMode, 0, sizeof (CORBA::AttributeMode));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeMode, &_tc_TAO_tc_CORBA_AttributeMode)
-TAO_NAMESPACE_END
-CORBA::AttributeDef_ptr CORBA::AttributeDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::AttributeDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AttributeDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
-  if (is_a == 0)
-    return CORBA::AttributeDef::_nil ();
-  return CORBA::AttributeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::AttributeDef_ptr CORBA::AttributeDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::AttributeDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_AttributeDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_AttributeDef_ptr retv = _TAO_collocation_CORBA_AttributeDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::AttributeDef(stub);
-}
-
-CORBA::AttributeDef_ptr 
-CORBA::AttributeDef::_duplicate (CORBA::AttributeDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::TypeCode_ptr CORBA::AttributeDef::type (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::TypeCode_ptr _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""type",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::IDLType_ptr CORBA::AttributeDef::type_def (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::AttributeDef::type_def (
-    CORBA::IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << type_def)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::AttributeMode CORBA::AttributeDef::mode (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::AttributeMode _tao_retval = (CORBA::AttributeMode)0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""mode",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::AttributeDef::mode (
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""mode",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << mode)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::AttributeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::AttributeDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/AttributeDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_AttributeDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74726962), ACE_NTOHL (0x75746544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDef:1.0
-  13, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = AttributeDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDef (CORBA::tk_objref, sizeof (_oc_CORBA_AttributeDef), (char *) &_oc_CORBA_AttributeDef, 0, sizeof (CORBA::AttributeDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeDef, &_tc_TAO_tc_CORBA_AttributeDef)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_AttributeDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74726962), ACE_NTOHL (0x75746544), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-  21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = AttributeDescription
-  6, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3, ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-  5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_enum, // typecode kind
-  104, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74726962), ACE_NTOHL (0x7574654d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-    14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000),  // name = AttributeMode
-    2, // member count
-    12, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f4e4f52), ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-    14, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f524541), ACE_NTOHL (0x444f4e4c), ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDescription (CORBA::tk_struct, sizeof (_oc_CORBA_AttributeDescription), (char *) &_oc_CORBA_AttributeDescription, 0, sizeof (CORBA::AttributeDescription));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeDescription, &_tc_TAO_tc_CORBA_AttributeDescription)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_OperationMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x65726174), ACE_NTOHL (0x696f6e4d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-  14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000),  // name = OperationMode
-  2, // member count
-  10, ACE_NTOHL (0x4f505f4e), ACE_NTOHL (0x4f524d41), ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-  10, ACE_NTOHL (0x4f505f4f), ACE_NTOHL (0x4e455741), ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationMode (CORBA::tk_enum, sizeof (_oc_CORBA_OperationMode), (char *) &_oc_CORBA_OperationMode, 0, sizeof (CORBA::OperationMode));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationMode, &_tc_TAO_tc_CORBA_OperationMode)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_ParameterMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x7465724d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-  14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000),  // name = ParameterMode
-  3, // member count
-  9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0),  // name = PARAM_IN
-  10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-  12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ParameterMode (CORBA::tk_enum, sizeof (_oc_CORBA_ParameterMode), (char *) &_oc_CORBA_ParameterMode, 0, sizeof (CORBA::ParameterMode));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterMode, &_tc_TAO_tc_CORBA_ParameterMode)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_ParameterDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x74657244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-  21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ParameterDescription
-  4, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-  5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_enum, // typecode kind
-  116, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x7465724d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-    14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000),  // name = ParameterMode
-    3, // member count
-    9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0),  // name = PARAM_IN
-    10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-    12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ParameterDescription (CORBA::tk_struct, sizeof (_oc_CORBA_ParameterDescription), (char *) &_oc_CORBA_ParameterDescription, 0, sizeof (CORBA::ParameterDescription));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterDescription, &_tc_TAO_tc_CORBA_ParameterDescription)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_
-
-  void
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ParameterDescription* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::ParameterDescription *old = ACE_reinterpret_cast (CORBA::ParameterDescription *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::ParameterDescription *tmp = ACE_reinterpret_cast (CORBA::ParameterDescription *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ_CS_
-
-// *************************************************************
-// CORBA::ParDescriptionSeq
-// *************************************************************
-
-CORBA::ParDescriptionSeq::CORBA_ParDescriptionSeq (void)
-{}
-CORBA::ParDescriptionSeq::CORBA_ParDescriptionSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ParDescriptionSeq::CORBA_ParDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ParameterDescription *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ParDescriptionSeq::CORBA_ParDescriptionSeq (const CORBA_ParDescriptionSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ParDescriptionSeq::~CORBA_ParDescriptionSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-  18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
-  416, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    400, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x74657244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-      21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ParameterDescription
-      4, // member count
-      5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-        0U, // string length
-
-      5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-      9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-      5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-      CORBA::tk_enum, // typecode kind
-      116, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x7465724d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-        14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000),  // name = ParameterMode
-        3, // member count
-        9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0),  // name = PARAM_IN
-        10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-        12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ParDescriptionSeq (CORBA::tk_alias, sizeof (_oc_CORBA_ParDescriptionSeq), (char *) &_oc_CORBA_ParDescriptionSeq, 0, sizeof (CORBA::ParDescriptionSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParDescriptionSeq, &_tc_TAO_tc_CORBA_ParDescriptionSeq)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_ContextIdentifier[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74496465), ACE_NTOHL (0x6e746966), ACE_NTOHL (0x6965723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-  18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ContextIdentifier (CORBA::tk_alias, sizeof (_oc_CORBA_ContextIdentifier), (char *) &_oc_CORBA_ContextIdentifier, 0, sizeof (CORBA::ContextIdentifier));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdentifier, &_tc_TAO_tc_CORBA_ContextIdentifier)
-TAO_NAMESPACE_END
-
-#if !defined (_CORBA_CONTEXTIDSEQ_CS_)
-#define _CORBA_CONTEXTIDSEQ_CS_
-
-// *************************************************************
-// CORBA::ContextIdSeq
-// *************************************************************
-
-CORBA::ContextIdSeq::CORBA_ContextIdSeq (void)
-{}
-CORBA::ContextIdSeq::CORBA_ContextIdSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ContextIdSeq::CORBA_ContextIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ContextIdSeq::CORBA_ContextIdSeq (const CORBA_ContextIdSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ContextIdSeq::~CORBA_ContextIdSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_ContextIdSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74496453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-  13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0),  // name = ContextIdSeq
-  CORBA::tk_sequence, // typecode kind
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    148, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74496465), ACE_NTOHL (0x6e746966), ACE_NTOHL (0x6965723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-      18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-        0U, // string length
-
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ContextIdSeq (CORBA::tk_alias, sizeof (_oc_CORBA_ContextIdSeq), (char *) &_oc_CORBA_ContextIdSeq, 0, sizeof (CORBA::ContextIdSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdSeq, &_tc_TAO_tc_CORBA_ContextIdSeq)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CS_
-
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ExceptionDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::ExceptionDef **old = ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA::ExceptionDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA::ExceptionDef **tmp = ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::ExceptionDef::_nil ();
-    }
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA::ExceptionDef **tmp = ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::ExceptionDef::_nil ();
-    }
-  }
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA::ExceptionDef **tmp = ACE_static_cast (CORBA::ExceptionDef**, target);
-    *tmp = CORBA::ExceptionDef::_narrow (src, ACE_TRY_ENV);
-  }
-
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_upcast (void *src) const
-  {
-    CORBA::ExceptionDef **tmp = ACE_static_cast (CORBA::ExceptionDef**, src);
-    return *tmp;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ_CS_
-
-// *************************************************************
-// CORBA::ExceptionDefSeq
-// *************************************************************
-
-CORBA::ExceptionDefSeq::CORBA_ExceptionDefSeq (void)
-{}
-CORBA::ExceptionDefSeq::CORBA_ExceptionDefSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ExceptionDefSeq::CORBA_ExceptionDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ExceptionDef_ptr *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ExceptionDefSeq::CORBA_ExceptionDefSeq (const CORBA_ExceptionDefSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ExceptionDefSeq::~CORBA_ExceptionDefSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_ExceptionDefSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExceptionDefSeq:1.0
-  16, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x53657100),  // name = ExceptionDefSeq
-  CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDef:1.0
-      13, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = ExceptionDef
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDefSeq (CORBA::tk_alias, sizeof (_oc_CORBA_ExceptionDefSeq), (char *) &_oc_CORBA_ExceptionDefSeq, 0, sizeof (CORBA::ExceptionDefSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDefSeq, &_tc_TAO_tc_CORBA_ExceptionDefSeq)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CS_
-
-  void
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ExceptionDescription* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::ExceptionDescription *old = ACE_reinterpret_cast (CORBA::ExceptionDescription *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::ExceptionDescription *tmp = ACE_reinterpret_cast (CORBA::ExceptionDescription *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CS_)
-#define _CORBA_EXCDESCRIPTIONSEQ_CS_
-
-// *************************************************************
-// CORBA::ExcDescriptionSeq
-// *************************************************************
-
-CORBA::ExcDescriptionSeq::CORBA_ExcDescriptionSeq (void)
-{}
-CORBA::ExcDescriptionSeq::CORBA_ExcDescriptionSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ExcDescriptionSeq::CORBA_ExcDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ExceptionDescription *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ExcDescriptionSeq::CORBA_ExcDescriptionSeq (const CORBA_ExcDescriptionSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ExcDescriptionSeq::~CORBA_ExcDescriptionSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_ExcDescriptionSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-  18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
-  476, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    460, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-      21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ExceptionDescription
-      5, // member count
-      5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-        0U, // string length
-
-      3, ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
-        0U, // string length
-
-      5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExcDescriptionSeq (CORBA::tk_alias, sizeof (_oc_CORBA_ExcDescriptionSeq), (char *) &_oc_CORBA_ExcDescriptionSeq, 0, sizeof (CORBA::ExcDescriptionSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExcDescriptionSeq, &_tc_TAO_tc_CORBA_ExcDescriptionSeq)
-TAO_NAMESPACE_END
-CORBA::OperationDef_ptr CORBA::OperationDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::OperationDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/OperationDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
-  if (is_a == 0)
-    return CORBA::OperationDef::_nil ();
-  return CORBA::OperationDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::OperationDef_ptr CORBA::OperationDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::OperationDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_OperationDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_OperationDef_ptr retv = _TAO_collocation_CORBA_OperationDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::OperationDef(stub);
-}
-
-CORBA::OperationDef_ptr 
-CORBA::OperationDef::_duplicate (CORBA::OperationDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::TypeCode_ptr CORBA::OperationDef::result (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::TypeCode_ptr _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""result",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::IDLType_ptr CORBA::OperationDef::result_def (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""result_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::OperationDef::result_def (
-    CORBA::IDLType_ptr result_def,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""result_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << result_def)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::ParDescriptionSeq * CORBA::OperationDef::params (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ParDescriptionSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::ParDescriptionSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""params",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::OperationDef::params (
-    const CORBA::ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""params",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << params)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::OperationMode CORBA::OperationDef::mode (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::OperationMode _tao_retval = (CORBA::OperationMode)0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""mode",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::OperationDef::mode (
-    CORBA::OperationMode mode,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""mode",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << mode)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::ContextIdSeq * CORBA::OperationDef::contexts (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ContextIdSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::ContextIdSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""contexts",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::OperationDef::contexts (
-    const CORBA::ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""contexts",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << contexts)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::ExceptionDefSeq * CORBA::OperationDef::exceptions (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ExceptionDefSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::ExceptionDefSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""exceptions",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::OperationDef::exceptions (
-    const CORBA::ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""exceptions",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << exceptions)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::OperationDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::OperationDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/OperationDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_OperationDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x65726174), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDef:1.0
-  13, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = OperationDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationDef (CORBA::tk_objref, sizeof (_oc_CORBA_OperationDef), (char *) &_oc_CORBA_OperationDef, 0, sizeof (CORBA::OperationDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationDef, &_tc_TAO_tc_CORBA_OperationDef)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_OperationDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x65726174), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-  21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = OperationDescription
-  9, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3, ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-  7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000),  // name = result
-  CORBA::tk_TypeCode,
-
-  5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_enum, // typecode kind
-  100, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x65726174), ACE_NTOHL (0x696f6e4d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-    14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000),  // name = OperationMode
-    2, // member count
-    10, ACE_NTOHL (0x4f505f4e), ACE_NTOHL (0x4f524d41), ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-    10, ACE_NTOHL (0x4f505f4f), ACE_NTOHL (0x4e455741), ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
-  9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0),  // name = contexts
-  CORBA::tk_alias, // typecode kind for typedefs
-  236, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74496453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-    13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0),  // name = ContextIdSeq
-    CORBA::tk_sequence, // typecode kind
-    164, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      148, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74496465), ACE_NTOHL (0x6e746966), ACE_NTOHL (0x6965723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-        18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
-
-      0U,
-
-
-  11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000),  // name = parameters
-  CORBA::tk_alias, // typecode kind for typedefs
-  496, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-    18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-    416, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      400, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x74657244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-        21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ParameterDescription
-        4, // member count
-        5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
-        5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
-
-        9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-        CORBA::tk_objref, // typecode kind
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-          8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-        5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
-        116, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x7465724d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-          14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000),  // name = ParameterMode
-          3, // member count
-          9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0),  // name = PARAM_IN
-          10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-          12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
-
-      0U,
-
-
-  11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000),  // name = exceptions
-  CORBA::tk_alias, // typecode kind for typedefs
-  556, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-    18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-    476, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      460, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-        21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ExceptionDescription
-        5, // member count
-        5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
-        3, ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
-
-        5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
-
-
-      0U,
-
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationDescription (CORBA::tk_struct, sizeof (_oc_CORBA_OperationDescription), (char *) &_oc_CORBA_OperationDescription, 0, sizeof (CORBA::OperationDescription));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationDescription, &_tc_TAO_tc_CORBA_OperationDescription)
-TAO_NAMESPACE_END
-
-#if !defined (_CORBA_REPOSITORYIDSEQ_CS_)
-#define _CORBA_REPOSITORYIDSEQ_CS_
-
-// *************************************************************
-// CORBA::RepositoryIdSeq
-// *************************************************************
-
-CORBA::RepositoryIdSeq::CORBA_RepositoryIdSeq (void)
-{}
-CORBA::RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::RepositoryIdSeq::CORBA_RepositoryIdSeq (const CORBA_RepositoryIdSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::RepositoryIdSeq::~CORBA_RepositoryIdSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_RepositoryIdSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49645365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-  16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-  CORBA::tk_sequence, // typecode kind
-  88, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    72, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-      13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-      CORBA::tk_string, 
-      0U, // string length
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryIdSeq (CORBA::tk_alias, sizeof (_oc_CORBA_RepositoryIdSeq), (char *) &_oc_CORBA_RepositoryIdSeq, 0, sizeof (CORBA::RepositoryIdSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryIdSeq, &_tc_TAO_tc_CORBA_RepositoryIdSeq)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_
-
-  void
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::OperationDescription* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::OperationDescription *old = ACE_reinterpret_cast (CORBA::OperationDescription *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::OperationDescription *tmp = ACE_reinterpret_cast (CORBA::OperationDescription *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_OPDESCRIPTIONSEQ_CS_)
-#define _CORBA_OPDESCRIPTIONSEQ_CS_
-
-// *************************************************************
-// CORBA::OpDescriptionSeq
-// *************************************************************
-
-CORBA::OpDescriptionSeq::CORBA_OpDescriptionSeq (void)
-{}
-CORBA::OpDescriptionSeq::CORBA_OpDescriptionSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::OpDescriptionSeq::CORBA_OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA::OperationDescription *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::OpDescriptionSeq::CORBA_OpDescriptionSeq (const CORBA_OpDescriptionSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::OpDescriptionSeq::~CORBA_OpDescriptionSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
-  17, ACE_NTOHL (0x4f704465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x0),  // name = OpDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
-  1956, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    1940, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x65726174), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-      21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = OperationDescription
-      9, // member count
-      5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-        0U, // string length
-
-      3, ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
-        0U, // string length
-
-      7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000),  // name = result
-      CORBA::tk_TypeCode,
-
-      5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-      CORBA::tk_enum, // typecode kind
-      100, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x65726174), ACE_NTOHL (0x696f6e4d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-        14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000),  // name = OperationMode
-        2, // member count
-        10, ACE_NTOHL (0x4f505f4e), ACE_NTOHL (0x4f524d41), ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-        10, ACE_NTOHL (0x4f505f4f), ACE_NTOHL (0x4e455741), ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
-      9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0),  // name = contexts
-      CORBA::tk_alias, // typecode kind for typedefs
-      236, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74496453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-        13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0),  // name = ContextIdSeq
-        CORBA::tk_sequence, // typecode kind
-        164, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_alias, // typecode kind for typedefs
-          148, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74496465), ACE_NTOHL (0x6e746966), ACE_NTOHL (0x6965723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-            18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-            CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-              11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-              CORBA::tk_string, 
-              0U, // string length
-
-
-          0U,
-
-
-      11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000),  // name = parameters
-      CORBA::tk_alias, // typecode kind for typedefs
-      496, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-        18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-        CORBA::tk_sequence, // typecode kind
-        416, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_struct, // typecode kind
-          400, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x74657244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-            21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ParameterDescription
-            4, // member count
-            5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-              11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-              CORBA::tk_string, 
-              0U, // string length
-
-            5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
-
-            9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-            CORBA::tk_objref, // typecode kind
-            52, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-              8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-            5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-            CORBA::tk_enum, // typecode kind
-            116, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x7465724d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-              14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000),  // name = ParameterMode
-              3, // member count
-              9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0),  // name = PARAM_IN
-              10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-              12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
-
-          0U,
-
-
-      11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000),  // name = exceptions
-      CORBA::tk_alias, // typecode kind for typedefs
-      556, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-        18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-        CORBA::tk_sequence, // typecode kind
-        476, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_struct, // typecode kind
-          460, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-            21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ExceptionDescription
-            5, // member count
-            5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-              11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-              CORBA::tk_string, 
-              0U, // string length
-
-            3, ACE_NTOHL (0x69640000),  // name = id
-            CORBA::tk_alias, // typecode kind for typedefs
-            72, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-              13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-              CORBA::tk_string, 
-              0U, // string length
-
-            11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-            CORBA::tk_alias, // typecode kind for typedefs
-            72, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-              13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-              CORBA::tk_string, 
-              0U, // string length
-
-            8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-            CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-              12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-              CORBA::tk_string, 
-              0U, // string length
-
-            5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
-
-
-          0U,
-
-
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OpDescriptionSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OpDescriptionSeq), (char *) &_oc_CORBA_OpDescriptionSeq, 0, sizeof (CORBA::OpDescriptionSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OpDescriptionSeq, &_tc_TAO_tc_CORBA_OpDescriptionSeq)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_
-
-  void
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::AttributeDescription* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::AttributeDescription *old = ACE_reinterpret_cast (CORBA::AttributeDescription *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::AttributeDescription *tmp = ACE_reinterpret_cast (CORBA::AttributeDescription *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CS_)
-#define _CORBA_ATTRDESCRIPTIONSEQ_CS_
-
-// *************************************************************
-// CORBA::AttrDescriptionSeq
-// *************************************************************
-
-CORBA::AttrDescriptionSeq::CORBA_AttrDescriptionSeq (void)
-{}
-CORBA::AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA::AttributeDescription *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::AttrDescriptionSeq::CORBA_AttrDescriptionSeq (const CORBA_AttrDescriptionSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::AttrDescriptionSeq::~CORBA_AttrDescriptionSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74724465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
-  19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
-  600, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    584, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74726962), ACE_NTOHL (0x75746544), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-      21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = AttributeDescription
-      6, // member count
-      5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-        0U, // string length
-
-      3, ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
-        0U, // string length
-
-      5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-      5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-      CORBA::tk_enum, // typecode kind
-      104, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74726962), ACE_NTOHL (0x7574654d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-        14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000),  // name = AttributeMode
-        2, // member count
-        12, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f4e4f52), ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-        14, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f524541), ACE_NTOHL (0x444f4e4c), ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttrDescriptionSeq (CORBA::tk_alias, sizeof (_oc_CORBA_AttrDescriptionSeq), (char *) &_oc_CORBA_AttrDescriptionSeq, 0, sizeof (CORBA::AttrDescriptionSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttrDescriptionSeq, &_tc_TAO_tc_CORBA_AttrDescriptionSeq)
-TAO_NAMESPACE_END
-CORBA::InterfaceDef_ptr CORBA::InterfaceDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::InterfaceDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/InterfaceDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
-  if (is_a == 0)
-    return CORBA::InterfaceDef::_nil ();
-  return CORBA::InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::InterfaceDef_ptr CORBA::InterfaceDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::InterfaceDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_InterfaceDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_InterfaceDef_ptr retv = _TAO_collocation_CORBA_InterfaceDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::InterfaceDef(stub);
-}
-
-CORBA::InterfaceDef_ptr 
-CORBA::InterfaceDef::_duplicate (CORBA::InterfaceDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::InterfaceDefSeq * CORBA::InterfaceDef::base_interfaces (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::InterfaceDefSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::InterfaceDefSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""base_interfaces",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::InterfaceDef::base_interfaces (
-    const CORBA::InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""base_interfaces",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << base_interfaces)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::InterfaceDef::is_a (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Boolean _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "is_a",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << interface_id)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  60, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f496e), ACE_NTOHL (0x74657266), ACE_NTOHL (0x61636544), ACE_NTOHL (0x65662f46), ACE_NTOHL (0x756c6c49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0
-  25, ACE_NTOHL (0x46756c6c), ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = FullInterfaceDescription
-  9, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3, ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-  11, ACE_NTOHL (0x6f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e730000),  // name = operations
-  CORBA::tk_alias, // typecode kind for typedefs
-  2036, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
-    17, ACE_NTOHL (0x4f704465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x0),  // name = OpDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-    1956, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      1940, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x65726174), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-        21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = OperationDescription
-        9, // member count
-        5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
-        3, ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
-
-        7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000),  // name = result
-        CORBA::tk_TypeCode,
-
-        5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
-        100, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x65726174), ACE_NTOHL (0x696f6e4d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-          14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000),  // name = OperationMode
-          2, // member count
-          10, ACE_NTOHL (0x4f505f4e), ACE_NTOHL (0x4f524d41), ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-          10, ACE_NTOHL (0x4f505f4f), ACE_NTOHL (0x4e455741), ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
-        9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0),  // name = contexts
-        CORBA::tk_alias, // typecode kind for typedefs
-        236, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74496453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-          13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0),  // name = ContextIdSeq
-          CORBA::tk_sequence, // typecode kind
-          164, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_alias, // typecode kind for typedefs
-            148, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74496465), ACE_NTOHL (0x6e746966), ACE_NTOHL (0x6965723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-              18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
-
-
-            0U,
-
-
-        11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000),  // name = parameters
-        CORBA::tk_alias, // typecode kind for typedefs
-        496, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-          18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
-          416, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_struct, // typecode kind
-            400, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x74657244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-              21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ParameterDescription
-              4, // member count
-              5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
-
-              5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
-
-              9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-              CORBA::tk_objref, // typecode kind
-              52, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-              5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-              CORBA::tk_enum, // typecode kind
-              116, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x7465724d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-                14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000),  // name = ParameterMode
-                3, // member count
-                9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0),  // name = PARAM_IN
-                10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-                12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
-
-            0U,
-
-
-        11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000),  // name = exceptions
-        CORBA::tk_alias, // typecode kind for typedefs
-        556, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-          18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
-          476, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_struct, // typecode kind
-            460, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-              21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ExceptionDescription
-              5, // member count
-              5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
-
-              3, ACE_NTOHL (0x69640000),  // name = id
-              CORBA::tk_alias, // typecode kind for typedefs
-              72, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-                13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
-
-              11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-              CORBA::tk_alias, // typecode kind for typedefs
-              72, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-                13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
-
-              8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-                12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
-                0U, // string length
-
-              5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
-
-
-            0U,
-
-
-
-      0U,
-
-
-  11, ACE_NTOHL (0x61747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65730000),  // name = attributes
-  CORBA::tk_alias, // typecode kind for typedefs
-  684, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74724465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
-    19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-    600, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      584, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74726962), ACE_NTOHL (0x75746544), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-        21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = AttributeDescription
-        6, // member count
-        5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
-        3, ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
-
-        5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
-
-        5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
-        104, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74726962), ACE_NTOHL (0x7574654d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-          14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000),  // name = AttributeMode
-          2, // member count
-          12, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f4e4f52), ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-          14, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f524541), ACE_NTOHL (0x444f4e4c), ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
-
-      0U,
-
-
-  16, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f696e74), ACE_NTOHL (0x65726661), ACE_NTOHL (0x63657300),  // name = base_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49645365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
-    88, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      0U,
-
-
-  5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  12, ACE_NTOHL (0x69735f61), ACE_NTOHL (0x62737472), ACE_NTOHL (0x61637400),  // name = is_abstract
-  CORBA::tk_boolean,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription (CORBA::tk_struct, sizeof (_oc_CORBA_InterfaceDef_FullInterfaceDescription), (char *) &_oc_CORBA_InterfaceDef_FullInterfaceDescription, 0, sizeof (CORBA::InterfaceDef::FullInterfaceDescription));
-CORBA::TypeCode_ptr CORBA::InterfaceDef::_tc_FullInterfaceDescription = &_tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription;
-
-CORBA::InterfaceDef::FullInterfaceDescription * CORBA::InterfaceDef::describe_interface (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::InterfaceDef::FullInterfaceDescription* _tao_retval = 0;
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::InterfaceDef::FullInterfaceDescription, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "describe_interface",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::AttributeDef_ptr CORBA::InterfaceDef::create_attribute (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::AttributeDef_ptr _tao_retval = CORBA::AttributeDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_attribute",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << type) &&
-          (_tao_out << mode)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::OperationDef_ptr CORBA::InterfaceDef::create_operation (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::OperationDef_ptr _tao_retval = CORBA::OperationDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_operation",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << result) &&
-          (_tao_out << mode) &&
-          (_tao_out << params) &&
-          (_tao_out << exceptions) &&
-          (_tao_out << contexts)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean CORBA::InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::InterfaceDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/InterfaceDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_InterfaceDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f496e), ACE_NTOHL (0x74657266), ACE_NTOHL (0x61636544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-  13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = InterfaceDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef (CORBA::tk_objref, sizeof (_oc_CORBA_InterfaceDef), (char *) &_oc_CORBA_InterfaceDef, 0, sizeof (CORBA::InterfaceDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDef, &_tc_TAO_tc_CORBA_InterfaceDef)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f496e), ACE_NTOHL (0x74657266), ACE_NTOHL (0x61636544), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDescription:1.0
-  21, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = InterfaceDescription
-  6, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3, ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-  16, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f696e74), ACE_NTOHL (0x65726661), ACE_NTOHL (0x63657300),  // name = base_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49645365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
-    88, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      0U,
-
-
-  12, ACE_NTOHL (0x69735f61), ACE_NTOHL (0x62737472), ACE_NTOHL (0x61637400),  // name = is_abstract
-  CORBA::tk_boolean,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDescription (CORBA::tk_struct, sizeof (_oc_CORBA_InterfaceDescription), (char *) &_oc_CORBA_InterfaceDescription, 0, sizeof (CORBA::InterfaceDescription));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDescription, &_tc_TAO_tc_CORBA_InterfaceDescription)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_Visibility[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5669), ACE_NTOHL (0x73696269), ACE_NTOHL (0x6c697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
-  11, ACE_NTOHL (0x56697369), ACE_NTOHL (0x62696c69), ACE_NTOHL (0x74790000),  // name = Visibility
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Visibility (CORBA::tk_alias, sizeof (_oc_CORBA_Visibility), (char *) &_oc_CORBA_Visibility, 0, sizeof (CORBA::Visibility));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Visibility, &_tc_TAO_tc_CORBA_Visibility)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, PRIVATE_MEMBER, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, PUBLIC_MEMBER, 1)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_ValueMember[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c75654d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
-  12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657200),  // name = ValueMember
-  7, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3, ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-  5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-  7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000),  // name = access
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5669), ACE_NTOHL (0x73696269), ACE_NTOHL (0x6c697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
-    11, ACE_NTOHL (0x56697369), ACE_NTOHL (0x62696c69), ACE_NTOHL (0x74790000),  // name = Visibility
-    CORBA::tk_short,
-
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMember (CORBA::tk_struct, sizeof (_oc_CORBA_ValueMember), (char *) &_oc_CORBA_ValueMember, 0, sizeof (CORBA::ValueMember));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMember, &_tc_TAO_tc_CORBA_ValueMember)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CS_
-
-  void
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ValueMember* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::ValueMember *old = ACE_reinterpret_cast (CORBA::ValueMember *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::ValueMember *tmp = ACE_reinterpret_cast (CORBA::ValueMember *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::~_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEMEMBERSEQ_CS_)
-#define _CORBA_VALUEMEMBERSEQ_CS_
-
-// *************************************************************
-// CORBA::ValueMemberSeq
-// *************************************************************
-
-CORBA::ValueMemberSeq::CORBA_ValueMemberSeq (void)
-{}
-CORBA::ValueMemberSeq::CORBA_ValueMemberSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ValueMemberSeq::CORBA_ValueMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ValueMember *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ValueMemberSeq::CORBA_ValueMemberSeq (const CORBA_ValueMemberSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ValueMemberSeq::~CORBA_ValueMemberSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_ValueMemberSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c75654d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x72536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
-  15, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
-  CORBA::tk_sequence, // typecode kind
-  616, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    600, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c75654d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
-      12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657200),  // name = ValueMember
-      7, // member count
-      5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-        0U, // string length
-
-      3, ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
-        0U, // string length
-
-      5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-      9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-      7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000),  // name = access
-      CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5669), ACE_NTOHL (0x73696269), ACE_NTOHL (0x6c697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
-        11, ACE_NTOHL (0x56697369), ACE_NTOHL (0x62696c69), ACE_NTOHL (0x74790000),  // name = Visibility
-        CORBA::tk_short,
-
-
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMemberSeq (CORBA::tk_alias, sizeof (_oc_CORBA_ValueMemberSeq), (char *) &_oc_CORBA_ValueMemberSeq, 0, sizeof (CORBA::ValueMemberSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMemberSeq, &_tc_TAO_tc_CORBA_ValueMemberSeq)
-TAO_NAMESPACE_END
-CORBA::ValueMemberDef_ptr CORBA::ValueMemberDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ValueMemberDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueMemberDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::ValueMemberDef::_nil ());
-  if (is_a == 0)
-    return CORBA::ValueMemberDef::_nil ();
-  return CORBA::ValueMemberDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::ValueMemberDef_ptr CORBA::ValueMemberDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ValueMemberDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_ValueMemberDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_ValueMemberDef_ptr retv = _TAO_collocation_CORBA_ValueMemberDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::ValueMemberDef(stub);
-}
-
-CORBA::ValueMemberDef_ptr 
-CORBA::ValueMemberDef::_duplicate (CORBA::ValueMemberDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::TypeCode_ptr _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""type",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::IDLType_ptr CORBA::ValueMemberDef::type_def (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ValueMemberDef::type_def (
-    CORBA::IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << type_def)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Visibility CORBA::ValueMemberDef::access (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Visibility _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""access",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ValueMemberDef::access (
-    CORBA::Visibility access,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""access",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << access)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::ValueMemberDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ValueMemberDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_ValueMemberDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c75654d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x72446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberDef:1.0
-  15, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657244), ACE_NTOHL (0x65660000),  // name = ValueMemberDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMemberDef (CORBA::tk_objref, sizeof (_oc_CORBA_ValueMemberDef), (char *) &_oc_CORBA_ValueMemberDef, 0, sizeof (CORBA::ValueMemberDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMemberDef, &_tc_TAO_tc_CORBA_ValueMemberDef)
-TAO_NAMESPACE_END
-CORBA::ValueDef_ptr CORBA::ValueDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ValueDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
-  if (is_a == 0)
-    return CORBA::ValueDef::_nil ();
-  return CORBA::ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::ValueDef_ptr CORBA::ValueDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ValueDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_ValueDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_ValueDef_ptr retv = _TAO_collocation_CORBA_ValueDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::ValueDef(stub);
-}
-
-CORBA::ValueDef_ptr 
-CORBA::ValueDef::_duplicate (CORBA::ValueDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::InterfaceDef_ptr CORBA::ValueDef::supported_interface (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::InterfaceDef_ptr _tao_retval = CORBA::InterfaceDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""supported_interface",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ValueDef::supported_interface (
-    CORBA::InterfaceDef_ptr supported_interface,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""supported_interface",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << supported_interface)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::InitializerSeq * CORBA::ValueDef::initializers (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::InitializerSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::InitializerSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""initializers",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ValueDef::initializers (
-    const CORBA::InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""initializers",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << initializers)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::ValueDef_ptr CORBA::ValueDef::base_value (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ValueDef_ptr _tao_retval = CORBA::ValueDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""base_value",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ValueDef::base_value (
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""base_value",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << base_value)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::ValueDefSeq * CORBA::ValueDef::abstract_base_values (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ValueDefSeq* _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::ValueDefSeq, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""abstract_base_values",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ValueDef::abstract_base_values (
-    const CORBA::ValueDefSeq & abstract_base_values,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""abstract_base_values",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << abstract_base_values)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::ValueDef::is_abstract (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Boolean _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""is_abstract",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ValueDef::is_abstract (
-    CORBA::Boolean is_abstract,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""is_abstract",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << CORBA::Any::from_boolean (is_abstract))
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::ValueDef::is_custom (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Boolean _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""is_custom",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ValueDef::is_custom (
-    CORBA::Boolean is_custom,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""is_custom",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << CORBA::Any::from_boolean (is_custom))
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::ValueDef::is_truncatable (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Boolean _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""is_truncatable",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ValueDef::is_truncatable (
-    CORBA::Boolean is_truncatable,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""is_truncatable",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << CORBA::Any::from_boolean (is_truncatable))
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::ValueDef::is_a (
-    const char * value_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::Boolean _tao_retval = 0;
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "is_a",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << value_id)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  52, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c756544), ACE_NTOHL (0x65662f46), ACE_NTOHL (0x756c6c56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0
-  21, ACE_NTOHL (0x46756c6c), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = FullValueDescription
-  15, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3, ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  12, ACE_NTOHL (0x69735f61), ACE_NTOHL (0x62737472), ACE_NTOHL (0x61637400),  // name = is_abstract
-  CORBA::tk_boolean,
-
-  10, ACE_NTOHL (0x69735f63), ACE_NTOHL (0x7573746f), ACE_NTOHL (0x6d000000),  // name = is_custom
-  CORBA::tk_boolean,
-
-  11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-  11, ACE_NTOHL (0x6f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e730000),  // name = operations
-  CORBA::tk_alias, // typecode kind for typedefs
-  2036, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
-    17, ACE_NTOHL (0x4f704465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x0),  // name = OpDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-    1956, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      1940, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x65726174), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-        21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = OperationDescription
-        9, // member count
-        5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
-        3, ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
-
-        7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000),  // name = result
-        CORBA::tk_TypeCode,
-
-        5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
-        100, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f70), ACE_NTOHL (0x65726174), ACE_NTOHL (0x696f6e4d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-          14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000),  // name = OperationMode
-          2, // member count
-          10, ACE_NTOHL (0x4f505f4e), ACE_NTOHL (0x4f524d41), ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-          10, ACE_NTOHL (0x4f505f4f), ACE_NTOHL (0x4e455741), ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
-        9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0),  // name = contexts
-        CORBA::tk_alias, // typecode kind for typedefs
-        236, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74496453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-          13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0),  // name = ContextIdSeq
-          CORBA::tk_sequence, // typecode kind
-          164, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_alias, // typecode kind for typedefs
-            148, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74496465), ACE_NTOHL (0x6e746966), ACE_NTOHL (0x6965723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-              18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
-
-
-            0U,
-
-
-        11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000),  // name = parameters
-        CORBA::tk_alias, // typecode kind for typedefs
-        496, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-          18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
-          416, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_struct, // typecode kind
-            400, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x74657244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-              21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ParameterDescription
-              4, // member count
-              5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
-
-              5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
-
-              9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-              CORBA::tk_objref, // typecode kind
-              52, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-              5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-              CORBA::tk_enum, // typecode kind
-              116, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5061), ACE_NTOHL (0x72616d65), ACE_NTOHL (0x7465724d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-                14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000),  // name = ParameterMode
-                3, // member count
-                9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0),  // name = PARAM_IN
-                10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-                12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
-
-            0U,
-
-
-        11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000),  // name = exceptions
-        CORBA::tk_alias, // typecode kind for typedefs
-        556, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-          18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
-          476, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_struct, // typecode kind
-            460, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e44), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-              21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ExceptionDescription
-              5, // member count
-              5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
-
-              3, ACE_NTOHL (0x69640000),  // name = id
-              CORBA::tk_alias, // typecode kind for typedefs
-              72, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-                13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
-
-              11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-              CORBA::tk_alias, // typecode kind for typedefs
-              72, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-                13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
-
-              8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-                12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
-                0U, // string length
-
-              5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
-
-
-            0U,
-
-
-
-      0U,
-
-
-  11, ACE_NTOHL (0x61747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65730000),  // name = attributes
-  CORBA::tk_alias, // typecode kind for typedefs
-  684, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74724465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
-    19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-    600, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      584, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74726962), ACE_NTOHL (0x75746544), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-        21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = AttributeDescription
-        6, // member count
-        5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
-        3, ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
-
-        5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
-
-        5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
-        104, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4174), ACE_NTOHL (0x74726962), ACE_NTOHL (0x7574654d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-          14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000),  // name = AttributeMode
-          2, // member count
-          12, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f4e4f52), ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-          14, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f524541), ACE_NTOHL (0x444f4e4c), ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
-
-      0U,
-
-
-  8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300),  // name = members
-  CORBA::tk_alias, // typecode kind for typedefs
-  692, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c75654d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x72536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
-    15, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
-    CORBA::tk_sequence, // typecode kind
-    616, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      600, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c75654d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
-        12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657200),  // name = ValueMember
-        7, // member count
-        5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
-        3, ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
-        8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
-
-        5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
-
-        9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-        CORBA::tk_objref, // typecode kind
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-          8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-        7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000),  // name = access
-        CORBA::tk_alias, // typecode kind for typedefs
-        64, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5669), ACE_NTOHL (0x73696269), ACE_NTOHL (0x6c697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
-          11, ACE_NTOHL (0x56697369), ACE_NTOHL (0x62696c69), ACE_NTOHL (0x74790000),  // name = Visibility
-          CORBA::tk_short,
-
-
-
-      0U,
-
-
-  13, ACE_NTOHL (0x696e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657273), ACE_NTOHL (0x0),  // name = initializers
-  CORBA::tk_alias, // typecode kind for typedefs
-  516, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f496e), ACE_NTOHL (0x69746961), ACE_NTOHL (0x6c697a65), ACE_NTOHL (0x72536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
-    15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000),  // name = InitializerSeq
-    CORBA::tk_sequence, // typecode kind
-    440, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      424, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f496e), ACE_NTOHL (0x69746961), ACE_NTOHL (0x6c697a65), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
-        12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200),  // name = Initializer
-        1, // member count
-        8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300),  // name = members
-        CORBA::tk_alias, // typecode kind for typedefs
-        340, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72756374), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-          16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-          CORBA::tk_sequence, // typecode kind
-          264, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_struct, // typecode kind
-            248, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72756374), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-              13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = StructMember
-              3, // member count
-              5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
-
-              5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
-
-              9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0),  // name = type_def
-              CORBA::tk_objref, // typecode kind
-              52, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4944), ACE_NTOHL (0x4c547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-
-
-            0U,
-
-
-
-      0U,
-
-
-  21, ACE_NTOHL (0x73757070), ACE_NTOHL (0x6f727465), ACE_NTOHL (0x645f696e), ACE_NTOHL (0x74657266), ACE_NTOHL (0x61636573), ACE_NTOHL (0x0),  // name = supported_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49645365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
-    88, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      0U,
-
-
-  21, ACE_NTOHL (0x61627374), ACE_NTOHL (0x72616374), ACE_NTOHL (0x5f626173), ACE_NTOHL (0x655f7661), ACE_NTOHL (0x6c756573), ACE_NTOHL (0x0),  // name = abstract_base_values
-  CORBA::tk_alias, // typecode kind for typedefs
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49645365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
-    88, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      0U,
-
-
-  15, ACE_NTOHL (0x69735f74), ACE_NTOHL (0x72756e63), ACE_NTOHL (0x61746162), ACE_NTOHL (0x6c650000),  // name = is_truncatable
-  CORBA::tk_boolean,
-
-  11, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f76616c), ACE_NTOHL (0x75650000),  // name = base_value
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDef_FullValueDescription (CORBA::tk_struct, sizeof (_oc_CORBA_ValueDef_FullValueDescription), (char *) &_oc_CORBA_ValueDef_FullValueDescription, 0, sizeof (CORBA::ValueDef::FullValueDescription));
-CORBA::TypeCode_ptr CORBA::ValueDef::_tc_FullValueDescription = &_tc_TAO_tc_CORBA_ValueDef_FullValueDescription;
-
-CORBA::ValueDef::FullValueDescription * CORBA::ValueDef::describe_value (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ValueDef::FullValueDescription* _tao_retval = 0;
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  ACE_NEW_RETURN (_tao_retval, CORBA::ValueDef::FullValueDescription, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "describe_value",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ValueMemberDef_ptr CORBA::ValueDef::create_value_member (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::Visibility access,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::ValueMemberDef_ptr _tao_retval = CORBA::ValueMemberDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_value_member",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << type) &&
-          (_tao_out << access)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::AttributeDef_ptr CORBA::ValueDef::create_attribute (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::AttributeDef_ptr _tao_retval = CORBA::AttributeDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_attribute",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << type) &&
-          (_tao_out << mode)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::OperationDef_ptr CORBA::ValueDef::create_operation (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::OperationDef_ptr _tao_retval = CORBA::OperationDef::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_operation",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << id) &&
-          (_tao_out << name) &&
-          (_tao_out << version) &&
-          (_tao_out << result) &&
-          (_tao_out << mode) &&
-          (_tao_out << params) &&
-          (_tao_out << exceptions) &&
-          (_tao_out << contexts)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean CORBA::ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::ValueDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ValueDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_ValueDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c756544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-  9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = ValueDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDef (CORBA::tk_objref, sizeof (_oc_CORBA_ValueDef), (char *) &_oc_CORBA_ValueDef, 0, sizeof (CORBA::ValueDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDef, &_tc_TAO_tc_CORBA_ValueDef)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_ValueDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c756544), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDescription:1.0
-  17, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = ValueDescription
-  10, // member count
-  5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3, ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  12, ACE_NTOHL (0x69735f61), ACE_NTOHL (0x62737472), ACE_NTOHL (0x61637400),  // name = is_abstract
-  CORBA::tk_boolean,
-
-  10, ACE_NTOHL (0x69735f63), ACE_NTOHL (0x7573746f), ACE_NTOHL (0x6d000000),  // name = is_custom
-  CORBA::tk_boolean,
-
-  11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e537065), ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-  20, ACE_NTOHL (0x73757070), ACE_NTOHL (0x6f727465), ACE_NTOHL (0x645f696e), ACE_NTOHL (0x74657266), ACE_NTOHL (0x61636500),  // name = supported_interface
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  21, ACE_NTOHL (0x61627374), ACE_NTOHL (0x72616374), ACE_NTOHL (0x5f626173), ACE_NTOHL (0x655f7661), ACE_NTOHL (0x6c756573), ACE_NTOHL (0x0),  // name = abstract_base_values
-  CORBA::tk_alias, // typecode kind for typedefs
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49645365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
-    88, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      0U,
-
-
-  15, ACE_NTOHL (0x69735f74), ACE_NTOHL (0x72756e63), ACE_NTOHL (0x61746162), ACE_NTOHL (0x6c650000),  // name = is_truncatable
-  CORBA::tk_boolean,
-
-  11, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f76616c), ACE_NTOHL (0x75650000),  // name = base_value
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDescription (CORBA::tk_struct, sizeof (_oc_CORBA_ValueDescription), (char *) &_oc_CORBA_ValueDescription, 0, sizeof (CORBA::ValueDescription));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDescription, &_tc_TAO_tc_CORBA_ValueDescription)
-TAO_NAMESPACE_END
-CORBA::ValueBoxDef_ptr CORBA::ValueBoxDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ValueBoxDef::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueBoxDef:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ());
-  if (is_a == 0)
-    return CORBA::ValueBoxDef::_nil ();
-  return CORBA::ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::ValueBoxDef_ptr CORBA::ValueBoxDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ValueBoxDef::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (obj->_is_collocated () && _TAO_collocation_CORBA_ValueBoxDef_Stub_Factory_function_pointer != 0)
-    {
-      CORBA_ValueBoxDef_ptr retv = _TAO_collocation_CORBA_ValueBoxDef_Stub_Factory_function_pointer (obj);
-      if (retv != 0)
-        return retv;
-    }
-  return new CORBA::ValueBoxDef(stub);
-}
-
-CORBA::ValueBoxDef_ptr 
-CORBA::ValueBoxDef::_duplicate (CORBA::ValueBoxDef_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::IDLType_ptr CORBA::ValueBoxDef::original_type_def (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""original_type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-    
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA::ValueBoxDef::original_type_def (
-    CORBA::IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-
-  
-  
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""original_type_def",
-      istub->orb_core ()
-    );
-  
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << original_type_def)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-    
-  }
-  
-}
-
-CORBA::Boolean CORBA::ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::ValueBoxDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ValueBoxDef:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_ValueBoxDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c756542), ACE_NTOHL (0x6f784465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueBoxDef:1.0
-  12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65426f78), ACE_NTOHL (0x44656600),  // name = ValueBoxDef
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueBoxDef (CORBA::tk_objref, sizeof (_oc_CORBA_ValueBoxDef), (char *) &_oc_CORBA_ValueBoxDef, 0, sizeof (CORBA::ValueBoxDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueBoxDef, &_tc_TAO_tc_CORBA_ValueBoxDef)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_ValueModifier[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c75654d), ACE_NTOHL (0x6f646966), ACE_NTOHL (0x6965723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ValueModifier:1.0
-  14, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000),  // name = ValueModifier
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueModifier (CORBA::tk_alias, sizeof (_oc_CORBA_ValueModifier), (char *) &_oc_CORBA_ValueModifier, 0, sizeof (CORBA::ValueModifier));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueModifier, &_tc_TAO_tc_CORBA_ValueModifier)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, VM_NONE, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, VM_CUSTOM, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, VM_ABSTRACT, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, VM_TRUNCATABLE, 3)
-TAO_NAMESPACE_END
-void operator<<= (CORBA::Any &_tao_any, CORBA::DefinitionKind _tao_elem)
-{
-  CORBA::DefinitionKind *_any_val;
-  ACE_NEW (_any_val, CORBA::DefinitionKind (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_DefinitionKind, _any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    // free allocated storage
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DefinitionKind &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_DefinitionKind, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    if (stream.decode (CORBA::_tc_DefinitionKind, &_tao_elem, 0, ACE_TRY_ENV)
-      == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      return 1;
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::IRObject_ptr (*_TAO_collocation_CORBA_IRObject_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::IRObject_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::IRObject::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_IRObject, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::IRObject_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::IRObject::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_IRObject, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_IRObject, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::IRObject::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_IRObject, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::IRObject,CORBA::IRObject_var>;
-template class TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::IRObject,CORBA::IRObject_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::Contained_ptr (*_TAO_collocation_CORBA_Contained_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::Contained_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::Contained::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_Contained, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Contained_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::Contained::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_Contained, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_Contained, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::Contained::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_Contained, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::Contained,CORBA::Contained_var>;
-template class TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::Contained,CORBA::Contained_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::Contained::Description &_tao_elem) // copying
-{
-  CORBA::Contained::Description *_any_val;
-  ACE_NEW (_any_val, CORBA::Contained::Description (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::Contained::_tc_Description, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::Contained::Description *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::Contained::_tc_Description, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Contained::Description *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::Contained::_tc_Description, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::Contained::Description *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::Contained::Description, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::Contained::_tc_Description, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::Contained::_tc_Description, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceDefSeq &_tao_elem
-  ) // copying
-{
-  CORBA::InterfaceDefSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::InterfaceDefSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_InterfaceDefSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::InterfaceDefSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_InterfaceDefSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InterfaceDefSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_InterfaceDefSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::InterfaceDefSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::InterfaceDefSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_InterfaceDefSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_InterfaceDefSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueDefSeq &_tao_elem
-  ) // copying
-{
-  CORBA::ValueDefSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::ValueDefSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ValueDefSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueDefSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ValueDefSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueDefSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ValueDefSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ValueDefSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ValueDefSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ValueDefSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ValueDefSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ContainedSeq &_tao_elem
-  ) // copying
-{
-  CORBA::ContainedSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::ContainedSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ContainedSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ContainedSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ContainedSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ContainedSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ContainedSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ContainedSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ContainedSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ContainedSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ContainedSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::StructMember &_tao_elem) // copying
-{
-  CORBA::StructMember *_any_val;
-  ACE_NEW (_any_val, CORBA::StructMember (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_StructMember, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::StructMember *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_StructMember, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StructMember *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_StructMember, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::StructMember *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::StructMember, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_StructMember, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_StructMember, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::StructMemberSeq &_tao_elem
-  ) // copying
-{
-  CORBA::StructMemberSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::StructMemberSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_StructMemberSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::StructMemberSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_StructMemberSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StructMemberSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_StructMemberSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::StructMemberSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::StructMemberSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_StructMemberSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_StructMemberSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::Initializer &_tao_elem) // copying
-{
-  CORBA::Initializer *_any_val;
-  ACE_NEW (_any_val, CORBA::Initializer (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_Initializer, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::Initializer *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_Initializer, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Initializer *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_Initializer, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::Initializer *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::Initializer, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_Initializer, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_Initializer, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InitializerSeq &_tao_elem
-  ) // copying
-{
-  CORBA::InitializerSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::InitializerSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_InitializerSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::InitializerSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_InitializerSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InitializerSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_InitializerSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::InitializerSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::InitializerSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_InitializerSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_InitializerSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::UnionMember &_tao_elem) // copying
-{
-  CORBA::UnionMember *_any_val;
-  ACE_NEW (_any_val, CORBA::UnionMember (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_UnionMember, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::UnionMember *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_UnionMember, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::UnionMember *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_UnionMember, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::UnionMember *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::UnionMember, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_UnionMember, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_UnionMember, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::UnionMemberSeq &_tao_elem
-  ) // copying
-{
-  CORBA::UnionMemberSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::UnionMemberSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_UnionMemberSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::UnionMemberSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_UnionMemberSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::UnionMemberSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_UnionMemberSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::UnionMemberSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::UnionMemberSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_UnionMemberSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_UnionMemberSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::EnumMemberSeq &_tao_elem
-  ) // copying
-{
-  CORBA::EnumMemberSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::EnumMemberSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_EnumMemberSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::EnumMemberSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_EnumMemberSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::EnumMemberSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_EnumMemberSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::EnumMemberSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::EnumMemberSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_EnumMemberSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_EnumMemberSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Container_ptr (*_TAO_collocation_CORBA_Container_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::Container_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::Container::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_Container, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Container_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::Container::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_Container, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_Container, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::Container::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_Container, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::Container,CORBA::Container_var>;
-template class TAO_Object_Manager<CORBA::Container,CORBA::Container_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::Container,CORBA::Container_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::Container,CORBA::Container_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::Container::Description &_tao_elem) // copying
-{
-  CORBA::Container::Description *_any_val;
-  ACE_NEW (_any_val, CORBA::Container::Description (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::Container::_tc_Description, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::Container::Description *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::Container::_tc_Description, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Container::Description *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::Container::_tc_Description, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::Container::Description *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::Container::Description, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::Container::_tc_Description, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::Container::_tc_Description, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Container::DescriptionSeq &_tao_elem
-  ) // copying
-{
-  CORBA::Container::DescriptionSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::Container::DescriptionSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::Container::_tc_DescriptionSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::Container::DescriptionSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::Container::_tc_DescriptionSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Container::DescriptionSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::Container::_tc_DescriptionSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::Container::DescriptionSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::Container::DescriptionSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::Container::_tc_DescriptionSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::Container::_tc_DescriptionSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::IDLType_ptr (*_TAO_collocation_CORBA_IDLType_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::IDLType_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::IDLType::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_IDLType, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::IDLType_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::IDLType::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_IDLType, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_IDLType, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::IDLType::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_IDLType, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::IDLType,CORBA::IDLType_var>;
-template class TAO_Object_Manager<CORBA::IDLType,CORBA::IDLType_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::IDLType,CORBA::IDLType_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::IDLType,CORBA::IDLType_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::PrimitiveKind _tao_elem)
-{
-  CORBA::PrimitiveKind *_any_val;
-  ACE_NEW (_any_val, CORBA::PrimitiveKind (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PrimitiveKind, _any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    // free allocated storage
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveKind &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_PrimitiveKind, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    if (stream.decode (CORBA::_tc_PrimitiveKind, &_tao_elem, 0, ACE_TRY_ENV)
-      == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      return 1;
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Repository_ptr (*_TAO_collocation_CORBA_Repository_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::Repository_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::Repository::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_Repository, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Repository_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::Repository::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_Repository, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_Repository, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::Repository::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_Repository, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::Repository,CORBA::Repository_var>;
-template class TAO_Object_Manager<CORBA::Repository,CORBA::Repository_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::Repository,CORBA::Repository_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::Repository,CORBA::Repository_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::ModuleDef_ptr (*_TAO_collocation_CORBA_ModuleDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::ModuleDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::ModuleDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_ModuleDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ModuleDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ModuleDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ModuleDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_ModuleDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::ModuleDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ModuleDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::ModuleDef,CORBA::ModuleDef_var>;
-template class TAO_Object_Manager<CORBA::ModuleDef,CORBA::ModuleDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::ModuleDef,CORBA::ModuleDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::ModuleDef,CORBA::ModuleDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ModuleDescription &_tao_elem) // copying
-{
-  CORBA::ModuleDescription *_any_val;
-  ACE_NEW (_any_val, CORBA::ModuleDescription (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ModuleDescription, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ModuleDescription *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ModuleDescription, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ModuleDescription *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ModuleDescription, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ModuleDescription *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ModuleDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ModuleDescription, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ModuleDescription, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::ConstantDef_ptr (*_TAO_collocation_CORBA_ConstantDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::ConstantDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::ConstantDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_ConstantDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ConstantDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ConstantDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ConstantDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_ConstantDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::ConstantDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ConstantDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::ConstantDef,CORBA::ConstantDef_var>;
-template class TAO_Object_Manager<CORBA::ConstantDef,CORBA::ConstantDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::ConstantDef,CORBA::ConstantDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::ConstantDef,CORBA::ConstantDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ConstantDescription &_tao_elem) // copying
-{
-  CORBA::ConstantDescription *_any_val;
-  ACE_NEW (_any_val, CORBA::ConstantDescription (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ConstantDescription, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ConstantDescription *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ConstantDescription, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ConstantDescription *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ConstantDescription, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ConstantDescription *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ConstantDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ConstantDescription, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ConstantDescription, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::TypedefDef_ptr (*_TAO_collocation_CORBA_TypedefDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::TypedefDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::TypedefDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_TypedefDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::TypedefDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::TypedefDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_TypedefDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_TypedefDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::TypedefDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_TypedefDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::TypedefDef,CORBA::TypedefDef_var>;
-template class TAO_Object_Manager<CORBA::TypedefDef,CORBA::TypedefDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::TypedefDef,CORBA::TypedefDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::TypedefDef,CORBA::TypedefDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::TypeDescription &_tao_elem) // copying
-{
-  CORBA::TypeDescription *_any_val;
-  ACE_NEW (_any_val, CORBA::TypeDescription (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_TypeDescription, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::TypeDescription *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_TypeDescription, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::TypeDescription *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_TypeDescription, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::TypeDescription *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::TypeDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_TypeDescription, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_TypeDescription, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::StructDef_ptr (*_TAO_collocation_CORBA_StructDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::StructDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::StructDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_StructDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StructDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::StructDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_StructDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_StructDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::StructDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_StructDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::StructDef,CORBA::StructDef_var>;
-template class TAO_Object_Manager<CORBA::StructDef,CORBA::StructDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::StructDef,CORBA::StructDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::StructDef,CORBA::StructDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::UnionDef_ptr (*_TAO_collocation_CORBA_UnionDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::UnionDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::UnionDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_UnionDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::UnionDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::UnionDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_UnionDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_UnionDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::UnionDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_UnionDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::UnionDef,CORBA::UnionDef_var>;
-template class TAO_Object_Manager<CORBA::UnionDef,CORBA::UnionDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::UnionDef,CORBA::UnionDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::UnionDef,CORBA::UnionDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::EnumDef_ptr (*_TAO_collocation_CORBA_EnumDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::EnumDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::EnumDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_EnumDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::EnumDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::EnumDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_EnumDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_EnumDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::EnumDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_EnumDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::EnumDef,CORBA::EnumDef_var>;
-template class TAO_Object_Manager<CORBA::EnumDef,CORBA::EnumDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::EnumDef,CORBA::EnumDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::EnumDef,CORBA::EnumDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::AliasDef_ptr (*_TAO_collocation_CORBA_AliasDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::AliasDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::AliasDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_AliasDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AliasDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::AliasDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_AliasDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_AliasDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::AliasDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_AliasDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::AliasDef,CORBA::AliasDef_var>;
-template class TAO_Object_Manager<CORBA::AliasDef,CORBA::AliasDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::AliasDef,CORBA::AliasDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::AliasDef,CORBA::AliasDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::PrimitiveDef_ptr (*_TAO_collocation_CORBA_PrimitiveDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::PrimitiveDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::PrimitiveDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_PrimitiveDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::PrimitiveDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_PrimitiveDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_PrimitiveDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::PrimitiveDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_PrimitiveDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::PrimitiveDef,CORBA::PrimitiveDef_var>;
-template class TAO_Object_Manager<CORBA::PrimitiveDef,CORBA::PrimitiveDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::PrimitiveDef,CORBA::PrimitiveDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::PrimitiveDef,CORBA::PrimitiveDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::StringDef_ptr (*_TAO_collocation_CORBA_StringDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::StringDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::StringDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_StringDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StringDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::StringDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_StringDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_StringDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::StringDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_StringDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::StringDef,CORBA::StringDef_var>;
-template class TAO_Object_Manager<CORBA::StringDef,CORBA::StringDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::StringDef,CORBA::StringDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::StringDef,CORBA::StringDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::WstringDef_ptr (*_TAO_collocation_CORBA_WstringDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::WstringDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::WstringDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_WstringDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::WstringDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::WstringDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_WstringDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_WstringDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::WstringDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_WstringDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::WstringDef,CORBA::WstringDef_var>;
-template class TAO_Object_Manager<CORBA::WstringDef,CORBA::WstringDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::WstringDef,CORBA::WstringDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::WstringDef,CORBA::WstringDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::FixedDef_ptr (*_TAO_collocation_CORBA_FixedDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::FixedDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::FixedDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_FixedDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::FixedDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::FixedDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_FixedDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_FixedDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::FixedDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_FixedDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::FixedDef,CORBA::FixedDef_var>;
-template class TAO_Object_Manager<CORBA::FixedDef,CORBA::FixedDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::FixedDef,CORBA::FixedDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::FixedDef,CORBA::FixedDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::SequenceDef_ptr (*_TAO_collocation_CORBA_SequenceDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::SequenceDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::SequenceDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_SequenceDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SequenceDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::SequenceDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_SequenceDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_SequenceDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::SequenceDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_SequenceDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::SequenceDef,CORBA::SequenceDef_var>;
-template class TAO_Object_Manager<CORBA::SequenceDef,CORBA::SequenceDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::SequenceDef,CORBA::SequenceDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::SequenceDef,CORBA::SequenceDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::ArrayDef_ptr (*_TAO_collocation_CORBA_ArrayDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::ArrayDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::ArrayDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_ArrayDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ArrayDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ArrayDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ArrayDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_ArrayDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::ArrayDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ArrayDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::ArrayDef,CORBA::ArrayDef_var>;
-template class TAO_Object_Manager<CORBA::ArrayDef,CORBA::ArrayDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::ArrayDef,CORBA::ArrayDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::ArrayDef,CORBA::ArrayDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::ExceptionDef_ptr (*_TAO_collocation_CORBA_ExceptionDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::ExceptionDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::ExceptionDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_ExceptionDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ExceptionDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ExceptionDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ExceptionDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_ExceptionDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::ExceptionDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ExceptionDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::ExceptionDef,CORBA::ExceptionDef_var>;
-template class TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ExceptionDescription &_tao_elem) // copying
-{
-  CORBA::ExceptionDescription *_any_val;
-  ACE_NEW (_any_val, CORBA::ExceptionDescription (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ExceptionDescription, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ExceptionDescription *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ExceptionDescription, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ExceptionDescription *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ExceptionDescription, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ExceptionDescription *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ExceptionDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ExceptionDescription, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ExceptionDescription, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::AttributeMode _tao_elem)
-{
-  CORBA::AttributeMode *_any_val;
-  ACE_NEW (_any_val, CORBA::AttributeMode (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_AttributeMode, _any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    // free allocated storage
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeMode &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_AttributeMode, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    if (stream.decode (CORBA::_tc_AttributeMode, &_tao_elem, 0, ACE_TRY_ENV)
-      == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      return 1;
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::AttributeDef_ptr (*_TAO_collocation_CORBA_AttributeDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::AttributeDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::AttributeDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_AttributeDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::AttributeDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_AttributeDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_AttributeDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::AttributeDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_AttributeDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::AttributeDef,CORBA::AttributeDef_var>;
-template class TAO_Object_Manager<CORBA::AttributeDef,CORBA::AttributeDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::AttributeDef,CORBA::AttributeDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::AttributeDef,CORBA::AttributeDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::AttributeDescription &_tao_elem) // copying
-{
-  CORBA::AttributeDescription *_any_val;
-  ACE_NEW (_any_val, CORBA::AttributeDescription (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_AttributeDescription, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::AttributeDescription *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_AttributeDescription, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeDescription *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_AttributeDescription, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::AttributeDescription *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::AttributeDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_AttributeDescription, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_AttributeDescription, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::OperationMode _tao_elem)
-{
-  CORBA::OperationMode *_any_val;
-  ACE_NEW (_any_val, CORBA::OperationMode (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_OperationMode, _any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    // free allocated storage
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationMode &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_OperationMode, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    if (stream.decode (CORBA::_tc_OperationMode, &_tao_elem, 0, ACE_TRY_ENV)
-      == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      return 1;
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ParameterMode _tao_elem)
-{
-  CORBA::ParameterMode *_any_val;
-  ACE_NEW (_any_val, CORBA::ParameterMode (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ParameterMode, _any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    // free allocated storage
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParameterMode &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ParameterMode, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    if (stream.decode (CORBA::_tc_ParameterMode, &_tao_elem, 0, ACE_TRY_ENV)
-      == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      return 1;
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ParameterDescription &_tao_elem) // copying
-{
-  CORBA::ParameterDescription *_any_val;
-  ACE_NEW (_any_val, CORBA::ParameterDescription (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ParameterDescription, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ParameterDescription *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ParameterDescription, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParameterDescription *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ParameterDescription, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ParameterDescription *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ParameterDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ParameterDescription, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ParameterDescription, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ParDescriptionSeq &_tao_elem
-  ) // copying
-{
-  CORBA::ParDescriptionSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::ParDescriptionSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ParDescriptionSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ParDescriptionSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ParDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParDescriptionSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ParDescriptionSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ParDescriptionSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ParDescriptionSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ParDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ParDescriptionSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ContextIdSeq &_tao_elem
-  ) // copying
-{
-  CORBA::ContextIdSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::ContextIdSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ContextIdSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ContextIdSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ContextIdSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ContextIdSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ContextIdSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ContextIdSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ContextIdSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ContextIdSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ContextIdSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExceptionDefSeq &_tao_elem
-  ) // copying
-{
-  CORBA::ExceptionDefSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::ExceptionDefSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ExceptionDefSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ExceptionDefSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ExceptionDefSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ExceptionDefSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ExceptionDefSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ExceptionDefSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ExceptionDefSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ExceptionDefSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ExceptionDefSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExcDescriptionSeq &_tao_elem
-  ) // copying
-{
-  CORBA::ExcDescriptionSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::ExcDescriptionSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ExcDescriptionSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ExcDescriptionSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ExcDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ExcDescriptionSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ExcDescriptionSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ExcDescriptionSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ExcDescriptionSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ExcDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ExcDescriptionSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::OperationDef_ptr (*_TAO_collocation_CORBA_OperationDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::OperationDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::OperationDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_OperationDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::OperationDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_OperationDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_OperationDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::OperationDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_OperationDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::OperationDef,CORBA::OperationDef_var>;
-template class TAO_Object_Manager<CORBA::OperationDef,CORBA::OperationDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::OperationDef,CORBA::OperationDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::OperationDef,CORBA::OperationDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::OperationDescription &_tao_elem) // copying
-{
-  CORBA::OperationDescription *_any_val;
-  ACE_NEW (_any_val, CORBA::OperationDescription (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_OperationDescription, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::OperationDescription *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_OperationDescription, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationDescription *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_OperationDescription, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::OperationDescription *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::OperationDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_OperationDescription, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_OperationDescription, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::RepositoryIdSeq &_tao_elem
-  ) // copying
-{
-  CORBA::RepositoryIdSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::RepositoryIdSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_RepositoryIdSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::RepositoryIdSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_RepositoryIdSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::RepositoryIdSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_RepositoryIdSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::RepositoryIdSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::RepositoryIdSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_RepositoryIdSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_RepositoryIdSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::OpDescriptionSeq &_tao_elem
-  ) // copying
-{
-  CORBA::OpDescriptionSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::OpDescriptionSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_OpDescriptionSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::OpDescriptionSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_OpDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OpDescriptionSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_OpDescriptionSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::OpDescriptionSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::OpDescriptionSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_OpDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_OpDescriptionSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AttrDescriptionSeq &_tao_elem
-  ) // copying
-{
-  CORBA::AttrDescriptionSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::AttrDescriptionSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_AttrDescriptionSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::AttrDescriptionSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_AttrDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttrDescriptionSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_AttrDescriptionSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::AttrDescriptionSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::AttrDescriptionSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_AttrDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_AttrDescriptionSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::InterfaceDef_ptr (*_TAO_collocation_CORBA_InterfaceDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::InterfaceDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::InterfaceDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_InterfaceDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InterfaceDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::InterfaceDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_InterfaceDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_InterfaceDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::InterfaceDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_InterfaceDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::InterfaceDef,CORBA::InterfaceDef_var>;
-template class TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::InterfaceDef::FullInterfaceDescription &_tao_elem) // copying
-{
-  CORBA::InterfaceDef::FullInterfaceDescription *_any_val;
-  ACE_NEW (_any_val, CORBA::InterfaceDef::FullInterfaceDescription (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::InterfaceDef::_tc_FullInterfaceDescription, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::InterfaceDef::FullInterfaceDescription *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::InterfaceDef::_tc_FullInterfaceDescription, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::InterfaceDef::_tc_FullInterfaceDescription, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::InterfaceDef::FullInterfaceDescription *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::InterfaceDef::FullInterfaceDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::InterfaceDef::_tc_FullInterfaceDescription, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::InterfaceDef::_tc_FullInterfaceDescription, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::InterfaceDescription &_tao_elem) // copying
-{
-  CORBA::InterfaceDescription *_any_val;
-  ACE_NEW (_any_val, CORBA::InterfaceDescription (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_InterfaceDescription, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::InterfaceDescription *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_InterfaceDescription, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InterfaceDescription *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_InterfaceDescription, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::InterfaceDescription *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::InterfaceDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_InterfaceDescription, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_InterfaceDescription, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ValueMember &_tao_elem) // copying
-{
-  CORBA::ValueMember *_any_val;
-  ACE_NEW (_any_val, CORBA::ValueMember (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ValueMember, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueMember *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ValueMember, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueMember *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ValueMember, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ValueMember *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ValueMember, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ValueMember, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ValueMember, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueMemberSeq &_tao_elem
-  ) // copying
-{
-  CORBA::ValueMemberSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::ValueMemberSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ValueMemberSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueMemberSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ValueMemberSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueMemberSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ValueMemberSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ValueMemberSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ValueMemberSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ValueMemberSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ValueMemberSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::ValueMemberDef_ptr (*_TAO_collocation_CORBA_ValueMemberDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueMemberDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::ValueMemberDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_ValueMemberDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueMemberDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ValueMemberDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ValueMemberDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_ValueMemberDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::ValueMemberDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ValueMemberDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::ValueMemberDef,CORBA::ValueMemberDef_var>;
-template class TAO_Object_Manager<CORBA::ValueMemberDef,CORBA::ValueMemberDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::ValueMemberDef,CORBA::ValueMemberDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::ValueMemberDef,CORBA::ValueMemberDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::ValueDef_ptr (*_TAO_collocation_CORBA_ValueDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::ValueDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_ValueDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ValueDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ValueDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_ValueDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::ValueDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ValueDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::ValueDef,CORBA::ValueDef_var>;
-template class TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::ValueDef,CORBA::ValueDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ValueDef::FullValueDescription &_tao_elem) // copying
-{
-  CORBA::ValueDef::FullValueDescription *_any_val;
-  ACE_NEW (_any_val, CORBA::ValueDef::FullValueDescription (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::ValueDef::_tc_FullValueDescription, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueDef::FullValueDescription *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::ValueDef::_tc_FullValueDescription, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueDef::FullValueDescription *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::ValueDef::_tc_FullValueDescription, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ValueDef::FullValueDescription *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ValueDef::FullValueDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::ValueDef::_tc_FullValueDescription, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::ValueDef::_tc_FullValueDescription, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ValueDescription &_tao_elem) // copying
-{
-  CORBA::ValueDescription *_any_val;
-  ACE_NEW (_any_val, CORBA::ValueDescription (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ValueDescription, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueDescription *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ValueDescription, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueDescription *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ValueDescription, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ValueDescription *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ValueDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ValueDescription, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ValueDescription, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::ValueBoxDef_ptr (*_TAO_collocation_CORBA_ValueBoxDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueBoxDef_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::ValueBoxDef::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_ValueBoxDef, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueBoxDef_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ValueBoxDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ValueBoxDef, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_ValueBoxDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::ValueBoxDef::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ValueBoxDef, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::ValueBoxDef,CORBA::ValueBoxDef_var>;
-template class TAO_Object_Manager<CORBA::ValueBoxDef,CORBA::ValueBoxDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::ValueBoxDef,CORBA::ValueBoxDef_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::ValueBoxDef,CORBA::ValueBoxDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InterfaceDefSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InterfaceDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueDefSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ContainedSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ContainedSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::StructMemberSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::StructMemberSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InitializerSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InitializerSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::UnionMemberSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::UnionMemberSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::EnumMemberSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::EnumMemberSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Container::DescriptionSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Container::DescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ParDescriptionSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ParDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ContextIdSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ContextIdSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExceptionDefSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExceptionDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExcDescriptionSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExcDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::RepositoryIdSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::RepositoryIdSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::OpDescriptionSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::OpDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AttrDescriptionSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AttrDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueMemberSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueMemberSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
diff --git a/TAO/tao/InterfaceC.h b/TAO/tao/InterfaceC.h
deleted file mode 100644
index 860698c689b..00000000000
--- a/TAO/tao/InterfaceC.h
+++ /dev/null
@@ -1,8537 +0,0 @@
-/* -*- C++ -*- */
-//$Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef _TAO_IDL_INTERFACEC_H_
-#define _TAO_IDL_INTERFACEC_H_
-
-#include "tao/corba.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO 
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-  class TAO_Export CORBA_IRObject_var
-  {
-  public:
-    CORBA_IRObject_var (void); // default constructor
-    CORBA_IRObject_var (CORBA_IRObject_ptr);
-    CORBA_IRObject_var (const CORBA_IRObject_var &); // copy constructor
-    ~CORBA_IRObject_var (void); // destructor
-    
-    CORBA_IRObject_var &operator= (CORBA_IRObject_ptr);
-    CORBA_IRObject_var &operator= (const CORBA_IRObject_var &);
-    CORBA_IRObject_ptr operator-> (void) const;
-    
-    operator const CORBA_IRObject_ptr &() const;
-    operator CORBA_IRObject_ptr &();
-    // in, inout, out, _retn 
-    CORBA_IRObject_ptr in (void) const;
-    CORBA_IRObject_ptr &inout (void);
-    CORBA_IRObject_ptr &out (void);
-    CORBA_IRObject_ptr _retn (void);
-    CORBA_IRObject_ptr ptr (void) const;
-
-  private:
-    CORBA_IRObject_ptr ptr_;
-  };
-
-
-//#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_IROBJECT___OUT_CH_)
-#define _CORBA_IROBJECT___OUT_CH_
-
-  class TAO_Export CORBA_IRObject_out
-  {
-  public:
-    CORBA_IRObject_out (CORBA_IRObject_ptr &);
-    CORBA_IRObject_out (CORBA_IRObject_var &);
-    CORBA_IRObject_out (const CORBA_IRObject_out &);
-    CORBA_IRObject_out &operator= (const CORBA_IRObject_out &);
-    CORBA_IRObject_out &operator= (const CORBA_IRObject_var &);
-    CORBA_IRObject_out &operator= (CORBA_IRObject_ptr);
-    operator CORBA_IRObject_ptr &();
-    CORBA_IRObject_ptr &ptr (void);
-    CORBA_IRObject_ptr operator-> (void);
-    
-  private:
-    CORBA_IRObject_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_IROBJECT_CH_)
-#define _CORBA_IROBJECT_CH_
-
-class TAO_Export CORBA_IRObject : public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_IRObject_ptr _ptr_type;
-    typedef CORBA_IRObject_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_IRObject_ptr _duplicate (CORBA_IRObject_ptr obj);
-    static CORBA_IRObject_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_IRObject_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_IRObject_ptr _nil (void)
-      {
-        return (CORBA::IRObject_ptr)0;
-      }
-
-    virtual CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_IRObject (void);
-    CORBA_IRObject (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_IRObject (void);
-  private:
-    CORBA_IRObject (const CORBA_IRObject &);
-    void operator= (const CORBA_IRObject &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINED___VAR_CH_)
-#define _CORBA_CONTAINED___VAR_CH_
-
-  class TAO_Export CORBA_Contained_var
-  {
-  public:
-    CORBA_Contained_var (void); // default constructor
-    CORBA_Contained_var (CORBA_Contained_ptr);
-    CORBA_Contained_var (const CORBA_Contained_var &); // copy constructor
-    ~CORBA_Contained_var (void); // destructor
-    
-    CORBA_Contained_var &operator= (CORBA_Contained_ptr);
-    CORBA_Contained_var &operator= (const CORBA_Contained_var &);
-    CORBA_Contained_ptr operator-> (void) const;
-    
-    operator const CORBA_Contained_ptr &() const;
-    operator CORBA_Contained_ptr &();
-    // in, inout, out, _retn 
-    CORBA_Contained_ptr in (void) const;
-    CORBA_Contained_ptr &inout (void);
-    CORBA_Contained_ptr &out (void);
-    CORBA_Contained_ptr _retn (void);
-    CORBA_Contained_ptr ptr (void) const;
-
-  private:
-    CORBA_Contained_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINED___OUT_CH_)
-#define _CORBA_CONTAINED___OUT_CH_
-
-  class TAO_Export CORBA_Contained_out
-  {
-  public:
-    CORBA_Contained_out (CORBA_Contained_ptr &);
-    CORBA_Contained_out (CORBA_Contained_var &);
-    CORBA_Contained_out (const CORBA_Contained_out &);
-    CORBA_Contained_out &operator= (const CORBA_Contained_out &);
-    CORBA_Contained_out &operator= (const CORBA_Contained_var &);
-    CORBA_Contained_out &operator= (CORBA_Contained_ptr);
-    operator CORBA_Contained_ptr &();
-    CORBA_Contained_ptr &ptr (void);
-    CORBA_Contained_ptr operator-> (void);
-    
-  private:
-    CORBA_Contained_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_REPOSITORY___VAR_CH_)
-#define _CORBA_REPOSITORY___VAR_CH_
-
-  class TAO_Export CORBA_Repository_var
-  {
-  public:
-    CORBA_Repository_var (void); // default constructor
-    CORBA_Repository_var (CORBA_Repository_ptr);
-    CORBA_Repository_var (const CORBA_Repository_var &); // copy constructor
-    ~CORBA_Repository_var (void); // destructor
-    
-    CORBA_Repository_var &operator= (CORBA_Repository_ptr);
-    CORBA_Repository_var &operator= (const CORBA_Repository_var &);
-    CORBA_Repository_ptr operator-> (void) const;
-    
-    operator const CORBA_Repository_ptr &() const;
-    operator CORBA_Repository_ptr &();
-    // in, inout, out, _retn 
-    CORBA_Repository_ptr in (void) const;
-    CORBA_Repository_ptr &inout (void);
-    CORBA_Repository_ptr &out (void);
-    CORBA_Repository_ptr _retn (void);
-    CORBA_Repository_ptr ptr (void) const;
-
-  private:
-    CORBA_Repository_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_REPOSITORY___OUT_CH_)
-#define _CORBA_REPOSITORY___OUT_CH_
-
-  class TAO_Export CORBA_Repository_out
-  {
-  public:
-    CORBA_Repository_out (CORBA_Repository_ptr &);
-    CORBA_Repository_out (CORBA_Repository_var &);
-    CORBA_Repository_out (const CORBA_Repository_out &);
-    CORBA_Repository_out &operator= (const CORBA_Repository_out &);
-    CORBA_Repository_out &operator= (const CORBA_Repository_var &);
-    CORBA_Repository_out &operator= (CORBA_Repository_ptr);
-    operator CORBA_Repository_ptr &();
-    CORBA_Repository_ptr &ptr (void);
-    CORBA_Repository_ptr operator-> (void);
-    
-  private:
-    CORBA_Repository_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINER___VAR_CH_)
-#define _CORBA_CONTAINER___VAR_CH_
-
-  class TAO_Export CORBA_Container_var
-  {
-  public:
-    CORBA_Container_var (void); // default constructor
-    CORBA_Container_var (CORBA_Container_ptr);
-    CORBA_Container_var (const CORBA_Container_var &); // copy constructor
-    ~CORBA_Container_var (void); // destructor
-    
-    CORBA_Container_var &operator= (CORBA_Container_ptr);
-    CORBA_Container_var &operator= (const CORBA_Container_var &);
-    CORBA_Container_ptr operator-> (void) const;
-    
-    operator const CORBA_Container_ptr &() const;
-    operator CORBA_Container_ptr &();
-    // in, inout, out, _retn 
-    CORBA_Container_ptr in (void) const;
-    CORBA_Container_ptr &inout (void);
-    CORBA_Container_ptr &out (void);
-    CORBA_Container_ptr _retn (void);
-    CORBA_Container_ptr ptr (void) const;
-
-  private:
-    CORBA_Container_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINER___OUT_CH_)
-#define _CORBA_CONTAINER___OUT_CH_
-
-  class TAO_Export CORBA_Container_out
-  {
-  public:
-    CORBA_Container_out (CORBA_Container_ptr &);
-    CORBA_Container_out (CORBA_Container_var &);
-    CORBA_Container_out (const CORBA_Container_out &);
-    CORBA_Container_out &operator= (const CORBA_Container_out &);
-    CORBA_Container_out &operator= (const CORBA_Container_var &);
-    CORBA_Container_out &operator= (CORBA_Container_ptr);
-    operator CORBA_Container_ptr &();
-    CORBA_Container_ptr &ptr (void);
-    CORBA_Container_ptr operator-> (void);
-    
-  private:
-    CORBA_Container_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINED___VAR_CH_)
-#define _CORBA_CONTAINED___VAR_CH_
-
-  class TAO_Export CORBA_Contained_var
-  {
-  public:
-    CORBA_Contained_var (void); // default constructor
-    CORBA_Contained_var (CORBA_Contained_ptr);
-    CORBA_Contained_var (const CORBA_Contained_var &); // copy constructor
-    ~CORBA_Contained_var (void); // destructor
-    
-    CORBA_Contained_var &operator= (CORBA_Contained_ptr);
-    CORBA_Contained_var &operator= (const CORBA_Contained_var &);
-    CORBA_Contained_ptr operator-> (void) const;
-    
-    operator const CORBA_Contained_ptr &() const;
-    operator CORBA_Contained_ptr &();
-    // in, inout, out, _retn 
-    CORBA_Contained_ptr in (void) const;
-    CORBA_Contained_ptr &inout (void);
-    CORBA_Contained_ptr &out (void);
-    CORBA_Contained_ptr _retn (void);
-    CORBA_Contained_ptr ptr (void) const;
-
-  private:
-    CORBA_Contained_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINED___OUT_CH_)
-#define _CORBA_CONTAINED___OUT_CH_
-
-  class TAO_Export CORBA_Contained_out
-  {
-  public:
-    CORBA_Contained_out (CORBA_Contained_ptr &);
-    CORBA_Contained_out (CORBA_Contained_var &);
-    CORBA_Contained_out (const CORBA_Contained_out &);
-    CORBA_Contained_out &operator= (const CORBA_Contained_out &);
-    CORBA_Contained_out &operator= (const CORBA_Contained_var &);
-    CORBA_Contained_out &operator= (CORBA_Contained_ptr);
-    operator CORBA_Contained_ptr &();
-    CORBA_Contained_ptr &ptr (void);
-    CORBA_Contained_ptr operator-> (void);
-    
-  private:
-    CORBA_Contained_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINED_CH_)
-#define _CORBA_CONTAINED_CH_
-
-class TAO_Export CORBA_Contained: public virtual CORBA_IRObject
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_Contained_ptr _ptr_type;
-    typedef CORBA_Contained_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_Contained_ptr _duplicate (CORBA_Contained_ptr obj);
-    static CORBA_Contained_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_Contained_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_Contained_ptr _nil (void)
-      {
-        return (CORBA::Contained_ptr)0;
-      }
-
-    virtual char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    struct  Description
-    {
-      CORBA::DefinitionKind kind;
-      CORBA::Any value;
-    };
-
-    class Description_var
-    {
-    public:
-      Description_var (void); // default constructor
-      Description_var (Description *);
-      Description_var (const Description_var &); // copy constructor
-      ~Description_var (void); // destructor
-      
-      Description_var &operator= (Description *);
-      Description_var &operator= (const Description_var &);
-      Description *operator-> (void);
-      const Description *operator-> (void) const;
-      
-      operator const Description &() const;
-      operator Description &();
-      operator Description &() const;
-      // in, inout, out, _retn 
-      const Description &in (void) const;
-      Description &inout (void);
-      Description *&out (void);
-      Description *_retn (void);
-      Description *ptr (void) const;
-
-    private:
-      Description *ptr_;
-    };
-
-    class  Description_out
-    {
-    public:
-      Description_out (Description *&);
-      Description_out (Description_var &);
-      Description_out (const Description_out &);
-      Description_out &operator= (const Description_out &);
-      Description_out &operator= (Description *);
-      operator Description *&();
-      Description *&ptr (void);
-      Description *operator-> (void);
-      
-    private:
-      Description *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const Description_var &);
-    };
-
-    static CORBA::TypeCode_ptr _tc_Description;
-
-    virtual Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void move (
-        CORBA_Container_ptr new_container,
-        const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_Contained (void);
-    CORBA_Contained (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_Contained (void);
-  private:
-    CORBA_Contained (const CORBA_Contained &);
-    void operator= (const CORBA_Contained &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_MODULEDEF___VAR_CH_)
-#define _CORBA_MODULEDEF___VAR_CH_
-
-  class TAO_Export CORBA_ModuleDef_var
-  {
-  public:
-    CORBA_ModuleDef_var (void); // default constructor
-    CORBA_ModuleDef_var (CORBA_ModuleDef_ptr);
-    CORBA_ModuleDef_var (const CORBA_ModuleDef_var &); // copy constructor
-    ~CORBA_ModuleDef_var (void); // destructor
-    
-    CORBA_ModuleDef_var &operator= (CORBA_ModuleDef_ptr);
-    CORBA_ModuleDef_var &operator= (const CORBA_ModuleDef_var &);
-    CORBA_ModuleDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ModuleDef_ptr &() const;
-    operator CORBA_ModuleDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ModuleDef_ptr in (void) const;
-    CORBA_ModuleDef_ptr &inout (void);
-    CORBA_ModuleDef_ptr &out (void);
-    CORBA_ModuleDef_ptr _retn (void);
-    CORBA_ModuleDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ModuleDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_MODULEDEF___OUT_CH_)
-#define _CORBA_MODULEDEF___OUT_CH_
-
-  class TAO_Export CORBA_ModuleDef_out
-  {
-  public:
-    CORBA_ModuleDef_out (CORBA_ModuleDef_ptr &);
-    CORBA_ModuleDef_out (CORBA_ModuleDef_var &);
-    CORBA_ModuleDef_out (const CORBA_ModuleDef_out &);
-    CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_out &);
-    CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_var &);
-    CORBA_ModuleDef_out &operator= (CORBA_ModuleDef_ptr);
-    operator CORBA_ModuleDef_ptr &();
-    CORBA_ModuleDef_ptr &ptr (void);
-    CORBA_ModuleDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ModuleDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTANTDEF___VAR_CH_)
-#define _CORBA_CONSTANTDEF___VAR_CH_
-
-  class TAO_Export CORBA_ConstantDef_var
-  {
-  public:
-    CORBA_ConstantDef_var (void); // default constructor
-    CORBA_ConstantDef_var (CORBA_ConstantDef_ptr);
-    CORBA_ConstantDef_var (const CORBA_ConstantDef_var &); // copy constructor
-    ~CORBA_ConstantDef_var (void); // destructor
-    
-    CORBA_ConstantDef_var &operator= (CORBA_ConstantDef_ptr);
-    CORBA_ConstantDef_var &operator= (const CORBA_ConstantDef_var &);
-    CORBA_ConstantDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ConstantDef_ptr &() const;
-    operator CORBA_ConstantDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ConstantDef_ptr in (void) const;
-    CORBA_ConstantDef_ptr &inout (void);
-    CORBA_ConstantDef_ptr &out (void);
-    CORBA_ConstantDef_ptr _retn (void);
-    CORBA_ConstantDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ConstantDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTANTDEF___OUT_CH_)
-#define _CORBA_CONSTANTDEF___OUT_CH_
-
-  class TAO_Export CORBA_ConstantDef_out
-  {
-  public:
-    CORBA_ConstantDef_out (CORBA_ConstantDef_ptr &);
-    CORBA_ConstantDef_out (CORBA_ConstantDef_var &);
-    CORBA_ConstantDef_out (const CORBA_ConstantDef_out &);
-    CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_out &);
-    CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_var &);
-    CORBA_ConstantDef_out &operator= (CORBA_ConstantDef_ptr);
-    operator CORBA_ConstantDef_ptr &();
-    CORBA_ConstantDef_ptr &ptr (void);
-    CORBA_ConstantDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ConstantDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE___VAR_CH_)
-#define _CORBA_IDLTYPE___VAR_CH_
-
-  class TAO_Export CORBA_IDLType_var
-  {
-  public:
-    CORBA_IDLType_var (void); // default constructor
-    CORBA_IDLType_var (CORBA_IDLType_ptr);
-    CORBA_IDLType_var (const CORBA_IDLType_var &); // copy constructor
-    ~CORBA_IDLType_var (void); // destructor
-    
-    CORBA_IDLType_var &operator= (CORBA_IDLType_ptr);
-    CORBA_IDLType_var &operator= (const CORBA_IDLType_var &);
-    CORBA_IDLType_ptr operator-> (void) const;
-    
-    operator const CORBA_IDLType_ptr &() const;
-    operator CORBA_IDLType_ptr &();
-    // in, inout, out, _retn 
-    CORBA_IDLType_ptr in (void) const;
-    CORBA_IDLType_ptr &inout (void);
-    CORBA_IDLType_ptr &out (void);
-    CORBA_IDLType_ptr _retn (void);
-    CORBA_IDLType_ptr ptr (void) const;
-
-  private:
-    CORBA_IDLType_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_IDLTYPE___OUT_CH_)
-#define _CORBA_IDLTYPE___OUT_CH_
-
-  class TAO_Export CORBA_IDLType_out
-  {
-  public:
-    CORBA_IDLType_out (CORBA_IDLType_ptr &);
-    CORBA_IDLType_out (CORBA_IDLType_var &);
-    CORBA_IDLType_out (const CORBA_IDLType_out &);
-    CORBA_IDLType_out &operator= (const CORBA_IDLType_out &);
-    CORBA_IDLType_out &operator= (const CORBA_IDLType_var &);
-    CORBA_IDLType_out &operator= (CORBA_IDLType_ptr);
-    operator CORBA_IDLType_ptr &();
-    CORBA_IDLType_ptr &ptr (void);
-    CORBA_IDLType_ptr operator-> (void);
-    
-  private:
-    CORBA_IDLType_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRUCTDEF___VAR_CH_)
-#define _CORBA_STRUCTDEF___VAR_CH_
-
-  class TAO_Export CORBA_StructDef_var
-  {
-  public:
-    CORBA_StructDef_var (void); // default constructor
-    CORBA_StructDef_var (CORBA_StructDef_ptr);
-    CORBA_StructDef_var (const CORBA_StructDef_var &); // copy constructor
-    ~CORBA_StructDef_var (void); // destructor
-    
-    CORBA_StructDef_var &operator= (CORBA_StructDef_ptr);
-    CORBA_StructDef_var &operator= (const CORBA_StructDef_var &);
-    CORBA_StructDef_ptr operator-> (void) const;
-    
-    operator const CORBA_StructDef_ptr &() const;
-    operator CORBA_StructDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_StructDef_ptr in (void) const;
-    CORBA_StructDef_ptr &inout (void);
-    CORBA_StructDef_ptr &out (void);
-    CORBA_StructDef_ptr _retn (void);
-    CORBA_StructDef_ptr ptr (void) const;
-
-  private:
-    CORBA_StructDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRUCTDEF___OUT_CH_)
-#define _CORBA_STRUCTDEF___OUT_CH_
-
-  class TAO_Export CORBA_StructDef_out
-  {
-  public:
-    CORBA_StructDef_out (CORBA_StructDef_ptr &);
-    CORBA_StructDef_out (CORBA_StructDef_var &);
-    CORBA_StructDef_out (const CORBA_StructDef_out &);
-    CORBA_StructDef_out &operator= (const CORBA_StructDef_out &);
-    CORBA_StructDef_out &operator= (const CORBA_StructDef_var &);
-    CORBA_StructDef_out &operator= (CORBA_StructDef_ptr);
-    operator CORBA_StructDef_ptr &();
-    CORBA_StructDef_ptr &ptr (void);
-    CORBA_StructDef_ptr operator-> (void);
-    
-  private:
-    CORBA_StructDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_UNIONDEF___VAR_CH_)
-#define _CORBA_UNIONDEF___VAR_CH_
-
-  class TAO_Export CORBA_UnionDef_var
-  {
-  public:
-    CORBA_UnionDef_var (void); // default constructor
-    CORBA_UnionDef_var (CORBA_UnionDef_ptr);
-    CORBA_UnionDef_var (const CORBA_UnionDef_var &); // copy constructor
-    ~CORBA_UnionDef_var (void); // destructor
-    
-    CORBA_UnionDef_var &operator= (CORBA_UnionDef_ptr);
-    CORBA_UnionDef_var &operator= (const CORBA_UnionDef_var &);
-    CORBA_UnionDef_ptr operator-> (void) const;
-    
-    operator const CORBA_UnionDef_ptr &() const;
-    operator CORBA_UnionDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_UnionDef_ptr in (void) const;
-    CORBA_UnionDef_ptr &inout (void);
-    CORBA_UnionDef_ptr &out (void);
-    CORBA_UnionDef_ptr _retn (void);
-    CORBA_UnionDef_ptr ptr (void) const;
-
-  private:
-    CORBA_UnionDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_UNIONDEF___OUT_CH_)
-#define _CORBA_UNIONDEF___OUT_CH_
-
-  class TAO_Export CORBA_UnionDef_out
-  {
-  public:
-    CORBA_UnionDef_out (CORBA_UnionDef_ptr &);
-    CORBA_UnionDef_out (CORBA_UnionDef_var &);
-    CORBA_UnionDef_out (const CORBA_UnionDef_out &);
-    CORBA_UnionDef_out &operator= (const CORBA_UnionDef_out &);
-    CORBA_UnionDef_out &operator= (const CORBA_UnionDef_var &);
-    CORBA_UnionDef_out &operator= (CORBA_UnionDef_ptr);
-    operator CORBA_UnionDef_ptr &();
-    CORBA_UnionDef_ptr &ptr (void);
-    CORBA_UnionDef_ptr operator-> (void);
-    
-  private:
-    CORBA_UnionDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMDEF___VAR_CH_)
-#define _CORBA_ENUMDEF___VAR_CH_
-
-  class TAO_Export CORBA_EnumDef_var
-  {
-  public:
-    CORBA_EnumDef_var (void); // default constructor
-    CORBA_EnumDef_var (CORBA_EnumDef_ptr);
-    CORBA_EnumDef_var (const CORBA_EnumDef_var &); // copy constructor
-    ~CORBA_EnumDef_var (void); // destructor
-    
-    CORBA_EnumDef_var &operator= (CORBA_EnumDef_ptr);
-    CORBA_EnumDef_var &operator= (const CORBA_EnumDef_var &);
-    CORBA_EnumDef_ptr operator-> (void) const;
-    
-    operator const CORBA_EnumDef_ptr &() const;
-    operator CORBA_EnumDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_EnumDef_ptr in (void) const;
-    CORBA_EnumDef_ptr &inout (void);
-    CORBA_EnumDef_ptr &out (void);
-    CORBA_EnumDef_ptr _retn (void);
-    CORBA_EnumDef_ptr ptr (void) const;
-
-  private:
-    CORBA_EnumDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ENUMDEF___OUT_CH_)
-#define _CORBA_ENUMDEF___OUT_CH_
-
-  class TAO_Export CORBA_EnumDef_out
-  {
-  public:
-    CORBA_EnumDef_out (CORBA_EnumDef_ptr &);
-    CORBA_EnumDef_out (CORBA_EnumDef_var &);
-    CORBA_EnumDef_out (const CORBA_EnumDef_out &);
-    CORBA_EnumDef_out &operator= (const CORBA_EnumDef_out &);
-    CORBA_EnumDef_out &operator= (const CORBA_EnumDef_var &);
-    CORBA_EnumDef_out &operator= (CORBA_EnumDef_ptr);
-    operator CORBA_EnumDef_ptr &();
-    CORBA_EnumDef_ptr &ptr (void);
-    CORBA_EnumDef_ptr operator-> (void);
-    
-  private:
-    CORBA_EnumDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ALIASDEF___VAR_CH_)
-#define _CORBA_ALIASDEF___VAR_CH_
-
-  class TAO_Export CORBA_AliasDef_var
-  {
-  public:
-    CORBA_AliasDef_var (void); // default constructor
-    CORBA_AliasDef_var (CORBA_AliasDef_ptr);
-    CORBA_AliasDef_var (const CORBA_AliasDef_var &); // copy constructor
-    ~CORBA_AliasDef_var (void); // destructor
-    
-    CORBA_AliasDef_var &operator= (CORBA_AliasDef_ptr);
-    CORBA_AliasDef_var &operator= (const CORBA_AliasDef_var &);
-    CORBA_AliasDef_ptr operator-> (void) const;
-    
-    operator const CORBA_AliasDef_ptr &() const;
-    operator CORBA_AliasDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_AliasDef_ptr in (void) const;
-    CORBA_AliasDef_ptr &inout (void);
-    CORBA_AliasDef_ptr &out (void);
-    CORBA_AliasDef_ptr _retn (void);
-    CORBA_AliasDef_ptr ptr (void) const;
-
-  private:
-    CORBA_AliasDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ALIASDEF___OUT_CH_)
-#define _CORBA_ALIASDEF___OUT_CH_
-
-  class TAO_Export CORBA_AliasDef_out
-  {
-  public:
-    CORBA_AliasDef_out (CORBA_AliasDef_ptr &);
-    CORBA_AliasDef_out (CORBA_AliasDef_var &);
-    CORBA_AliasDef_out (const CORBA_AliasDef_out &);
-    CORBA_AliasDef_out &operator= (const CORBA_AliasDef_out &);
-    CORBA_AliasDef_out &operator= (const CORBA_AliasDef_var &);
-    CORBA_AliasDef_out &operator= (CORBA_AliasDef_ptr);
-    operator CORBA_AliasDef_ptr &();
-    CORBA_AliasDef_ptr &ptr (void);
-    CORBA_AliasDef_ptr operator-> (void);
-    
-  private:
-    CORBA_AliasDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-//#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
-#define _CORBA_INTERFACEDEF___VAR_CH_
-
-  class TAO_Export CORBA_InterfaceDef_var
-  {
-  public:
-    CORBA_InterfaceDef_var (void); // default constructor
-    CORBA_InterfaceDef_var (CORBA_InterfaceDef_ptr);
-    CORBA_InterfaceDef_var (const CORBA_InterfaceDef_var &); // copy constructor
-    ~CORBA_InterfaceDef_var (void); // destructor
-    
-    CORBA_InterfaceDef_var &operator= (CORBA_InterfaceDef_ptr);
-    CORBA_InterfaceDef_var &operator= (const CORBA_InterfaceDef_var &);
-    CORBA_InterfaceDef_ptr operator-> (void) const;
-    
-    operator const CORBA_InterfaceDef_ptr &() const;
-    operator CORBA_InterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_InterfaceDef_ptr in (void) const;
-    CORBA_InterfaceDef_ptr &inout (void);
-    CORBA_InterfaceDef_ptr &out (void);
-    CORBA_InterfaceDef_ptr _retn (void);
-    CORBA_InterfaceDef_ptr ptr (void) const;
-
-  private:
-    CORBA_InterfaceDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
-#define _CORBA_INTERFACEDEF___OUT_CH_
-
-  class TAO_Export CORBA_InterfaceDef_out
-  {
-  public:
-    CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &);
-    CORBA_InterfaceDef_out (CORBA_InterfaceDef_var &);
-    CORBA_InterfaceDef_out (const CORBA_InterfaceDef_out &);
-    CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_out &);
-    CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_var &);
-    CORBA_InterfaceDef_out &operator= (CORBA_InterfaceDef_ptr);
-    operator CORBA_InterfaceDef_ptr &();
-    CORBA_InterfaceDef_ptr &ptr (void);
-    CORBA_InterfaceDef_ptr operator-> (void);
-    
-  private:
-    CORBA_InterfaceDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCEPTIONDEF___VAR_CH_)
-#define _CORBA_EXCEPTIONDEF___VAR_CH_
-
-  class TAO_Export CORBA_ExceptionDef_var
-  {
-  public:
-    CORBA_ExceptionDef_var (void); // default constructor
-    CORBA_ExceptionDef_var (CORBA_ExceptionDef_ptr);
-    CORBA_ExceptionDef_var (const CORBA_ExceptionDef_var &); // copy constructor
-    ~CORBA_ExceptionDef_var (void); // destructor
-    
-    CORBA_ExceptionDef_var &operator= (CORBA_ExceptionDef_ptr);
-    CORBA_ExceptionDef_var &operator= (const CORBA_ExceptionDef_var &);
-    CORBA_ExceptionDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ExceptionDef_ptr &() const;
-    operator CORBA_ExceptionDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ExceptionDef_ptr in (void) const;
-    CORBA_ExceptionDef_ptr &inout (void);
-    CORBA_ExceptionDef_ptr &out (void);
-    CORBA_ExceptionDef_ptr _retn (void);
-    CORBA_ExceptionDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ExceptionDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_EXCEPTIONDEF___OUT_CH_)
-#define _CORBA_EXCEPTIONDEF___OUT_CH_
-
-  class TAO_Export CORBA_ExceptionDef_out
-  {
-  public:
-    CORBA_ExceptionDef_out (CORBA_ExceptionDef_ptr &);
-    CORBA_ExceptionDef_out (CORBA_ExceptionDef_var &);
-    CORBA_ExceptionDef_out (const CORBA_ExceptionDef_out &);
-    CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_out &);
-    CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_var &);
-    CORBA_ExceptionDef_out &operator= (CORBA_ExceptionDef_ptr);
-    operator CORBA_ExceptionDef_ptr &();
-    CORBA_ExceptionDef_ptr &ptr (void);
-    CORBA_ExceptionDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ExceptionDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_NATIVEDEF___VAR_CH_)
-#define _CORBA_NATIVEDEF___VAR_CH_
-
-  class TAO_Export CORBA_NativeDef_var
-  {
-  public:
-    CORBA_NativeDef_var (void); // default constructor
-    CORBA_NativeDef_var (CORBA_NativeDef_ptr);
-    CORBA_NativeDef_var (const CORBA_NativeDef_var &); // copy constructor
-    ~CORBA_NativeDef_var (void); // destructor
-    
-    CORBA_NativeDef_var &operator= (CORBA_NativeDef_ptr);
-    CORBA_NativeDef_var &operator= (const CORBA_NativeDef_var &);
-    CORBA_NativeDef_ptr operator-> (void) const;
-    
-    operator const CORBA_NativeDef_ptr &() const;
-    operator CORBA_NativeDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_NativeDef_ptr in (void) const;
-    CORBA_NativeDef_ptr &inout (void);
-    CORBA_NativeDef_ptr &out (void);
-    CORBA_NativeDef_ptr _retn (void);
-    CORBA_NativeDef_ptr ptr (void) const;
-
-  private:
-    CORBA_NativeDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_NATIVEDEF___OUT_CH_)
-#define _CORBA_NATIVEDEF___OUT_CH_
-
-  class TAO_Export CORBA_NativeDef_out
-  {
-  public:
-    CORBA_NativeDef_out (CORBA_NativeDef_ptr &);
-    CORBA_NativeDef_out (CORBA_NativeDef_var &);
-    CORBA_NativeDef_out (const CORBA_NativeDef_out &);
-    CORBA_NativeDef_out &operator= (const CORBA_NativeDef_out &);
-    CORBA_NativeDef_out &operator= (const CORBA_NativeDef_var &);
-    CORBA_NativeDef_out &operator= (CORBA_NativeDef_ptr);
-    operator CORBA_NativeDef_ptr &();
-    CORBA_NativeDef_ptr &ptr (void);
-    CORBA_NativeDef_ptr operator-> (void);
-    
-  private:
-    CORBA_NativeDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_InterfaceDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs);
-      TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var> operator[] (CORBA::ULong index) const;
-      static CORBA_InterfaceDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (CORBA_InterfaceDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      CORBA_InterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_InterfaceDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
-#define _CORBA_INTERFACEDEFSEQ_CH_
-
-  // *************************************************************
-  // InterfaceDefSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_InterfaceDefSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_InterfaceDefSeq (void); // default ctor
-    CORBA_InterfaceDefSeq (CORBA::ULong max); // uses max size
-    CORBA_InterfaceDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_InterfaceDef_ptr *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_InterfaceDefSeq (const CORBA_InterfaceDefSeq &); // copy ctor
-    ~CORBA_InterfaceDefSeq (void); // dtor
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INTERFACEDEFSEQ___VAR_CH_)
-#define _CORBA_INTERFACEDEFSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::InterfaceDefSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_InterfaceDefSeq_var
-  {
-  public:
-    CORBA_InterfaceDefSeq_var (void); // default constructor
-    CORBA_InterfaceDefSeq_var (CORBA_InterfaceDefSeq *);
-    CORBA_InterfaceDefSeq_var (const CORBA_InterfaceDefSeq_var &); // copy constructor
-    ~CORBA_InterfaceDefSeq_var (void); // destructor
-    
-    CORBA_InterfaceDefSeq_var &operator= (CORBA_InterfaceDefSeq *);
-    CORBA_InterfaceDefSeq_var &operator= (const CORBA_InterfaceDefSeq_var &);
-    CORBA_InterfaceDefSeq *operator-> (void);
-    const CORBA_InterfaceDefSeq *operator-> (void) const;
-    
-    operator const CORBA_InterfaceDefSeq &() const;
-    operator CORBA_InterfaceDefSeq &();
-    operator CORBA_InterfaceDefSeq &() const;
-    TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var> operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_InterfaceDefSeq &in (void) const;
-    CORBA_InterfaceDefSeq &inout (void);
-    CORBA_InterfaceDefSeq *&out (void);
-    CORBA_InterfaceDefSeq *_retn (void);
-    CORBA_InterfaceDefSeq *ptr (void) const;
-
-  private:
-    CORBA_InterfaceDefSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INTERFACEDEFSEQ___OUT_CH_)
-#define _CORBA_INTERFACEDEFSEQ___OUT_CH_
-
-  class TAO_Export CORBA_InterfaceDefSeq_out
-  {
-  public:
-    CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq *&);
-    CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq_var &);
-    CORBA_InterfaceDefSeq_out (const CORBA_InterfaceDefSeq_out &);
-    CORBA_InterfaceDefSeq_out &operator= (const CORBA_InterfaceDefSeq_out &);
-    CORBA_InterfaceDefSeq_out &operator= (CORBA_InterfaceDefSeq *);
-    operator CORBA_InterfaceDefSeq *&();
-    CORBA_InterfaceDefSeq *&ptr (void);
-    CORBA_InterfaceDefSeq *operator-> (void);
-    TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var> operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_InterfaceDefSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_InterfaceDefSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF___VAR_CH_)
-#define _CORBA_VALUEDEF___VAR_CH_
-
-  class TAO_Export CORBA_ValueDef_var
-  {
-  public:
-    CORBA_ValueDef_var (void); // default constructor
-    CORBA_ValueDef_var (CORBA_ValueDef_ptr);
-    CORBA_ValueDef_var (const CORBA_ValueDef_var &); // copy constructor
-    ~CORBA_ValueDef_var (void); // destructor
-    
-    CORBA_ValueDef_var &operator= (CORBA_ValueDef_ptr);
-    CORBA_ValueDef_var &operator= (const CORBA_ValueDef_var &);
-    CORBA_ValueDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ValueDef_ptr &() const;
-    operator CORBA_ValueDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ValueDef_ptr in (void) const;
-    CORBA_ValueDef_ptr &inout (void);
-    CORBA_ValueDef_ptr &out (void);
-    CORBA_ValueDef_ptr _retn (void);
-    CORBA_ValueDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ValueDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEDEF___OUT_CH_)
-#define _CORBA_VALUEDEF___OUT_CH_
-
-  class TAO_Export CORBA_ValueDef_out
-  {
-  public:
-    CORBA_ValueDef_out (CORBA_ValueDef_ptr &);
-    CORBA_ValueDef_out (CORBA_ValueDef_var &);
-    CORBA_ValueDef_out (const CORBA_ValueDef_out &);
-    CORBA_ValueDef_out &operator= (const CORBA_ValueDef_out &);
-    CORBA_ValueDef_out &operator= (const CORBA_ValueDef_var &);
-    CORBA_ValueDef_out &operator= (CORBA_ValueDef_ptr);
-    operator CORBA_ValueDef_ptr &();
-    CORBA_ValueDef_ptr &ptr (void);
-    CORBA_ValueDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ValueDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_ValueDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs);
-      TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var> operator[] (CORBA::ULong index) const;
-      static CORBA_ValueDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (CORBA_ValueDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      CORBA_ValueDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_ValueDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_VALUEDEFSEQ_CH_)
-#define _CORBA_VALUEDEFSEQ_CH_
-
-  // *************************************************************
-  // ValueDefSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_ValueDefSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_ValueDefSeq (void); // default ctor
-    CORBA_ValueDefSeq (CORBA::ULong max); // uses max size
-    CORBA_ValueDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_ValueDef_ptr *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_ValueDefSeq (const CORBA_ValueDefSeq &); // copy ctor
-    ~CORBA_ValueDefSeq (void); // dtor
-  };
-  
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEDEFSEQ___VAR_CH_)
-#define _CORBA_VALUEDEFSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::ValueDefSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_ValueDefSeq_var
-  {
-  public:
-    CORBA_ValueDefSeq_var (void); // default constructor
-    CORBA_ValueDefSeq_var (CORBA_ValueDefSeq *);
-    CORBA_ValueDefSeq_var (const CORBA_ValueDefSeq_var &); // copy constructor
-    ~CORBA_ValueDefSeq_var (void); // destructor
-    
-    CORBA_ValueDefSeq_var &operator= (CORBA_ValueDefSeq *);
-    CORBA_ValueDefSeq_var &operator= (const CORBA_ValueDefSeq_var &);
-    CORBA_ValueDefSeq *operator-> (void);
-    const CORBA_ValueDefSeq *operator-> (void) const;
-    
-    operator const CORBA_ValueDefSeq &() const;
-    operator CORBA_ValueDefSeq &();
-    operator CORBA_ValueDefSeq &() const;
-    TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var> operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_ValueDefSeq &in (void) const;
-    CORBA_ValueDefSeq &inout (void);
-    CORBA_ValueDefSeq *&out (void);
-    CORBA_ValueDefSeq *_retn (void);
-    CORBA_ValueDefSeq *ptr (void) const;
-
-  private:
-    CORBA_ValueDefSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEDEFSEQ___OUT_CH_)
-#define _CORBA_VALUEDEFSEQ___OUT_CH_
-
-  class TAO_Export CORBA_ValueDefSeq_out
-  {
-  public:
-    CORBA_ValueDefSeq_out (CORBA_ValueDefSeq *&);
-    CORBA_ValueDefSeq_out (CORBA_ValueDefSeq_var &);
-    CORBA_ValueDefSeq_out (const CORBA_ValueDefSeq_out &);
-    CORBA_ValueDefSeq_out &operator= (const CORBA_ValueDefSeq_out &);
-    CORBA_ValueDefSeq_out &operator= (CORBA_ValueDefSeq *);
-    operator CORBA_ValueDefSeq *&();
-    CORBA_ValueDefSeq *&ptr (void);
-    CORBA_ValueDefSeq *operator-> (void);
-    TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var> operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_ValueDefSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ValueDefSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEBOXDEF___VAR_CH_)
-#define _CORBA_VALUEBOXDEF___VAR_CH_
-
-  class TAO_Export CORBA_ValueBoxDef_var
-  {
-  public:
-    CORBA_ValueBoxDef_var (void); // default constructor
-    CORBA_ValueBoxDef_var (CORBA_ValueBoxDef_ptr);
-    CORBA_ValueBoxDef_var (const CORBA_ValueBoxDef_var &); // copy constructor
-    ~CORBA_ValueBoxDef_var (void); // destructor
-    
-    CORBA_ValueBoxDef_var &operator= (CORBA_ValueBoxDef_ptr);
-    CORBA_ValueBoxDef_var &operator= (const CORBA_ValueBoxDef_var &);
-    CORBA_ValueBoxDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ValueBoxDef_ptr &() const;
-    operator CORBA_ValueBoxDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ValueBoxDef_ptr in (void) const;
-    CORBA_ValueBoxDef_ptr &inout (void);
-    CORBA_ValueBoxDef_ptr &out (void);
-    CORBA_ValueBoxDef_ptr _retn (void);
-    CORBA_ValueBoxDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ValueBoxDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEBOXDEF___OUT_CH_)
-#define _CORBA_VALUEBOXDEF___OUT_CH_
-
-  class TAO_Export CORBA_ValueBoxDef_out
-  {
-  public:
-    CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_ptr &);
-    CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_var &);
-    CORBA_ValueBoxDef_out (const CORBA_ValueBoxDef_out &);
-    CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_out &);
-    CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_var &);
-    CORBA_ValueBoxDef_out &operator= (CORBA_ValueBoxDef_ptr);
-    operator CORBA_ValueBoxDef_ptr &();
-    CORBA_ValueBoxDef_ptr &ptr (void);
-    CORBA_ValueBoxDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ValueBoxDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
-      _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_Contained* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
-      _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs);
-      TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> operator[] (CORBA::ULong index) const;
-      static CORBA_Contained **allocbuf (CORBA::ULong nelems);
-      static void freebuf (CORBA_Contained **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      CORBA_Contained* *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_Contained* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_CONTAINEDSEQ_CH_)
-#define _CORBA_CONTAINEDSEQ_CH_
-
-  // *************************************************************
-  // ContainedSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_ContainedSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_ContainedSeq (void); // default ctor
-    CORBA_ContainedSeq (CORBA::ULong max); // uses max size
-    CORBA_ContainedSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_Contained_ptr *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_ContainedSeq (const CORBA_ContainedSeq &); // copy ctor
-    ~CORBA_ContainedSeq (void); // dtor
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINEDSEQ___VAR_CH_)
-#define _CORBA_CONTAINEDSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::ContainedSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_ContainedSeq_var
-  {
-  public:
-    CORBA_ContainedSeq_var (void); // default constructor
-    CORBA_ContainedSeq_var (CORBA_ContainedSeq *);
-    CORBA_ContainedSeq_var (const CORBA_ContainedSeq_var &); // copy constructor
-    ~CORBA_ContainedSeq_var (void); // destructor
-    
-    CORBA_ContainedSeq_var &operator= (CORBA_ContainedSeq *);
-    CORBA_ContainedSeq_var &operator= (const CORBA_ContainedSeq_var &);
-    CORBA_ContainedSeq *operator-> (void);
-    const CORBA_ContainedSeq *operator-> (void) const;
-    
-    operator const CORBA_ContainedSeq &() const;
-    operator CORBA_ContainedSeq &();
-    operator CORBA_ContainedSeq &() const;
-    TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var> operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_ContainedSeq &in (void) const;
-    CORBA_ContainedSeq &inout (void);
-    CORBA_ContainedSeq *&out (void);
-    CORBA_ContainedSeq *_retn (void);
-    CORBA_ContainedSeq *ptr (void) const;
-
-  private:
-    CORBA_ContainedSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINEDSEQ___OUT_CH_)
-#define _CORBA_CONTAINEDSEQ___OUT_CH_
-
-  class  CORBA_ContainedSeq_out
-  {
-  public:
-    CORBA_ContainedSeq_out (CORBA_ContainedSeq *&);
-    CORBA_ContainedSeq_out (CORBA_ContainedSeq_var &);
-    CORBA_ContainedSeq_out (const CORBA_ContainedSeq_out &);
-    CORBA_ContainedSeq_out &operator= (const CORBA_ContainedSeq_out &);
-    CORBA_ContainedSeq_out &operator= (CORBA_ContainedSeq *);
-    operator CORBA_ContainedSeq *&();
-    CORBA_ContainedSeq *&ptr (void);
-    CORBA_ContainedSeq *operator-> (void);
-    TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var> operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_ContainedSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ContainedSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-  struct  CORBA_StructMember
-  {
-    TAO_String_Manager name;
-    CORBA::TypeCode_var type;
-    TAO_Object_Field_T<CORBA_IDLType,CORBA_IDLType_var> type_def;
-  };
-
-  class TAO_Export CORBA_StructMember_var
-  {
-  public:
-    CORBA_StructMember_var (void); // default constructor
-    CORBA_StructMember_var (CORBA_StructMember *);
-    CORBA_StructMember_var (const CORBA_StructMember_var &); // copy constructor
-    ~CORBA_StructMember_var (void); // destructor
-    
-    CORBA_StructMember_var &operator= (CORBA_StructMember *);
-    CORBA_StructMember_var &operator= (const CORBA_StructMember_var &);
-    CORBA_StructMember *operator-> (void);
-    const CORBA_StructMember *operator-> (void) const;
-    
-    operator const CORBA_StructMember &() const;
-    operator CORBA_StructMember &();
-    operator CORBA_StructMember &() const;
-    // in, inout, out, _retn 
-    const CORBA_StructMember &in (void) const;
-    CORBA_StructMember &inout (void);
-    CORBA_StructMember *&out (void);
-    CORBA_StructMember *_retn (void);
-    CORBA_StructMember *ptr (void) const;
-
-  private:
-    CORBA_StructMember *ptr_;
-  };
-
-  class TAO_Export CORBA_StructMember_out
-  {
-  public:
-    CORBA_StructMember_out (CORBA_StructMember *&);
-    CORBA_StructMember_out (CORBA_StructMember_var &);
-    CORBA_StructMember_out (const CORBA_StructMember_out &);
-    CORBA_StructMember_out &operator= (const CORBA_StructMember_out &);
-    CORBA_StructMember_out &operator= (CORBA_StructMember *);
-    operator CORBA_StructMember *&();
-    CORBA_StructMember *&ptr (void);
-    CORBA_StructMember *operator-> (void);
-    
-  private:
-    CORBA_StructMember *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_StructMember_var &);
-  };
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_StructMemberSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_StructMember *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs);
-      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void); // Dtor.
-      // = Accessors.
-      CORBA_StructMember &operator[] (CORBA::ULong i);
-      const CORBA_StructMember &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA_StructMember *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA_StructMember *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      CORBA_StructMember *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_StructMember *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA_StructMember *data,
-        CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_STRUCTMEMBERSEQ_CH_)
-#define _CORBA_STRUCTMEMBERSEQ_CH_
-
-  // *************************************************************
-  // StructMemberSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_StructMemberSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA_StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_StructMemberSeq (void); // default ctor
-    CORBA_StructMemberSeq (CORBA::ULong max); // uses max size
-    CORBA_StructMemberSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_StructMember *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_StructMemberSeq (const CORBA_StructMemberSeq &); // copy ctor
-    ~CORBA_StructMemberSeq (void); // dtor
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ___VAR_CH_)
-#define _CORBA_STRUCTMEMBERSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::StructMemberSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_StructMemberSeq_var
-  {
-  public:
-    CORBA_StructMemberSeq_var (void); // default constructor
-    CORBA_StructMemberSeq_var (CORBA_StructMemberSeq *);
-    CORBA_StructMemberSeq_var (const CORBA_StructMemberSeq_var &); // copy constructor
-    ~CORBA_StructMemberSeq_var (void); // destructor
-    
-    CORBA_StructMemberSeq_var &operator= (CORBA_StructMemberSeq *);
-    CORBA_StructMemberSeq_var &operator= (const CORBA_StructMemberSeq_var &);
-    CORBA_StructMemberSeq *operator-> (void);
-    const CORBA_StructMemberSeq *operator-> (void) const;
-    
-    operator const CORBA_StructMemberSeq &() const;
-    operator CORBA_StructMemberSeq &();
-    operator CORBA_StructMemberSeq &() const;
-    CORBA_StructMember &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_StructMemberSeq &in (void) const;
-    CORBA_StructMemberSeq &inout (void);
-    CORBA_StructMemberSeq *&out (void);
-    CORBA_StructMemberSeq *_retn (void);
-    CORBA_StructMemberSeq *ptr (void) const;
-
-  private:
-    CORBA_StructMemberSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ___OUT_CH_)
-#define _CORBA_STRUCTMEMBERSEQ___OUT_CH_
-
-  class TAO_Export CORBA_StructMemberSeq_out
-  {
-  public:
-    CORBA_StructMemberSeq_out (CORBA_StructMemberSeq *&);
-    CORBA_StructMemberSeq_out (CORBA_StructMemberSeq_var &);
-    CORBA_StructMemberSeq_out (const CORBA_StructMemberSeq_out &);
-    CORBA_StructMemberSeq_out &operator= (const CORBA_StructMemberSeq_out &);
-    CORBA_StructMemberSeq_out &operator= (CORBA_StructMemberSeq *);
-    operator CORBA_StructMemberSeq *&();
-    CORBA_StructMemberSeq *&ptr (void);
-    CORBA_StructMemberSeq *operator-> (void);
-    CORBA_StructMember &operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_StructMemberSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_StructMemberSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-  struct  CORBA_Initializer
-  {
-    CORBA_StructMemberSeq members;
-  };
-
-  class TAO_Export CORBA_Initializer_var
-  {
-  public:
-    CORBA_Initializer_var (void); // default constructor
-    CORBA_Initializer_var (CORBA_Initializer *);
-    CORBA_Initializer_var (const CORBA_Initializer_var &); // copy constructor
-    ~CORBA_Initializer_var (void); // destructor
-    
-    CORBA_Initializer_var &operator= (CORBA_Initializer *);
-    CORBA_Initializer_var &operator= (const CORBA_Initializer_var &);
-    CORBA_Initializer *operator-> (void);
-    const CORBA_Initializer *operator-> (void) const;
-    
-    operator const CORBA_Initializer &() const;
-    operator CORBA_Initializer &();
-    operator CORBA_Initializer &() const;
-    // in, inout, out, _retn 
-    const CORBA_Initializer &in (void) const;
-    CORBA_Initializer &inout (void);
-    CORBA_Initializer *&out (void);
-    CORBA_Initializer *_retn (void);
-    CORBA_Initializer *ptr (void) const;
-
-  private:
-    CORBA_Initializer *ptr_;
-  };
-
-  class TAO_Export CORBA_Initializer_out
-  {
-  public:
-    CORBA_Initializer_out (CORBA_Initializer *&);
-    CORBA_Initializer_out (CORBA_Initializer_var &);
-    CORBA_Initializer_out (const CORBA_Initializer_out &);
-    CORBA_Initializer_out &operator= (const CORBA_Initializer_out &);
-    CORBA_Initializer_out &operator= (CORBA_Initializer *);
-    operator CORBA_Initializer *&();
-    CORBA_Initializer *&ptr (void);
-    CORBA_Initializer *operator-> (void);
-    
-  private:
-    CORBA_Initializer *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_Initializer_var &);
-  };
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_InitializerSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_InitializerSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_Initializer *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_InitializerSeq (const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs);
-      _TAO_Unbounded_Sequence_CORBA_InitializerSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void); // Dtor.
-      // = Accessors.
-      CORBA_Initializer &operator[] (CORBA::ULong i);
-      const CORBA_Initializer &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA_Initializer *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA_Initializer *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      CORBA_Initializer *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_Initializer *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA_Initializer *data,
-        CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_INITIALIZERSEQ_CH_)
-#define _CORBA_INITIALIZERSEQ_CH_
-
-  // *************************************************************
-  // InitializerSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_InitializerSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA_Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_InitializerSeq (void); // default ctor
-    CORBA_InitializerSeq (CORBA::ULong max); // uses max size
-    CORBA_InitializerSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_Initializer *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_InitializerSeq (const CORBA_InitializerSeq &); // copy ctor
-    ~CORBA_InitializerSeq (void); // dtor
-  };
-  
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INITIALIZERSEQ___VAR_CH_)
-#define _CORBA_INITIALIZERSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::InitializerSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_InitializerSeq_var
-  {
-  public:
-    CORBA_InitializerSeq_var (void); // default constructor
-    CORBA_InitializerSeq_var (CORBA_InitializerSeq *);
-    CORBA_InitializerSeq_var (const CORBA_InitializerSeq_var &); // copy constructor
-    ~CORBA_InitializerSeq_var (void); // destructor
-    
-    CORBA_InitializerSeq_var &operator= (CORBA_InitializerSeq *);
-    CORBA_InitializerSeq_var &operator= (const CORBA_InitializerSeq_var &);
-    CORBA_InitializerSeq *operator-> (void);
-    const CORBA_InitializerSeq *operator-> (void) const;
-    
-    operator const CORBA_InitializerSeq &() const;
-    operator CORBA_InitializerSeq &();
-    operator CORBA_InitializerSeq &() const;
-    CORBA_Initializer &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_InitializerSeq &in (void) const;
-    CORBA_InitializerSeq &inout (void);
-    CORBA_InitializerSeq *&out (void);
-    CORBA_InitializerSeq *_retn (void);
-    CORBA_InitializerSeq *ptr (void) const;
-
-  private:
-    CORBA_InitializerSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INITIALIZERSEQ___OUT_CH_)
-#define _CORBA_INITIALIZERSEQ___OUT_CH_
-
-  class TAO_Export CORBA_InitializerSeq_out
-  {
-  public:
-    CORBA_InitializerSeq_out (CORBA_InitializerSeq *&);
-    CORBA_InitializerSeq_out (CORBA_InitializerSeq_var &);
-    CORBA_InitializerSeq_out (const CORBA_InitializerSeq_out &);
-    CORBA_InitializerSeq_out &operator= (const CORBA_InitializerSeq_out &);
-    CORBA_InitializerSeq_out &operator= (CORBA_InitializerSeq *);
-    operator CORBA_InitializerSeq *&();
-    CORBA_InitializerSeq *&ptr (void);
-    CORBA_InitializerSeq *operator-> (void);
-    CORBA_Initializer &operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_InitializerSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_InitializerSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-  struct  CORBA_UnionMember
-  {
-    TAO_String_Manager name;
-    CORBA::Any label;
-    CORBA::TypeCode_var type;
-    TAO_Object_Field_T<CORBA_IDLType,CORBA_IDLType_var> type_def;
-  };
-
-  class TAO_Export CORBA_UnionMember_var
-  {
-  public:
-    CORBA_UnionMember_var (void); // default constructor
-    CORBA_UnionMember_var (CORBA_UnionMember *);
-    CORBA_UnionMember_var (const CORBA_UnionMember_var &); // copy constructor
-    ~CORBA_UnionMember_var (void); // destructor
-    
-    CORBA_UnionMember_var &operator= (CORBA_UnionMember *);
-    CORBA_UnionMember_var &operator= (const CORBA_UnionMember_var &);
-    CORBA_UnionMember *operator-> (void);
-    const CORBA_UnionMember *operator-> (void) const;
-    
-    operator const CORBA_UnionMember &() const;
-    operator CORBA_UnionMember &();
-    operator CORBA_UnionMember &() const;
-    // in, inout, out, _retn 
-    const CORBA_UnionMember &in (void) const;
-    CORBA_UnionMember &inout (void);
-    CORBA_UnionMember *&out (void);
-    CORBA_UnionMember *_retn (void);
-    CORBA_UnionMember *ptr (void) const;
-
-  private:
-    CORBA_UnionMember *ptr_;
-  };
-
-  class TAO_Export CORBA_UnionMember_out
-  {
-  public:
-    CORBA_UnionMember_out (CORBA_UnionMember *&);
-    CORBA_UnionMember_out (CORBA_UnionMember_var &);
-    CORBA_UnionMember_out (const CORBA_UnionMember_out &);
-    CORBA_UnionMember_out &operator= (const CORBA_UnionMember_out &);
-    CORBA_UnionMember_out &operator= (CORBA_UnionMember *);
-    operator CORBA_UnionMember *&();
-    CORBA_UnionMember *&ptr (void);
-    CORBA_UnionMember *operator-> (void);
-    
-  private:
-    CORBA_UnionMember *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_UnionMember_var &);
-  };
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_UnionMember *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs);
-      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void); // Dtor.
-      // = Accessors.
-      CORBA_UnionMember &operator[] (CORBA::ULong i);
-      const CORBA_UnionMember &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA_UnionMember *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA_UnionMember *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      CORBA_UnionMember *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_UnionMember *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA_UnionMember *data,
-        CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_UNIONMEMBERSEQ_CH_)
-#define _CORBA_UNIONMEMBERSEQ_CH_
-
-  // *************************************************************
-  // UnionMemberSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_UnionMemberSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA_UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_UnionMemberSeq (void); // default ctor
-    CORBA_UnionMemberSeq (CORBA::ULong max); // uses max size
-    CORBA_UnionMemberSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_UnionMember *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_UnionMemberSeq (const CORBA_UnionMemberSeq &); // copy ctor
-    ~CORBA_UnionMemberSeq (void); // dtor
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_UNIONMEMBERSEQ___VAR_CH_)
-#define _CORBA_UNIONMEMBERSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::UnionMemberSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_UnionMemberSeq_var
-  {
-  public:
-    CORBA_UnionMemberSeq_var (void); // default constructor
-    CORBA_UnionMemberSeq_var (CORBA_UnionMemberSeq *);
-    CORBA_UnionMemberSeq_var (const CORBA_UnionMemberSeq_var &); // copy constructor
-    ~CORBA_UnionMemberSeq_var (void); // destructor
-    
-    CORBA_UnionMemberSeq_var &operator= (CORBA_UnionMemberSeq *);
-    CORBA_UnionMemberSeq_var &operator= (const CORBA_UnionMemberSeq_var &);
-    CORBA_UnionMemberSeq *operator-> (void);
-    const CORBA_UnionMemberSeq *operator-> (void) const;
-    
-    operator const CORBA_UnionMemberSeq &() const;
-    operator CORBA_UnionMemberSeq &();
-    operator CORBA_UnionMemberSeq &() const;
-    CORBA_UnionMember &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_UnionMemberSeq &in (void) const;
-    CORBA_UnionMemberSeq &inout (void);
-    CORBA_UnionMemberSeq *&out (void);
-    CORBA_UnionMemberSeq *_retn (void);
-    CORBA_UnionMemberSeq *ptr (void) const;
-
-  private:
-    CORBA_UnionMemberSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_UNIONMEMBERSEQ___OUT_CH_)
-#define _CORBA_UNIONMEMBERSEQ___OUT_CH_
-
-  class TAO_Export CORBA_UnionMemberSeq_out
-  {
-  public:
-    CORBA_UnionMemberSeq_out (CORBA_UnionMemberSeq *&);
-    CORBA_UnionMemberSeq_out (CORBA_UnionMemberSeq_var &);
-    CORBA_UnionMemberSeq_out (const CORBA_UnionMemberSeq_out &);
-    CORBA_UnionMemberSeq_out &operator= (const CORBA_UnionMemberSeq_out &);
-    CORBA_UnionMemberSeq_out &operator= (CORBA_UnionMemberSeq *);
-    operator CORBA_UnionMemberSeq *&();
-    CORBA_UnionMemberSeq *&ptr (void);
-    CORBA_UnionMemberSeq *operator-> (void);
-    CORBA_UnionMember &operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_UnionMemberSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_UnionMemberSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
-#define _CORBA_ENUMMEMBERSEQ_CH_
-
-  // *************************************************************
-  // EnumMemberSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_EnumMemberSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_EnumMemberSeq (void); // default ctor
-    CORBA_EnumMemberSeq (CORBA::ULong max); // uses max size
-    CORBA_EnumMemberSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      char * *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_EnumMemberSeq (const CORBA_EnumMemberSeq &); // copy ctor
-    ~CORBA_EnumMemberSeq (void); // dtor
-  };
-  
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ENUMMEMBERSEQ___VAR_CH_)
-#define _CORBA_ENUMMEMBERSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::EnumMemberSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_EnumMemberSeq_var
-  {
-  public:
-    CORBA_EnumMemberSeq_var (void); // default constructor
-    CORBA_EnumMemberSeq_var (CORBA_EnumMemberSeq *);
-    CORBA_EnumMemberSeq_var (const CORBA_EnumMemberSeq_var &); // copy constructor
-    ~CORBA_EnumMemberSeq_var (void); // destructor
-    
-    CORBA_EnumMemberSeq_var &operator= (CORBA_EnumMemberSeq *);
-    CORBA_EnumMemberSeq_var &operator= (const CORBA_EnumMemberSeq_var &);
-    CORBA_EnumMemberSeq *operator-> (void);
-    const CORBA_EnumMemberSeq *operator-> (void) const;
-    
-    operator const CORBA_EnumMemberSeq &() const;
-    operator CORBA_EnumMemberSeq &();
-    operator CORBA_EnumMemberSeq &() const;
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_EnumMemberSeq &in (void) const;
-    CORBA_EnumMemberSeq &inout (void);
-    CORBA_EnumMemberSeq *&out (void);
-    CORBA_EnumMemberSeq *_retn (void);
-    CORBA_EnumMemberSeq *ptr (void) const;
-
-  private:
-    CORBA_EnumMemberSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ENUMMEMBERSEQ___OUT_CH_)
-#define _CORBA_ENUMMEMBERSEQ___OUT_CH_
-
-  class TAO_Export CORBA_EnumMemberSeq_out
-  {
-  public:
-    CORBA_EnumMemberSeq_out (CORBA_EnumMemberSeq *&);
-    CORBA_EnumMemberSeq_out (CORBA_EnumMemberSeq_var &);
-    CORBA_EnumMemberSeq_out (const CORBA_EnumMemberSeq_out &);
-    CORBA_EnumMemberSeq_out &operator= (const CORBA_EnumMemberSeq_out &);
-    CORBA_EnumMemberSeq_out &operator= (CORBA_EnumMemberSeq *);
-    operator CORBA_EnumMemberSeq *&();
-    CORBA_EnumMemberSeq *&ptr (void);
-    CORBA_EnumMemberSeq *operator-> (void);
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_EnumMemberSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_EnumMemberSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER___VAR_CH_)
-#define _CORBA_CONTAINER___VAR_CH_
-
-  class TAO_Export CORBA_Container_var
-  {
-  public:
-    CORBA_Container_var (void); // default constructor
-    CORBA_Container_var (CORBA_Container_ptr);
-    CORBA_Container_var (const CORBA_Container_var &); // copy constructor
-    ~CORBA_Container_var (void); // destructor
-    
-    CORBA_Container_var &operator= (CORBA_Container_ptr);
-    CORBA_Container_var &operator= (const CORBA_Container_var &);
-    CORBA_Container_ptr operator-> (void) const;
-    
-    operator const CORBA_Container_ptr &() const;
-    operator CORBA_Container_ptr &();
-    // in, inout, out, _retn 
-    CORBA_Container_ptr in (void) const;
-    CORBA_Container_ptr &inout (void);
-    CORBA_Container_ptr &out (void);
-    CORBA_Container_ptr _retn (void);
-    CORBA_Container_ptr ptr (void) const;
-
-  private:
-    CORBA_Container_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINER___OUT_CH_)
-#define _CORBA_CONTAINER___OUT_CH_
-
-  class TAO_Export CORBA_Container_out
-  {
-  public:
-    CORBA_Container_out (CORBA_Container_ptr &);
-    CORBA_Container_out (CORBA_Container_var &);
-    CORBA_Container_out (const CORBA_Container_out &);
-    CORBA_Container_out &operator= (const CORBA_Container_out &);
-    CORBA_Container_out &operator= (const CORBA_Container_var &);
-    CORBA_Container_out &operator= (CORBA_Container_ptr);
-    operator CORBA_Container_ptr &();
-    CORBA_Container_ptr &ptr (void);
-    CORBA_Container_ptr operator-> (void);
-    
-  private:
-    CORBA_Container_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINER_CH_)
-#define _CORBA_CONTAINER_CH_
-
-class TAO_Export CORBA_Container: public virtual CORBA_IRObject
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_Container_ptr _ptr_type;
-    typedef CORBA_Container_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_Container_ptr _duplicate (CORBA_Container_ptr obj);
-    static CORBA_Container_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_Container_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_Container_ptr _nil (void)
-      {
-        return (CORBA::Container_ptr)0;
-      }
-
-    virtual CORBA_Contained_ptr lookup (
-        const char * search_name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ContainedSeq * lookup_name (
-        const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    struct  Description
-    {
-      TAO_Object_Field_T<CORBA_Contained,CORBA_Contained_var> contained_object;
-      CORBA::DefinitionKind kind;
-      CORBA::Any value;
-    };
-
-    class  Description_var
-    {
-    public:
-      Description_var (void); // default constructor
-      Description_var (Description *);
-      Description_var (const Description_var &); // copy constructor
-      ~Description_var (void); // destructor
-      
-      Description_var &operator= (Description *);
-      Description_var &operator= (const Description_var &);
-      Description *operator-> (void);
-      const Description *operator-> (void) const;
-      
-      operator const Description &() const;
-      operator Description &();
-      operator Description &() const;
-      // in, inout, out, _retn 
-      const Description &in (void) const;
-      Description &inout (void);
-      Description *&out (void);
-      Description *_retn (void);
-      Description *ptr (void) const;
-
-    private:
-      Description *ptr_;
-    };
-
-    class  Description_out
-    {
-    public:
-      Description_out (Description *&);
-      Description_out (Description_var &);
-      Description_out (const Description_out &);
-      Description_out &operator= (const Description_out &);
-      Description_out &operator= (Description *);
-      operator Description *&();
-      Description *&ptr (void);
-      Description *operator-> (void);
-      
-    private:
-      Description *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const Description_var &);
-    };
-
-    static CORBA::TypeCode_ptr _tc_Description;
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-      
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
-
-      class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq : public TAO_Unbounded_Base_Sequence
-      {
-      public:
-        // = Initialization and termination methods.
-        
-        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void); // Default constructor.
-        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum); 
-        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum,
-          CORBA::ULong length,
-          Description *data,
-          CORBA::Boolean release = 0);
-        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs);
-        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs);
-        virtual ~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void); // Dtor.
-        // = Accessors.
-        Description &operator[] (CORBA::ULong i);
-        const Description &operator[] (CORBA::ULong i) const;
-        // = Static operations.
-        static Description *allocbuf (CORBA::ULong size);
-        static void freebuf (Description *buffer);
-        virtual void _allocate_buffer (CORBA::ULong length);
-        virtual void _deallocate_buffer (void);
-        // Implement the TAO_Base_Sequence methods (see Sequence.h)
-        
-        Description *get_buffer (CORBA::Boolean orphan = 0);
-        const Description *get_buffer (void) const;
-        void replace (CORBA::ULong max,
-          CORBA::ULong length,
-          Description *data,
-          CORBA::Boolean release);
-      };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-    
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
-
-    // *************************************************************
-    // DescriptionSeq
-    // *************************************************************
-    
-    class  DescriptionSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-      TAO_Unbounded_Sequence<Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-    {
-    public:
-      DescriptionSeq (void); // default ctor
-      DescriptionSeq (CORBA::ULong max); // uses max size
-      DescriptionSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        Description *buffer, 
-        CORBA::Boolean release=0
-      );
-      DescriptionSeq (const DescriptionSeq &); // copy ctor
-      ~DescriptionSeq (void); // dtor
-    };
-    typedef DescriptionSeq *DescriptionSeq_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ___VAR_CH_
-
-// *************************************************************
-    // class CORBA::Container::DescriptionSeq_var
-    // *************************************************************
-
-    class  DescriptionSeq_var
-    {
-    public:
-      DescriptionSeq_var (void); // default constructor
-      DescriptionSeq_var (DescriptionSeq *);
-      DescriptionSeq_var (const DescriptionSeq_var &); // copy constructor
-      ~DescriptionSeq_var (void); // destructor
-      
-      DescriptionSeq_var &operator= (DescriptionSeq *);
-      DescriptionSeq_var &operator= (const DescriptionSeq_var &);
-      DescriptionSeq *operator-> (void);
-      const DescriptionSeq *operator-> (void) const;
-      
-      operator const DescriptionSeq &() const;
-      operator DescriptionSeq &();
-      operator DescriptionSeq &() const;
-      Description &operator[] (CORBA::ULong index);
-      // in, inout, out, _retn 
-      const DescriptionSeq &in (void) const;
-      DescriptionSeq &inout (void);
-      DescriptionSeq *&out (void);
-      DescriptionSeq *_retn (void);
-      DescriptionSeq *ptr (void) const;
-
-    private:
-      DescriptionSeq *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ___OUT_CH_
-
-    class  DescriptionSeq_out
-    {
-    public:
-      DescriptionSeq_out (DescriptionSeq *&);
-      DescriptionSeq_out (DescriptionSeq_var &);
-      DescriptionSeq_out (const DescriptionSeq_out &);
-      DescriptionSeq_out &operator= (const DescriptionSeq_out &);
-      DescriptionSeq_out &operator= (DescriptionSeq *);
-      operator DescriptionSeq *&();
-      DescriptionSeq *&ptr (void);
-      DescriptionSeq *operator-> (void);
-      Description &operator[] (CORBA::ULong index);
-      
-    private:
-      DescriptionSeq *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const DescriptionSeq_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-    static CORBA::TypeCode_ptr _tc_DescriptionSeq;
-
-    virtual DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ModuleDef_ptr create_module (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ConstantDef_ptr create_constant (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA_IDLType_ptr type,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_StructDef_ptr create_struct (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_UnionDef_ptr create_union (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA_IDLType_ptr discriminator_type,
-        const CORBA_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_EnumDef_ptr create_enum (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_AliasDef_ptr create_alias (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA_IDLType_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_InterfaceDef_ptr create_interface (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ValueDef_ptr create_value (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA_ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA_ValueDefSeq & abstract_base_values,
-        CORBA_InterfaceDef_ptr supported_interface,
-        const CORBA_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ValueBoxDef_ptr create_value_box (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ExceptionDef_ptr create_exception (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_Container (void);
-    CORBA_Container (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_Container (void);
-  private:
-    CORBA_Container (const CORBA_Container &);
-    void operator= (const CORBA_Container &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_IDLTYPE___VAR_CH_)
-#define _CORBA_IDLTYPE___VAR_CH_
-
-  class TAO_Export CORBA_IDLType_var
-  {
-  public:
-    CORBA_IDLType_var (void); // default constructor
-    CORBA_IDLType_var (CORBA_IDLType_ptr);
-    CORBA_IDLType_var (const CORBA_IDLType_var &); // copy constructor
-    ~CORBA_IDLType_var (void); // destructor
-    
-    CORBA_IDLType_var &operator= (CORBA_IDLType_ptr);
-    CORBA_IDLType_var &operator= (const CORBA_IDLType_var &);
-    CORBA_IDLType_ptr operator-> (void) const;
-    
-    operator const CORBA_IDLType_ptr &() const;
-    operator CORBA_IDLType_ptr &();
-    // in, inout, out, _retn 
-    CORBA_IDLType_ptr in (void) const;
-    CORBA_IDLType_ptr &inout (void);
-    CORBA_IDLType_ptr &out (void);
-    CORBA_IDLType_ptr _retn (void);
-    CORBA_IDLType_ptr ptr (void) const;
-
-  private:
-    CORBA_IDLType_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_IDLTYPE___OUT_CH_)
-#define _CORBA_IDLTYPE___OUT_CH_
-
-  class TAO_Export CORBA_IDLType_out
-  {
-  public:
-    CORBA_IDLType_out (CORBA_IDLType_ptr &);
-    CORBA_IDLType_out (CORBA_IDLType_var &);
-    CORBA_IDLType_out (const CORBA_IDLType_out &);
-    CORBA_IDLType_out &operator= (const CORBA_IDLType_out &);
-    CORBA_IDLType_out &operator= (const CORBA_IDLType_var &);
-    CORBA_IDLType_out &operator= (CORBA_IDLType_ptr);
-    operator CORBA_IDLType_ptr &();
-    CORBA_IDLType_ptr &ptr (void);
-    CORBA_IDLType_ptr operator-> (void);
-    
-  private:
-    CORBA_IDLType_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_IDLTYPE_CH_)
-#define _CORBA_IDLTYPE_CH_
-
-class TAO_Export CORBA_IDLType: public virtual CORBA_IRObject
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_IDLType_ptr _ptr_type;
-    typedef CORBA_IDLType_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_IDLType_ptr _duplicate (CORBA_IDLType_ptr obj);
-    static CORBA_IDLType_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_IDLType_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_IDLType_ptr _nil (void)
-      {
-        return (CORBA::IDLType_ptr)0;
-      }
-
-    virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_IDLType (void);
-    CORBA_IDLType (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_IDLType (void);
-  private:
-    CORBA_IDLType (const CORBA_IDLType &);
-    void operator= (const CORBA_IDLType &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEDEF___VAR_CH_)
-#define _CORBA_PRIMITIVEDEF___VAR_CH_
-
-  class TAO_Export CORBA_PrimitiveDef_var
-  {
-  public:
-    CORBA_PrimitiveDef_var (void); // default constructor
-    CORBA_PrimitiveDef_var (CORBA_PrimitiveDef_ptr);
-    CORBA_PrimitiveDef_var (const CORBA_PrimitiveDef_var &); // copy constructor
-    ~CORBA_PrimitiveDef_var (void); // destructor
-    
-    CORBA_PrimitiveDef_var &operator= (CORBA_PrimitiveDef_ptr);
-    CORBA_PrimitiveDef_var &operator= (const CORBA_PrimitiveDef_var &);
-    CORBA_PrimitiveDef_ptr operator-> (void) const;
-    
-    operator const CORBA_PrimitiveDef_ptr &() const;
-    operator CORBA_PrimitiveDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_PrimitiveDef_ptr in (void) const;
-    CORBA_PrimitiveDef_ptr &inout (void);
-    CORBA_PrimitiveDef_ptr &out (void);
-    CORBA_PrimitiveDef_ptr _retn (void);
-    CORBA_PrimitiveDef_ptr ptr (void) const;
-
-  private:
-    CORBA_PrimitiveDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PRIMITIVEDEF___OUT_CH_)
-#define _CORBA_PRIMITIVEDEF___OUT_CH_
-
-  class TAO_Export CORBA_PrimitiveDef_out
-  {
-  public:
-    CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_ptr &);
-    CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_var &);
-    CORBA_PrimitiveDef_out (const CORBA_PrimitiveDef_out &);
-    CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_out &);
-    CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_var &);
-    CORBA_PrimitiveDef_out &operator= (CORBA_PrimitiveDef_ptr);
-    operator CORBA_PrimitiveDef_ptr &();
-    CORBA_PrimitiveDef_ptr &ptr (void);
-    CORBA_PrimitiveDef_ptr operator-> (void);
-    
-  private:
-    CORBA_PrimitiveDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRINGDEF___VAR_CH_)
-#define _CORBA_STRINGDEF___VAR_CH_
-
-  class TAO_Export CORBA_StringDef_var
-  {
-  public:
-    CORBA_StringDef_var (void); // default constructor
-    CORBA_StringDef_var (CORBA_StringDef_ptr);
-    CORBA_StringDef_var (const CORBA_StringDef_var &); // copy constructor
-    ~CORBA_StringDef_var (void); // destructor
-    
-    CORBA_StringDef_var &operator= (CORBA_StringDef_ptr);
-    CORBA_StringDef_var &operator= (const CORBA_StringDef_var &);
-    CORBA_StringDef_ptr operator-> (void) const;
-    
-    operator const CORBA_StringDef_ptr &() const;
-    operator CORBA_StringDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_StringDef_ptr in (void) const;
-    CORBA_StringDef_ptr &inout (void);
-    CORBA_StringDef_ptr &out (void);
-    CORBA_StringDef_ptr _retn (void);
-    CORBA_StringDef_ptr ptr (void) const;
-
-  private:
-    CORBA_StringDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRINGDEF___OUT_CH_)
-#define _CORBA_STRINGDEF___OUT_CH_
-
-  class TAO_Export CORBA_StringDef_out
-  {
-  public:
-    CORBA_StringDef_out (CORBA_StringDef_ptr &);
-    CORBA_StringDef_out (CORBA_StringDef_var &);
-    CORBA_StringDef_out (const CORBA_StringDef_out &);
-    CORBA_StringDef_out &operator= (const CORBA_StringDef_out &);
-    CORBA_StringDef_out &operator= (const CORBA_StringDef_var &);
-    CORBA_StringDef_out &operator= (CORBA_StringDef_ptr);
-    operator CORBA_StringDef_ptr &();
-    CORBA_StringDef_ptr &ptr (void);
-    CORBA_StringDef_ptr operator-> (void);
-    
-  private:
-    CORBA_StringDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCEDEF___VAR_CH_)
-#define _CORBA_SEQUENCEDEF___VAR_CH_
-
-  class TAO_Export CORBA_SequenceDef_var
-  {
-  public:
-    CORBA_SequenceDef_var (void); // default constructor
-    CORBA_SequenceDef_var (CORBA_SequenceDef_ptr);
-    CORBA_SequenceDef_var (const CORBA_SequenceDef_var &); // copy constructor
-    ~CORBA_SequenceDef_var (void); // destructor
-    
-    CORBA_SequenceDef_var &operator= (CORBA_SequenceDef_ptr);
-    CORBA_SequenceDef_var &operator= (const CORBA_SequenceDef_var &);
-    CORBA_SequenceDef_ptr operator-> (void) const;
-    
-    operator const CORBA_SequenceDef_ptr &() const;
-    operator CORBA_SequenceDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_SequenceDef_ptr in (void) const;
-    CORBA_SequenceDef_ptr &inout (void);
-    CORBA_SequenceDef_ptr &out (void);
-    CORBA_SequenceDef_ptr _retn (void);
-    CORBA_SequenceDef_ptr ptr (void) const;
-
-  private:
-    CORBA_SequenceDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SEQUENCEDEF___OUT_CH_)
-#define _CORBA_SEQUENCEDEF___OUT_CH_
-
-  class TAO_Export CORBA_SequenceDef_out
-  {
-  public:
-    CORBA_SequenceDef_out (CORBA_SequenceDef_ptr &);
-    CORBA_SequenceDef_out (CORBA_SequenceDef_var &);
-    CORBA_SequenceDef_out (const CORBA_SequenceDef_out &);
-    CORBA_SequenceDef_out &operator= (const CORBA_SequenceDef_out &);
-    CORBA_SequenceDef_out &operator= (const CORBA_SequenceDef_var &);
-    CORBA_SequenceDef_out &operator= (CORBA_SequenceDef_ptr);
-    operator CORBA_SequenceDef_ptr &();
-    CORBA_SequenceDef_ptr &ptr (void);
-    CORBA_SequenceDef_ptr operator-> (void);
-    
-  private:
-    CORBA_SequenceDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ARRAYDEF___VAR_CH_)
-#define _CORBA_ARRAYDEF___VAR_CH_
-
-  class TAO_Export CORBA_ArrayDef_var
-  {
-  public:
-    CORBA_ArrayDef_var (void); // default constructor
-    CORBA_ArrayDef_var (CORBA_ArrayDef_ptr);
-    CORBA_ArrayDef_var (const CORBA_ArrayDef_var &); // copy constructor
-    ~CORBA_ArrayDef_var (void); // destructor
-    
-    CORBA_ArrayDef_var &operator= (CORBA_ArrayDef_ptr);
-    CORBA_ArrayDef_var &operator= (const CORBA_ArrayDef_var &);
-    CORBA_ArrayDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ArrayDef_ptr &() const;
-    operator CORBA_ArrayDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ArrayDef_ptr in (void) const;
-    CORBA_ArrayDef_ptr &inout (void);
-    CORBA_ArrayDef_ptr &out (void);
-    CORBA_ArrayDef_ptr _retn (void);
-    CORBA_ArrayDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ArrayDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ARRAYDEF___OUT_CH_)
-#define _CORBA_ARRAYDEF___OUT_CH_
-
-  class TAO_Export CORBA_ArrayDef_out
-  {
-  public:
-    CORBA_ArrayDef_out (CORBA_ArrayDef_ptr &);
-    CORBA_ArrayDef_out (CORBA_ArrayDef_var &);
-    CORBA_ArrayDef_out (const CORBA_ArrayDef_out &);
-    CORBA_ArrayDef_out &operator= (const CORBA_ArrayDef_out &);
-    CORBA_ArrayDef_out &operator= (const CORBA_ArrayDef_var &);
-    CORBA_ArrayDef_out &operator= (CORBA_ArrayDef_ptr);
-    operator CORBA_ArrayDef_ptr &();
-    CORBA_ArrayDef_ptr &ptr (void);
-    CORBA_ArrayDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ArrayDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_WSTRINGDEF___VAR_CH_)
-#define _CORBA_WSTRINGDEF___VAR_CH_
-
-  class TAO_Export CORBA_WstringDef_var
-  {
-  public:
-    CORBA_WstringDef_var (void); // default constructor
-    CORBA_WstringDef_var (CORBA_WstringDef_ptr);
-    CORBA_WstringDef_var (const CORBA_WstringDef_var &); // copy constructor
-    ~CORBA_WstringDef_var (void); // destructor
-    
-    CORBA_WstringDef_var &operator= (CORBA_WstringDef_ptr);
-    CORBA_WstringDef_var &operator= (const CORBA_WstringDef_var &);
-    CORBA_WstringDef_ptr operator-> (void) const;
-    
-    operator const CORBA_WstringDef_ptr &() const;
-    operator CORBA_WstringDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_WstringDef_ptr in (void) const;
-    CORBA_WstringDef_ptr &inout (void);
-    CORBA_WstringDef_ptr &out (void);
-    CORBA_WstringDef_ptr _retn (void);
-    CORBA_WstringDef_ptr ptr (void) const;
-
-  private:
-    CORBA_WstringDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_WSTRINGDEF___OUT_CH_)
-#define _CORBA_WSTRINGDEF___OUT_CH_
-
-  class TAO_Export CORBA_WstringDef_out
-  {
-  public:
-    CORBA_WstringDef_out (CORBA_WstringDef_ptr &);
-    CORBA_WstringDef_out (CORBA_WstringDef_var &);
-    CORBA_WstringDef_out (const CORBA_WstringDef_out &);
-    CORBA_WstringDef_out &operator= (const CORBA_WstringDef_out &);
-    CORBA_WstringDef_out &operator= (const CORBA_WstringDef_var &);
-    CORBA_WstringDef_out &operator= (CORBA_WstringDef_ptr);
-    operator CORBA_WstringDef_ptr &();
-    CORBA_WstringDef_ptr &ptr (void);
-    CORBA_WstringDef_ptr operator-> (void);
-    
-  private:
-    CORBA_WstringDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_FIXEDDEF___VAR_CH_)
-#define _CORBA_FIXEDDEF___VAR_CH_
-
-  class TAO_Export CORBA_FixedDef_var
-  {
-  public:
-    CORBA_FixedDef_var (void); // default constructor
-    CORBA_FixedDef_var (CORBA_FixedDef_ptr);
-    CORBA_FixedDef_var (const CORBA_FixedDef_var &); // copy constructor
-    ~CORBA_FixedDef_var (void); // destructor
-    
-    CORBA_FixedDef_var &operator= (CORBA_FixedDef_ptr);
-    CORBA_FixedDef_var &operator= (const CORBA_FixedDef_var &);
-    CORBA_FixedDef_ptr operator-> (void) const;
-    
-    operator const CORBA_FixedDef_ptr &() const;
-    operator CORBA_FixedDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_FixedDef_ptr in (void) const;
-    CORBA_FixedDef_ptr &inout (void);
-    CORBA_FixedDef_ptr &out (void);
-    CORBA_FixedDef_ptr _retn (void);
-    CORBA_FixedDef_ptr ptr (void) const;
-
-  private:
-    CORBA_FixedDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_FIXEDDEF___OUT_CH_)
-#define _CORBA_FIXEDDEF___OUT_CH_
-
-  class TAO_Export CORBA_FixedDef_out
-  {
-  public:
-    CORBA_FixedDef_out (CORBA_FixedDef_ptr &);
-    CORBA_FixedDef_out (CORBA_FixedDef_var &);
-    CORBA_FixedDef_out (const CORBA_FixedDef_out &);
-    CORBA_FixedDef_out &operator= (const CORBA_FixedDef_out &);
-    CORBA_FixedDef_out &operator= (const CORBA_FixedDef_var &);
-    CORBA_FixedDef_out &operator= (CORBA_FixedDef_ptr);
-    operator CORBA_FixedDef_ptr &();
-    CORBA_FixedDef_ptr &ptr (void);
-    CORBA_FixedDef_ptr operator-> (void);
-    
-  private:
-    CORBA_FixedDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_REPOSITORY___VAR_CH_)
-#define _CORBA_REPOSITORY___VAR_CH_
-
-  class TAO_Export CORBA_Repository_var
-  {
-  public:
-    CORBA_Repository_var (void); // default constructor
-    CORBA_Repository_var (CORBA_Repository_ptr);
-    CORBA_Repository_var (const CORBA_Repository_var &); // copy constructor
-    ~CORBA_Repository_var (void); // destructor
-    
-    CORBA_Repository_var &operator= (CORBA_Repository_ptr);
-    CORBA_Repository_var &operator= (const CORBA_Repository_var &);
-    CORBA_Repository_ptr operator-> (void) const;
-    
-    operator const CORBA_Repository_ptr &() const;
-    operator CORBA_Repository_ptr &();
-    // in, inout, out, _retn 
-    CORBA_Repository_ptr in (void) const;
-    CORBA_Repository_ptr &inout (void);
-    CORBA_Repository_ptr &out (void);
-    CORBA_Repository_ptr _retn (void);
-    CORBA_Repository_ptr ptr (void) const;
-
-  private:
-    CORBA_Repository_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_REPOSITORY___OUT_CH_)
-#define _CORBA_REPOSITORY___OUT_CH_
-
-  class TAO_Export CORBA_Repository_out
-  {
-  public:
-    CORBA_Repository_out (CORBA_Repository_ptr &);
-    CORBA_Repository_out (CORBA_Repository_var &);
-    CORBA_Repository_out (const CORBA_Repository_out &);
-    CORBA_Repository_out &operator= (const CORBA_Repository_out &);
-    CORBA_Repository_out &operator= (const CORBA_Repository_var &);
-    CORBA_Repository_out &operator= (CORBA_Repository_ptr);
-    operator CORBA_Repository_ptr &();
-    CORBA_Repository_ptr &ptr (void);
-    CORBA_Repository_ptr operator-> (void);
-    
-  private:
-    CORBA_Repository_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_REPOSITORY_CH_)
-#define _CORBA_REPOSITORY_CH_
-
-class TAO_Export CORBA_Repository: public virtual CORBA_Container
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_Repository_ptr _ptr_type;
-    typedef CORBA_Repository_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_Repository_ptr _duplicate (CORBA_Repository_ptr obj);
-    static CORBA_Repository_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_Repository_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_Repository_ptr _nil (void)
-      {
-        return (CORBA::Repository_ptr)0;
-      }
-
-    virtual CORBA_Contained_ptr lookup_id (
-        const char * search_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_PrimitiveDef_ptr get_primitive (
-        CORBA::PrimitiveKind kind,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_StringDef_ptr create_string (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_WstringDef_ptr create_wstring (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_SequenceDef_ptr create_sequence (
-        CORBA::ULong bound,
-        CORBA_IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ArrayDef_ptr create_array (
-        CORBA::ULong length,
-        CORBA_IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_FixedDef_ptr create_fixed (
-        CORBA::UShort digits,
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_Repository (void);
-    CORBA_Repository (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_Repository (void);
-  private:
-    CORBA_Repository (const CORBA_Repository &);
-    void operator= (const CORBA_Repository &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_MODULEDEF___VAR_CH_)
-#define _CORBA_MODULEDEF___VAR_CH_
-
-  class TAO_Export CORBA_ModuleDef_var
-  {
-  public:
-    CORBA_ModuleDef_var (void); // default constructor
-    CORBA_ModuleDef_var (CORBA_ModuleDef_ptr);
-    CORBA_ModuleDef_var (const CORBA_ModuleDef_var &); // copy constructor
-    ~CORBA_ModuleDef_var (void); // destructor
-    
-    CORBA_ModuleDef_var &operator= (CORBA_ModuleDef_ptr);
-    CORBA_ModuleDef_var &operator= (const CORBA_ModuleDef_var &);
-    CORBA_ModuleDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ModuleDef_ptr &() const;
-    operator CORBA_ModuleDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ModuleDef_ptr in (void) const;
-    CORBA_ModuleDef_ptr &inout (void);
-    CORBA_ModuleDef_ptr &out (void);
-    CORBA_ModuleDef_ptr _retn (void);
-    CORBA_ModuleDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ModuleDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_MODULEDEF___OUT_CH_)
-#define _CORBA_MODULEDEF___OUT_CH_
-
-  class TAO_Export CORBA_ModuleDef_out
-  {
-  public:
-    CORBA_ModuleDef_out (CORBA_ModuleDef_ptr &);
-    CORBA_ModuleDef_out (CORBA_ModuleDef_var &);
-    CORBA_ModuleDef_out (const CORBA_ModuleDef_out &);
-    CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_out &);
-    CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_var &);
-    CORBA_ModuleDef_out &operator= (CORBA_ModuleDef_ptr);
-    operator CORBA_ModuleDef_ptr &();
-    CORBA_ModuleDef_ptr &ptr (void);
-    CORBA_ModuleDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ModuleDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_MODULEDEF_CH_)
-#define _CORBA_MODULEDEF_CH_
-
-class TAO_Export CORBA_ModuleDef: public virtual CORBA_Container, public virtual CORBA_Contained
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_ModuleDef_ptr _ptr_type;
-    typedef CORBA_ModuleDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_ModuleDef_ptr _duplicate (CORBA_ModuleDef_ptr obj);
-    static CORBA_ModuleDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ModuleDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ModuleDef_ptr _nil (void)
-      {
-        return (CORBA::ModuleDef_ptr)0;
-      }
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_ModuleDef (void);
-    CORBA_ModuleDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_ModuleDef (void);
-  private:
-    CORBA_ModuleDef (const CORBA_ModuleDef &);
-    void operator= (const CORBA_ModuleDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-  struct  CORBA_ModuleDescription
-  {
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-  };
-
-  class TAO_Export CORBA_ModuleDescription_var
-  {
-  public:
-    CORBA_ModuleDescription_var (void); // default constructor
-    CORBA_ModuleDescription_var (CORBA_ModuleDescription *);
-    CORBA_ModuleDescription_var (const CORBA_ModuleDescription_var &); // copy constructor
-    ~CORBA_ModuleDescription_var (void); // destructor
-    
-    CORBA_ModuleDescription_var &operator= (CORBA_ModuleDescription *);
-    CORBA_ModuleDescription_var &operator= (const CORBA_ModuleDescription_var &);
-    CORBA_ModuleDescription *operator-> (void);
-    const CORBA_ModuleDescription *operator-> (void) const;
-    
-    operator const CORBA_ModuleDescription &() const;
-    operator CORBA_ModuleDescription &();
-    operator CORBA_ModuleDescription &() const;
-    // in, inout, out, _retn 
-    const CORBA_ModuleDescription &in (void) const;
-    CORBA_ModuleDescription &inout (void);
-    CORBA_ModuleDescription *&out (void);
-    CORBA_ModuleDescription *_retn (void);
-    CORBA_ModuleDescription *ptr (void) const;
-
-  private:
-    CORBA_ModuleDescription *ptr_;
-  };
-
-  class TAO_Export CORBA_ModuleDescription_out
-  {
-  public:
-    CORBA_ModuleDescription_out (CORBA_ModuleDescription *&);
-    CORBA_ModuleDescription_out (CORBA_ModuleDescription_var &);
-    CORBA_ModuleDescription_out (const CORBA_ModuleDescription_out &);
-    CORBA_ModuleDescription_out &operator= (const CORBA_ModuleDescription_out &);
-    CORBA_ModuleDescription_out &operator= (CORBA_ModuleDescription *);
-    operator CORBA_ModuleDescription *&();
-    CORBA_ModuleDescription *&ptr (void);
-    CORBA_ModuleDescription *operator-> (void);
-    
-  private:
-    CORBA_ModuleDescription *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ModuleDescription_var &);
-  };
-
-
-
-#if !defined (_CORBA_CONSTANTDEF___VAR_CH_)
-#define _CORBA_CONSTANTDEF___VAR_CH_
-
-  class TAO_Export CORBA_ConstantDef_var
-  {
-  public:
-    CORBA_ConstantDef_var (void); // default constructor
-    CORBA_ConstantDef_var (CORBA_ConstantDef_ptr);
-    CORBA_ConstantDef_var (const CORBA_ConstantDef_var &); // copy constructor
-    ~CORBA_ConstantDef_var (void); // destructor
-    
-    CORBA_ConstantDef_var &operator= (CORBA_ConstantDef_ptr);
-    CORBA_ConstantDef_var &operator= (const CORBA_ConstantDef_var &);
-    CORBA_ConstantDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ConstantDef_ptr &() const;
-    operator CORBA_ConstantDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ConstantDef_ptr in (void) const;
-    CORBA_ConstantDef_ptr &inout (void);
-    CORBA_ConstantDef_ptr &out (void);
-    CORBA_ConstantDef_ptr _retn (void);
-    CORBA_ConstantDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ConstantDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTANTDEF___OUT_CH_)
-#define _CORBA_CONSTANTDEF___OUT_CH_
-
-  class TAO_Export CORBA_ConstantDef_out
-  {
-  public:
-    CORBA_ConstantDef_out (CORBA_ConstantDef_ptr &);
-    CORBA_ConstantDef_out (CORBA_ConstantDef_var &);
-    CORBA_ConstantDef_out (const CORBA_ConstantDef_out &);
-    CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_out &);
-    CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_var &);
-    CORBA_ConstantDef_out &operator= (CORBA_ConstantDef_ptr);
-    operator CORBA_ConstantDef_ptr &();
-    CORBA_ConstantDef_ptr &ptr (void);
-    CORBA_ConstantDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ConstantDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTANTDEF_CH_)
-#define _CORBA_CONSTANTDEF_CH_
-
-class TAO_Export CORBA_ConstantDef: public virtual CORBA_Contained
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_ConstantDef_ptr _ptr_type;
-    typedef CORBA_ConstantDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_ConstantDef_ptr _duplicate (CORBA_ConstantDef_ptr obj);
-    static CORBA_ConstantDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ConstantDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ConstantDef_ptr _nil (void)
-      {
-        return (CORBA::ConstantDef_ptr)0;
-      }
-
-    virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_IDLType_ptr type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void type_def (
-        CORBA_IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Any * value (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void value (
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_ConstantDef (void);
-    CORBA_ConstantDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_ConstantDef (void);
-  private:
-    CORBA_ConstantDef (const CORBA_ConstantDef &);
-    void operator= (const CORBA_ConstantDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-  struct  CORBA_ConstantDescription
-  {
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-    CORBA::Any value;
-  };
-
-  class TAO_Export CORBA_ConstantDescription_var
-  {
-  public:
-    CORBA_ConstantDescription_var (void); // default constructor
-    CORBA_ConstantDescription_var (CORBA_ConstantDescription *);
-    CORBA_ConstantDescription_var (const CORBA_ConstantDescription_var &); // copy constructor
-    ~CORBA_ConstantDescription_var (void); // destructor
-    
-    CORBA_ConstantDescription_var &operator= (CORBA_ConstantDescription *);
-    CORBA_ConstantDescription_var &operator= (const CORBA_ConstantDescription_var &);
-    CORBA_ConstantDescription *operator-> (void);
-    const CORBA_ConstantDescription *operator-> (void) const;
-    
-    operator const CORBA_ConstantDescription &() const;
-    operator CORBA_ConstantDescription &();
-    operator CORBA_ConstantDescription &() const;
-    // in, inout, out, _retn 
-    const CORBA_ConstantDescription &in (void) const;
-    CORBA_ConstantDescription &inout (void);
-    CORBA_ConstantDescription *&out (void);
-    CORBA_ConstantDescription *_retn (void);
-    CORBA_ConstantDescription *ptr (void) const;
-
-  private:
-    CORBA_ConstantDescription *ptr_;
-  };
-
-  class TAO_Export CORBA_ConstantDescription_out
-  {
-  public:
-    CORBA_ConstantDescription_out (CORBA_ConstantDescription *&);
-    CORBA_ConstantDescription_out (CORBA_ConstantDescription_var &);
-    CORBA_ConstantDescription_out (const CORBA_ConstantDescription_out &);
-    CORBA_ConstantDescription_out &operator= (const CORBA_ConstantDescription_out &);
-    CORBA_ConstantDescription_out &operator= (CORBA_ConstantDescription *);
-    operator CORBA_ConstantDescription *&();
-    CORBA_ConstantDescription *&ptr (void);
-    CORBA_ConstantDescription *operator-> (void);
-    
-  private:
-    CORBA_ConstantDescription *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ConstantDescription_var &);
-  };
-
-#if !defined (_CORBA_TYPEDEFDEF___VAR_CH_)
-#define _CORBA_TYPEDEFDEF___VAR_CH_
-
-  class TAO_Export CORBA_TypedefDef_var
-  {
-  public:
-    CORBA_TypedefDef_var (void); // default constructor
-    CORBA_TypedefDef_var (CORBA_TypedefDef_ptr);
-    CORBA_TypedefDef_var (const CORBA_TypedefDef_var &); // copy constructor
-    ~CORBA_TypedefDef_var (void); // destructor
-    
-    CORBA_TypedefDef_var &operator= (CORBA_TypedefDef_ptr);
-    CORBA_TypedefDef_var &operator= (const CORBA_TypedefDef_var &);
-    CORBA_TypedefDef_ptr operator-> (void) const;
-    
-    operator const CORBA_TypedefDef_ptr &() const;
-    operator CORBA_TypedefDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_TypedefDef_ptr in (void) const;
-    CORBA_TypedefDef_ptr &inout (void);
-    CORBA_TypedefDef_ptr &out (void);
-    CORBA_TypedefDef_ptr _retn (void);
-    CORBA_TypedefDef_ptr ptr (void) const;
-
-  private:
-    CORBA_TypedefDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_TYPEDEFDEF___OUT_CH_)
-#define _CORBA_TYPEDEFDEF___OUT_CH_
-
-  class TAO_Export CORBA_TypedefDef_out
-  {
-  public:
-    CORBA_TypedefDef_out (CORBA_TypedefDef_ptr &);
-    CORBA_TypedefDef_out (CORBA_TypedefDef_var &);
-    CORBA_TypedefDef_out (const CORBA_TypedefDef_out &);
-    CORBA_TypedefDef_out &operator= (const CORBA_TypedefDef_out &);
-    CORBA_TypedefDef_out &operator= (const CORBA_TypedefDef_var &);
-    CORBA_TypedefDef_out &operator= (CORBA_TypedefDef_ptr);
-    operator CORBA_TypedefDef_ptr &();
-    CORBA_TypedefDef_ptr &ptr (void);
-    CORBA_TypedefDef_ptr operator-> (void);
-    
-  private:
-    CORBA_TypedefDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_TYPEDEFDEF_CH_)
-#define _CORBA_TYPEDEFDEF_CH_
-
-class TAO_Export CORBA_TypedefDef: public virtual CORBA_Contained, public virtual CORBA_IDLType
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_TypedefDef_ptr _ptr_type;
-    typedef CORBA_TypedefDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_TypedefDef_ptr _duplicate (CORBA_TypedefDef_ptr obj);
-    static CORBA_TypedefDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_TypedefDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_TypedefDef_ptr _nil (void)
-      {
-        return (CORBA::TypedefDef_ptr)0;
-      }
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_TypedefDef (void);
-    CORBA_TypedefDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_TypedefDef (void);
-  private:
-    CORBA_TypedefDef (const CORBA_TypedefDef &);
-    void operator= (const CORBA_TypedefDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-  struct  CORBA_TypeDescription
-  {
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-  };
-
-  class TAO_Export CORBA_TypeDescription_var
-  {
-  public:
-    CORBA_TypeDescription_var (void); // default constructor
-    CORBA_TypeDescription_var (CORBA_TypeDescription *);
-    CORBA_TypeDescription_var (const CORBA_TypeDescription_var &); // copy constructor
-    ~CORBA_TypeDescription_var (void); // destructor
-    
-    CORBA_TypeDescription_var &operator= (CORBA_TypeDescription *);
-    CORBA_TypeDescription_var &operator= (const CORBA_TypeDescription_var &);
-    CORBA_TypeDescription *operator-> (void);
-    const CORBA_TypeDescription *operator-> (void) const;
-    
-    operator const CORBA_TypeDescription &() const;
-    operator CORBA_TypeDescription &();
-    operator CORBA_TypeDescription &() const;
-    // in, inout, out, _retn 
-    const CORBA_TypeDescription &in (void) const;
-    CORBA_TypeDescription &inout (void);
-    CORBA_TypeDescription *&out (void);
-    CORBA_TypeDescription *_retn (void);
-    CORBA_TypeDescription *ptr (void) const;
-
-  private:
-    CORBA_TypeDescription *ptr_;
-  };
-
-  class TAO_Export CORBA_TypeDescription_out
-  {
-  public:
-    CORBA_TypeDescription_out (CORBA_TypeDescription *&);
-    CORBA_TypeDescription_out (CORBA_TypeDescription_var &);
-    CORBA_TypeDescription_out (const CORBA_TypeDescription_out &);
-    CORBA_TypeDescription_out &operator= (const CORBA_TypeDescription_out &);
-    CORBA_TypeDescription_out &operator= (CORBA_TypeDescription *);
-    operator CORBA_TypeDescription *&();
-    CORBA_TypeDescription *&ptr (void);
-    CORBA_TypeDescription *operator-> (void);
-    
-  private:
-    CORBA_TypeDescription *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_TypeDescription_var &);
-  };
-
-#if !defined (_CORBA_STRUCTDEF___VAR_CH_)
-#define _CORBA_STRUCTDEF___VAR_CH_
-
-  class TAO_Export CORBA_StructDef_var
-  {
-  public:
-    CORBA_StructDef_var (void); // default constructor
-    CORBA_StructDef_var (CORBA_StructDef_ptr);
-    CORBA_StructDef_var (const CORBA_StructDef_var &); // copy constructor
-    ~CORBA_StructDef_var (void); // destructor
-    
-    CORBA_StructDef_var &operator= (CORBA_StructDef_ptr);
-    CORBA_StructDef_var &operator= (const CORBA_StructDef_var &);
-    CORBA_StructDef_ptr operator-> (void) const;
-    
-    operator const CORBA_StructDef_ptr &() const;
-    operator CORBA_StructDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_StructDef_ptr in (void) const;
-    CORBA_StructDef_ptr &inout (void);
-    CORBA_StructDef_ptr &out (void);
-    CORBA_StructDef_ptr _retn (void);
-    CORBA_StructDef_ptr ptr (void) const;
-
-  private:
-    CORBA_StructDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRUCTDEF___OUT_CH_)
-#define _CORBA_STRUCTDEF___OUT_CH_
-
-  class TAO_Export CORBA_StructDef_out
-  {
-  public:
-    CORBA_StructDef_out (CORBA_StructDef_ptr &);
-    CORBA_StructDef_out (CORBA_StructDef_var &);
-    CORBA_StructDef_out (const CORBA_StructDef_out &);
-    CORBA_StructDef_out &operator= (const CORBA_StructDef_out &);
-    CORBA_StructDef_out &operator= (const CORBA_StructDef_var &);
-    CORBA_StructDef_out &operator= (CORBA_StructDef_ptr);
-    operator CORBA_StructDef_ptr &();
-    CORBA_StructDef_ptr &ptr (void);
-    CORBA_StructDef_ptr operator-> (void);
-    
-  private:
-    CORBA_StructDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRUCTDEF_CH_)
-#define _CORBA_STRUCTDEF_CH_
-
-class TAO_Export CORBA_StructDef: public virtual CORBA_TypedefDef, public virtual CORBA_Container
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_StructDef_ptr _ptr_type;
-    typedef CORBA_StructDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_StructDef_ptr _duplicate (CORBA_StructDef_ptr obj);
-    static CORBA_StructDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_StructDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_StructDef_ptr _nil (void)
-      {
-        return (CORBA::StructDef_ptr)0;
-      }
-
-    virtual CORBA_StructMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void members (
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_StructDef (void);
-    CORBA_StructDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_StructDef (void);
-  private:
-    CORBA_StructDef (const CORBA_StructDef &);
-    void operator= (const CORBA_StructDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_UNIONDEF___VAR_CH_)
-#define _CORBA_UNIONDEF___VAR_CH_
-
-  class TAO_Export CORBA_UnionDef_var
-  {
-  public:
-    CORBA_UnionDef_var (void); // default constructor
-    CORBA_UnionDef_var (CORBA_UnionDef_ptr);
-    CORBA_UnionDef_var (const CORBA_UnionDef_var &); // copy constructor
-    ~CORBA_UnionDef_var (void); // destructor
-    
-    CORBA_UnionDef_var &operator= (CORBA_UnionDef_ptr);
-    CORBA_UnionDef_var &operator= (const CORBA_UnionDef_var &);
-    CORBA_UnionDef_ptr operator-> (void) const;
-    
-    operator const CORBA_UnionDef_ptr &() const;
-    operator CORBA_UnionDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_UnionDef_ptr in (void) const;
-    CORBA_UnionDef_ptr &inout (void);
-    CORBA_UnionDef_ptr &out (void);
-    CORBA_UnionDef_ptr _retn (void);
-    CORBA_UnionDef_ptr ptr (void) const;
-
-  private:
-    CORBA_UnionDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_UNIONDEF___OUT_CH_)
-#define _CORBA_UNIONDEF___OUT_CH_
-
-  class TAO_Export CORBA_UnionDef_out
-  {
-  public:
-    CORBA_UnionDef_out (CORBA_UnionDef_ptr &);
-    CORBA_UnionDef_out (CORBA_UnionDef_var &);
-    CORBA_UnionDef_out (const CORBA_UnionDef_out &);
-    CORBA_UnionDef_out &operator= (const CORBA_UnionDef_out &);
-    CORBA_UnionDef_out &operator= (const CORBA_UnionDef_var &);
-    CORBA_UnionDef_out &operator= (CORBA_UnionDef_ptr);
-    operator CORBA_UnionDef_ptr &();
-    CORBA_UnionDef_ptr &ptr (void);
-    CORBA_UnionDef_ptr operator-> (void);
-    
-  private:
-    CORBA_UnionDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_UNIONDEF_CH_)
-#define _CORBA_UNIONDEF_CH_
-
-class TAO_Export CORBA_UnionDef: public virtual CORBA_TypedefDef, public virtual CORBA_Container
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_UnionDef_ptr _ptr_type;
-    typedef CORBA_UnionDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_UnionDef_ptr _duplicate (CORBA_UnionDef_ptr obj);
-    static CORBA_UnionDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_UnionDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_UnionDef_ptr _nil (void)
-      {
-        return (CORBA::UnionDef_ptr)0;
-      }
-
-    virtual CORBA::TypeCode_ptr discriminator_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_IDLType_ptr discriminator_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void discriminator_type_def (
-        CORBA_IDLType_ptr discriminator_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_UnionMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void members (
-        const CORBA_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_UnionDef (void);
-    CORBA_UnionDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_UnionDef (void);
-  private:
-    CORBA_UnionDef (const CORBA_UnionDef &);
-    void operator= (const CORBA_UnionDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMDEF___VAR_CH_)
-#define _CORBA_ENUMDEF___VAR_CH_
-
-  class TAO_Export CORBA_EnumDef_var
-  {
-  public:
-    CORBA_EnumDef_var (void); // default constructor
-    CORBA_EnumDef_var (CORBA_EnumDef_ptr);
-    CORBA_EnumDef_var (const CORBA_EnumDef_var &); // copy constructor
-    ~CORBA_EnumDef_var (void); // destructor
-    
-    CORBA_EnumDef_var &operator= (CORBA_EnumDef_ptr);
-    CORBA_EnumDef_var &operator= (const CORBA_EnumDef_var &);
-    CORBA_EnumDef_ptr operator-> (void) const;
-    
-    operator const CORBA_EnumDef_ptr &() const;
-    operator CORBA_EnumDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_EnumDef_ptr in (void) const;
-    CORBA_EnumDef_ptr &inout (void);
-    CORBA_EnumDef_ptr &out (void);
-    CORBA_EnumDef_ptr _retn (void);
-    CORBA_EnumDef_ptr ptr (void) const;
-
-  private:
-    CORBA_EnumDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ENUMDEF___OUT_CH_)
-#define _CORBA_ENUMDEF___OUT_CH_
-
-  class TAO_Export CORBA_EnumDef_out
-  {
-  public:
-    CORBA_EnumDef_out (CORBA_EnumDef_ptr &);
-    CORBA_EnumDef_out (CORBA_EnumDef_var &);
-    CORBA_EnumDef_out (const CORBA_EnumDef_out &);
-    CORBA_EnumDef_out &operator= (const CORBA_EnumDef_out &);
-    CORBA_EnumDef_out &operator= (const CORBA_EnumDef_var &);
-    CORBA_EnumDef_out &operator= (CORBA_EnumDef_ptr);
-    operator CORBA_EnumDef_ptr &();
-    CORBA_EnumDef_ptr &ptr (void);
-    CORBA_EnumDef_ptr operator-> (void);
-    
-  private:
-    CORBA_EnumDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ENUMDEF_CH_)
-#define _CORBA_ENUMDEF_CH_
-
-class TAO_Export CORBA_EnumDef: public virtual CORBA_TypedefDef
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_EnumDef_ptr _ptr_type;
-    typedef CORBA_EnumDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_EnumDef_ptr _duplicate (CORBA_EnumDef_ptr obj);
-    static CORBA_EnumDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_EnumDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_EnumDef_ptr _nil (void)
-      {
-        return (CORBA::EnumDef_ptr)0;
-      }
-
-    virtual CORBA_EnumMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void members (
-        const CORBA_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_EnumDef (void);
-    CORBA_EnumDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_EnumDef (void);
-  private:
-    CORBA_EnumDef (const CORBA_EnumDef &);
-    void operator= (const CORBA_EnumDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ALIASDEF___VAR_CH_)
-#define _CORBA_ALIASDEF___VAR_CH_
-
-  class TAO_Export CORBA_AliasDef_var
-  {
-  public:
-    CORBA_AliasDef_var (void); // default constructor
-    CORBA_AliasDef_var (CORBA_AliasDef_ptr);
-    CORBA_AliasDef_var (const CORBA_AliasDef_var &); // copy constructor
-    ~CORBA_AliasDef_var (void); // destructor
-    
-    CORBA_AliasDef_var &operator= (CORBA_AliasDef_ptr);
-    CORBA_AliasDef_var &operator= (const CORBA_AliasDef_var &);
-    CORBA_AliasDef_ptr operator-> (void) const;
-    
-    operator const CORBA_AliasDef_ptr &() const;
-    operator CORBA_AliasDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_AliasDef_ptr in (void) const;
-    CORBA_AliasDef_ptr &inout (void);
-    CORBA_AliasDef_ptr &out (void);
-    CORBA_AliasDef_ptr _retn (void);
-    CORBA_AliasDef_ptr ptr (void) const;
-
-  private:
-    CORBA_AliasDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ALIASDEF___OUT_CH_)
-#define _CORBA_ALIASDEF___OUT_CH_
-
-  class TAO_Export CORBA_AliasDef_out
-  {
-  public:
-    CORBA_AliasDef_out (CORBA_AliasDef_ptr &);
-    CORBA_AliasDef_out (CORBA_AliasDef_var &);
-    CORBA_AliasDef_out (const CORBA_AliasDef_out &);
-    CORBA_AliasDef_out &operator= (const CORBA_AliasDef_out &);
-    CORBA_AliasDef_out &operator= (const CORBA_AliasDef_var &);
-    CORBA_AliasDef_out &operator= (CORBA_AliasDef_ptr);
-    operator CORBA_AliasDef_ptr &();
-    CORBA_AliasDef_ptr &ptr (void);
-    CORBA_AliasDef_ptr operator-> (void);
-    
-  private:
-    CORBA_AliasDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ALIASDEF_CH_)
-#define _CORBA_ALIASDEF_CH_
-
-class TAO_Export CORBA_AliasDef: public virtual CORBA_TypedefDef
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_AliasDef_ptr _ptr_type;
-    typedef CORBA_AliasDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_AliasDef_ptr _duplicate (CORBA_AliasDef_ptr obj);
-    static CORBA_AliasDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_AliasDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_AliasDef_ptr _nil (void)
-      {
-        return (CORBA::AliasDef_ptr)0;
-      }
-
-    virtual CORBA_IDLType_ptr original_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void original_type_def (
-        CORBA_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_AliasDef (void);
-    CORBA_AliasDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_AliasDef (void);
-  private:
-    CORBA_AliasDef (const CORBA_AliasDef &);
-    void operator= (const CORBA_AliasDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEDEF___VAR_CH_)
-#define _CORBA_PRIMITIVEDEF___VAR_CH_
-
-  class TAO_Export CORBA_PrimitiveDef_var
-  {
-  public:
-    CORBA_PrimitiveDef_var (void); // default constructor
-    CORBA_PrimitiveDef_var (CORBA_PrimitiveDef_ptr);
-    CORBA_PrimitiveDef_var (const CORBA_PrimitiveDef_var &); // copy constructor
-    ~CORBA_PrimitiveDef_var (void); // destructor
-    
-    CORBA_PrimitiveDef_var &operator= (CORBA_PrimitiveDef_ptr);
-    CORBA_PrimitiveDef_var &operator= (const CORBA_PrimitiveDef_var &);
-    CORBA_PrimitiveDef_ptr operator-> (void) const;
-    
-    operator const CORBA_PrimitiveDef_ptr &() const;
-    operator CORBA_PrimitiveDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_PrimitiveDef_ptr in (void) const;
-    CORBA_PrimitiveDef_ptr &inout (void);
-    CORBA_PrimitiveDef_ptr &out (void);
-    CORBA_PrimitiveDef_ptr _retn (void);
-    CORBA_PrimitiveDef_ptr ptr (void) const;
-
-  private:
-    CORBA_PrimitiveDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PRIMITIVEDEF___OUT_CH_)
-#define _CORBA_PRIMITIVEDEF___OUT_CH_
-
-  class TAO_Export CORBA_PrimitiveDef_out
-  {
-  public:
-    CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_ptr &);
-    CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_var &);
-    CORBA_PrimitiveDef_out (const CORBA_PrimitiveDef_out &);
-    CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_out &);
-    CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_var &);
-    CORBA_PrimitiveDef_out &operator= (CORBA_PrimitiveDef_ptr);
-    operator CORBA_PrimitiveDef_ptr &();
-    CORBA_PrimitiveDef_ptr &ptr (void);
-    CORBA_PrimitiveDef_ptr operator-> (void);
-    
-  private:
-    CORBA_PrimitiveDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PRIMITIVEDEF_CH_)
-#define _CORBA_PRIMITIVEDEF_CH_
-
-class TAO_Export CORBA_PrimitiveDef: public virtual CORBA_IDLType
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_PrimitiveDef_ptr _ptr_type;
-    typedef CORBA_PrimitiveDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_PrimitiveDef_ptr _duplicate (CORBA_PrimitiveDef_ptr obj);
-    static CORBA_PrimitiveDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_PrimitiveDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_PrimitiveDef_ptr _nil (void)
-      {
-        return (CORBA::PrimitiveDef_ptr)0;
-      }
-
-    virtual CORBA::PrimitiveKind kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_PrimitiveDef (void);
-    CORBA_PrimitiveDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_PrimitiveDef (void);
-  private:
-    CORBA_PrimitiveDef (const CORBA_PrimitiveDef &);
-    void operator= (const CORBA_PrimitiveDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRINGDEF___VAR_CH_)
-#define _CORBA_STRINGDEF___VAR_CH_
-
-  class TAO_Export CORBA_StringDef_var
-  {
-  public:
-    CORBA_StringDef_var (void); // default constructor
-    CORBA_StringDef_var (CORBA_StringDef_ptr);
-    CORBA_StringDef_var (const CORBA_StringDef_var &); // copy constructor
-    ~CORBA_StringDef_var (void); // destructor
-    
-    CORBA_StringDef_var &operator= (CORBA_StringDef_ptr);
-    CORBA_StringDef_var &operator= (const CORBA_StringDef_var &);
-    CORBA_StringDef_ptr operator-> (void) const;
-    
-    operator const CORBA_StringDef_ptr &() const;
-    operator CORBA_StringDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_StringDef_ptr in (void) const;
-    CORBA_StringDef_ptr &inout (void);
-    CORBA_StringDef_ptr &out (void);
-    CORBA_StringDef_ptr _retn (void);
-    CORBA_StringDef_ptr ptr (void) const;
-
-  private:
-    CORBA_StringDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRINGDEF___OUT_CH_)
-#define _CORBA_STRINGDEF___OUT_CH_
-
-  class TAO_Export CORBA_StringDef_out
-  {
-  public:
-    CORBA_StringDef_out (CORBA_StringDef_ptr &);
-    CORBA_StringDef_out (CORBA_StringDef_var &);
-    CORBA_StringDef_out (const CORBA_StringDef_out &);
-    CORBA_StringDef_out &operator= (const CORBA_StringDef_out &);
-    CORBA_StringDef_out &operator= (const CORBA_StringDef_var &);
-    CORBA_StringDef_out &operator= (CORBA_StringDef_ptr);
-    operator CORBA_StringDef_ptr &();
-    CORBA_StringDef_ptr &ptr (void);
-    CORBA_StringDef_ptr operator-> (void);
-    
-  private:
-    CORBA_StringDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRINGDEF_CH_)
-#define _CORBA_STRINGDEF_CH_
-
-class TAO_Export CORBA_StringDef: public virtual CORBA_IDLType
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_StringDef_ptr _ptr_type;
-    typedef CORBA_StringDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_StringDef_ptr _duplicate (CORBA_StringDef_ptr obj);
-    static CORBA_StringDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_StringDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_StringDef_ptr _nil (void)
-      {
-        return (CORBA::StringDef_ptr)0;
-      }
-
-    virtual CORBA::ULong bound (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void bound (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_StringDef (void);
-    CORBA_StringDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_StringDef (void);
-  private:
-    CORBA_StringDef (const CORBA_StringDef &);
-    void operator= (const CORBA_StringDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_WSTRINGDEF___VAR_CH_)
-#define _CORBA_WSTRINGDEF___VAR_CH_
-
-  class TAO_Export CORBA_WstringDef_var
-  {
-  public:
-    CORBA_WstringDef_var (void); // default constructor
-    CORBA_WstringDef_var (CORBA_WstringDef_ptr);
-    CORBA_WstringDef_var (const CORBA_WstringDef_var &); // copy constructor
-    ~CORBA_WstringDef_var (void); // destructor
-    
-    CORBA_WstringDef_var &operator= (CORBA_WstringDef_ptr);
-    CORBA_WstringDef_var &operator= (const CORBA_WstringDef_var &);
-    CORBA_WstringDef_ptr operator-> (void) const;
-    
-    operator const CORBA_WstringDef_ptr &() const;
-    operator CORBA_WstringDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_WstringDef_ptr in (void) const;
-    CORBA_WstringDef_ptr &inout (void);
-    CORBA_WstringDef_ptr &out (void);
-    CORBA_WstringDef_ptr _retn (void);
-    CORBA_WstringDef_ptr ptr (void) const;
-
-  private:
-    CORBA_WstringDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_WSTRINGDEF___OUT_CH_)
-#define _CORBA_WSTRINGDEF___OUT_CH_
-
-  class TAO_Export CORBA_WstringDef_out
-  {
-  public:
-    CORBA_WstringDef_out (CORBA_WstringDef_ptr &);
-    CORBA_WstringDef_out (CORBA_WstringDef_var &);
-    CORBA_WstringDef_out (const CORBA_WstringDef_out &);
-    CORBA_WstringDef_out &operator= (const CORBA_WstringDef_out &);
-    CORBA_WstringDef_out &operator= (const CORBA_WstringDef_var &);
-    CORBA_WstringDef_out &operator= (CORBA_WstringDef_ptr);
-    operator CORBA_WstringDef_ptr &();
-    CORBA_WstringDef_ptr &ptr (void);
-    CORBA_WstringDef_ptr operator-> (void);
-    
-  private:
-    CORBA_WstringDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_WSTRINGDEF_CH_)
-#define _CORBA_WSTRINGDEF_CH_
-
-class TAO_Export CORBA_WstringDef: public virtual CORBA_IDLType
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_WstringDef_ptr _ptr_type;
-    typedef CORBA_WstringDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_WstringDef_ptr _duplicate (CORBA_WstringDef_ptr obj);
-    static CORBA_WstringDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_WstringDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_WstringDef_ptr _nil (void)
-      {
-        return (CORBA::WstringDef_ptr)0;
-      }
-
-    virtual CORBA::ULong bound (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void bound (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_WstringDef (void);
-    CORBA_WstringDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_WstringDef (void);
-  private:
-    CORBA_WstringDef (const CORBA_WstringDef &);
-    void operator= (const CORBA_WstringDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_FIXEDDEF___VAR_CH_)
-#define _CORBA_FIXEDDEF___VAR_CH_
-
-  class TAO_Export CORBA_FixedDef_var
-  {
-  public:
-    CORBA_FixedDef_var (void); // default constructor
-    CORBA_FixedDef_var (CORBA_FixedDef_ptr);
-    CORBA_FixedDef_var (const CORBA_FixedDef_var &); // copy constructor
-    ~CORBA_FixedDef_var (void); // destructor
-    
-    CORBA_FixedDef_var &operator= (CORBA_FixedDef_ptr);
-    CORBA_FixedDef_var &operator= (const CORBA_FixedDef_var &);
-    CORBA_FixedDef_ptr operator-> (void) const;
-    
-    operator const CORBA_FixedDef_ptr &() const;
-    operator CORBA_FixedDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_FixedDef_ptr in (void) const;
-    CORBA_FixedDef_ptr &inout (void);
-    CORBA_FixedDef_ptr &out (void);
-    CORBA_FixedDef_ptr _retn (void);
-    CORBA_FixedDef_ptr ptr (void) const;
-
-  private:
-    CORBA_FixedDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_FIXEDDEF___OUT_CH_)
-#define _CORBA_FIXEDDEF___OUT_CH_
-
-  class TAO_Export CORBA_FixedDef_out
-  {
-  public:
-    CORBA_FixedDef_out (CORBA_FixedDef_ptr &);
-    CORBA_FixedDef_out (CORBA_FixedDef_var &);
-    CORBA_FixedDef_out (const CORBA_FixedDef_out &);
-    CORBA_FixedDef_out &operator= (const CORBA_FixedDef_out &);
-    CORBA_FixedDef_out &operator= (const CORBA_FixedDef_var &);
-    CORBA_FixedDef_out &operator= (CORBA_FixedDef_ptr);
-    operator CORBA_FixedDef_ptr &();
-    CORBA_FixedDef_ptr &ptr (void);
-    CORBA_FixedDef_ptr operator-> (void);
-    
-  private:
-    CORBA_FixedDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_FIXEDDEF_CH_)
-#define _CORBA_FIXEDDEF_CH_
-
-class TAO_Export CORBA_FixedDef: public virtual CORBA_IDLType
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_FixedDef_ptr _ptr_type;
-    typedef CORBA_FixedDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_FixedDef_ptr _duplicate (CORBA_FixedDef_ptr obj);
-    static CORBA_FixedDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_FixedDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_FixedDef_ptr _nil (void)
-      {
-        return (CORBA::FixedDef_ptr)0;
-      }
-
-    virtual CORBA::UShort digits (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void digits (
-        CORBA::UShort digits,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Short scale (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void scale (
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_FixedDef (void);
-    CORBA_FixedDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_FixedDef (void);
-  private:
-    CORBA_FixedDef (const CORBA_FixedDef &);
-    void operator= (const CORBA_FixedDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCEDEF___VAR_CH_)
-#define _CORBA_SEQUENCEDEF___VAR_CH_
-
-  class TAO_Export CORBA_SequenceDef_var
-  {
-  public:
-    CORBA_SequenceDef_var (void); // default constructor
-    CORBA_SequenceDef_var (CORBA_SequenceDef_ptr);
-    CORBA_SequenceDef_var (const CORBA_SequenceDef_var &); // copy constructor
-    ~CORBA_SequenceDef_var (void); // destructor
-    
-    CORBA_SequenceDef_var &operator= (CORBA_SequenceDef_ptr);
-    CORBA_SequenceDef_var &operator= (const CORBA_SequenceDef_var &);
-    CORBA_SequenceDef_ptr operator-> (void) const;
-    
-    operator const CORBA_SequenceDef_ptr &() const;
-    operator CORBA_SequenceDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_SequenceDef_ptr in (void) const;
-    CORBA_SequenceDef_ptr &inout (void);
-    CORBA_SequenceDef_ptr &out (void);
-    CORBA_SequenceDef_ptr _retn (void);
-    CORBA_SequenceDef_ptr ptr (void) const;
-
-  private:
-    CORBA_SequenceDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SEQUENCEDEF___OUT_CH_)
-#define _CORBA_SEQUENCEDEF___OUT_CH_
-
-  class TAO_Export CORBA_SequenceDef_out
-  {
-  public:
-    CORBA_SequenceDef_out (CORBA_SequenceDef_ptr &);
-    CORBA_SequenceDef_out (CORBA_SequenceDef_var &);
-    CORBA_SequenceDef_out (const CORBA_SequenceDef_out &);
-    CORBA_SequenceDef_out &operator= (const CORBA_SequenceDef_out &);
-    CORBA_SequenceDef_out &operator= (const CORBA_SequenceDef_var &);
-    CORBA_SequenceDef_out &operator= (CORBA_SequenceDef_ptr);
-    operator CORBA_SequenceDef_ptr &();
-    CORBA_SequenceDef_ptr &ptr (void);
-    CORBA_SequenceDef_ptr operator-> (void);
-    
-  private:
-    CORBA_SequenceDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SEQUENCEDEF_CH_)
-#define _CORBA_SEQUENCEDEF_CH_
-
-class TAO_Export CORBA_SequenceDef: public virtual CORBA_IDLType
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_SequenceDef_ptr _ptr_type;
-    typedef CORBA_SequenceDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_SequenceDef_ptr _duplicate (CORBA_SequenceDef_ptr obj);
-    static CORBA_SequenceDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_SequenceDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_SequenceDef_ptr _nil (void)
-      {
-        return (CORBA::SequenceDef_ptr)0;
-      }
-
-    virtual CORBA::ULong bound (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void bound (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::TypeCode_ptr element_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_IDLType_ptr element_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void element_type_def (
-        CORBA_IDLType_ptr element_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_SequenceDef (void);
-    CORBA_SequenceDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_SequenceDef (void);
-  private:
-    CORBA_SequenceDef (const CORBA_SequenceDef &);
-    void operator= (const CORBA_SequenceDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ARRAYDEF___VAR_CH_)
-#define _CORBA_ARRAYDEF___VAR_CH_
-
-  class TAO_Export CORBA_ArrayDef_var
-  {
-  public:
-    CORBA_ArrayDef_var (void); // default constructor
-    CORBA_ArrayDef_var (CORBA_ArrayDef_ptr);
-    CORBA_ArrayDef_var (const CORBA_ArrayDef_var &); // copy constructor
-    ~CORBA_ArrayDef_var (void); // destructor
-    
-    CORBA_ArrayDef_var &operator= (CORBA_ArrayDef_ptr);
-    CORBA_ArrayDef_var &operator= (const CORBA_ArrayDef_var &);
-    CORBA_ArrayDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ArrayDef_ptr &() const;
-    operator CORBA_ArrayDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ArrayDef_ptr in (void) const;
-    CORBA_ArrayDef_ptr &inout (void);
-    CORBA_ArrayDef_ptr &out (void);
-    CORBA_ArrayDef_ptr _retn (void);
-    CORBA_ArrayDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ArrayDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ARRAYDEF___OUT_CH_)
-#define _CORBA_ARRAYDEF___OUT_CH_
-
-  class TAO_Export CORBA_ArrayDef_out
-  {
-  public:
-    CORBA_ArrayDef_out (CORBA_ArrayDef_ptr &);
-    CORBA_ArrayDef_out (CORBA_ArrayDef_var &);
-    CORBA_ArrayDef_out (const CORBA_ArrayDef_out &);
-    CORBA_ArrayDef_out &operator= (const CORBA_ArrayDef_out &);
-    CORBA_ArrayDef_out &operator= (const CORBA_ArrayDef_var &);
-    CORBA_ArrayDef_out &operator= (CORBA_ArrayDef_ptr);
-    operator CORBA_ArrayDef_ptr &();
-    CORBA_ArrayDef_ptr &ptr (void);
-    CORBA_ArrayDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ArrayDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ARRAYDEF_CH_)
-#define _CORBA_ARRAYDEF_CH_
-
-class TAO_Export CORBA_ArrayDef: public virtual CORBA_IDLType
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_ArrayDef_ptr _ptr_type;
-    typedef CORBA_ArrayDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_ArrayDef_ptr _duplicate (CORBA_ArrayDef_ptr obj);
-    static CORBA_ArrayDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ArrayDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ArrayDef_ptr _nil (void)
-      {
-        return (CORBA::ArrayDef_ptr)0;
-      }
-
-    virtual CORBA::ULong length (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void length (
-        CORBA::ULong length,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::TypeCode_ptr element_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_IDLType_ptr element_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void element_type_def (
-        CORBA_IDLType_ptr element_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_ArrayDef (void);
-    CORBA_ArrayDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_ArrayDef (void);
-  private:
-    CORBA_ArrayDef (const CORBA_ArrayDef &);
-    void operator= (const CORBA_ArrayDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCEPTIONDEF___VAR_CH_)
-#define _CORBA_EXCEPTIONDEF___VAR_CH_
-
-  class TAO_Export CORBA_ExceptionDef_var
-  {
-  public:
-    CORBA_ExceptionDef_var (void); // default constructor
-    CORBA_ExceptionDef_var (CORBA_ExceptionDef_ptr);
-    CORBA_ExceptionDef_var (const CORBA_ExceptionDef_var &); // copy constructor
-    ~CORBA_ExceptionDef_var (void); // destructor
-    
-    CORBA_ExceptionDef_var &operator= (CORBA_ExceptionDef_ptr);
-    CORBA_ExceptionDef_var &operator= (const CORBA_ExceptionDef_var &);
-    CORBA_ExceptionDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ExceptionDef_ptr &() const;
-    operator CORBA_ExceptionDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ExceptionDef_ptr in (void) const;
-    CORBA_ExceptionDef_ptr &inout (void);
-    CORBA_ExceptionDef_ptr &out (void);
-    CORBA_ExceptionDef_ptr _retn (void);
-    CORBA_ExceptionDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ExceptionDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_EXCEPTIONDEF___OUT_CH_)
-#define _CORBA_EXCEPTIONDEF___OUT_CH_
-
-  class TAO_Export CORBA_ExceptionDef_out
-  {
-  public:
-    CORBA_ExceptionDef_out (CORBA_ExceptionDef_ptr &);
-    CORBA_ExceptionDef_out (CORBA_ExceptionDef_var &);
-    CORBA_ExceptionDef_out (const CORBA_ExceptionDef_out &);
-    CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_out &);
-    CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_var &);
-    CORBA_ExceptionDef_out &operator= (CORBA_ExceptionDef_ptr);
-    operator CORBA_ExceptionDef_ptr &();
-    CORBA_ExceptionDef_ptr &ptr (void);
-    CORBA_ExceptionDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ExceptionDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_EXCEPTIONDEF_CH_)
-#define _CORBA_EXCEPTIONDEF_CH_
-
-class TAO_Export CORBA_ExceptionDef: public virtual CORBA_Contained, public virtual CORBA_Container
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_ExceptionDef_ptr _ptr_type;
-    typedef CORBA_ExceptionDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_ExceptionDef_ptr _duplicate (CORBA_ExceptionDef_ptr obj);
-    static CORBA_ExceptionDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ExceptionDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ExceptionDef_ptr _nil (void)
-      {
-        return (CORBA::ExceptionDef_ptr)0;
-      }
-
-    virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_StructMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void members (
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_ExceptionDef (void);
-    CORBA_ExceptionDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_ExceptionDef (void);
-  private:
-    CORBA_ExceptionDef (const CORBA_ExceptionDef &);
-    void operator= (const CORBA_ExceptionDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-  struct  CORBA_ExceptionDescription
-  {
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-  };
-
-  class TAO_Export CORBA_ExceptionDescription_var
-  {
-  public:
-    CORBA_ExceptionDescription_var (void); // default constructor
-    CORBA_ExceptionDescription_var (CORBA_ExceptionDescription *);
-    CORBA_ExceptionDescription_var (const CORBA_ExceptionDescription_var &); // copy constructor
-    ~CORBA_ExceptionDescription_var (void); // destructor
-    
-    CORBA_ExceptionDescription_var &operator= (CORBA_ExceptionDescription *);
-    CORBA_ExceptionDescription_var &operator= (const CORBA_ExceptionDescription_var &);
-    CORBA_ExceptionDescription *operator-> (void);
-    const CORBA_ExceptionDescription *operator-> (void) const;
-    
-    operator const CORBA_ExceptionDescription &() const;
-    operator CORBA_ExceptionDescription &();
-    operator CORBA_ExceptionDescription &() const;
-    // in, inout, out, _retn 
-    const CORBA_ExceptionDescription &in (void) const;
-    CORBA_ExceptionDescription &inout (void);
-    CORBA_ExceptionDescription *&out (void);
-    CORBA_ExceptionDescription *_retn (void);
-    CORBA_ExceptionDescription *ptr (void) const;
-
-  private:
-    CORBA_ExceptionDescription *ptr_;
-  };
-
-  class TAO_Export CORBA_ExceptionDescription_out
-  {
-  public:
-    CORBA_ExceptionDescription_out (CORBA_ExceptionDescription *&);
-    CORBA_ExceptionDescription_out (CORBA_ExceptionDescription_var &);
-    CORBA_ExceptionDescription_out (const CORBA_ExceptionDescription_out &);
-    CORBA_ExceptionDescription_out &operator= (const CORBA_ExceptionDescription_out &);
-    CORBA_ExceptionDescription_out &operator= (CORBA_ExceptionDescription *);
-    operator CORBA_ExceptionDescription *&();
-    CORBA_ExceptionDescription *&ptr (void);
-    CORBA_ExceptionDescription *operator-> (void);
-    
-  private:
-    CORBA_ExceptionDescription *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ExceptionDescription_var &);
-  };
-
-
-#if !defined (_CORBA_ATTRIBUTEDEF___VAR_CH_)
-#define _CORBA_ATTRIBUTEDEF___VAR_CH_
-
-  class TAO_Export CORBA_AttributeDef_var
-  {
-  public:
-    CORBA_AttributeDef_var (void); // default constructor
-    CORBA_AttributeDef_var (CORBA_AttributeDef_ptr);
-    CORBA_AttributeDef_var (const CORBA_AttributeDef_var &); // copy constructor
-    ~CORBA_AttributeDef_var (void); // destructor
-    
-    CORBA_AttributeDef_var &operator= (CORBA_AttributeDef_ptr);
-    CORBA_AttributeDef_var &operator= (const CORBA_AttributeDef_var &);
-    CORBA_AttributeDef_ptr operator-> (void) const;
-    
-    operator const CORBA_AttributeDef_ptr &() const;
-    operator CORBA_AttributeDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_AttributeDef_ptr in (void) const;
-    CORBA_AttributeDef_ptr &inout (void);
-    CORBA_AttributeDef_ptr &out (void);
-    CORBA_AttributeDef_ptr _retn (void);
-    CORBA_AttributeDef_ptr ptr (void) const;
-
-  private:
-    CORBA_AttributeDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ATTRIBUTEDEF___OUT_CH_)
-#define _CORBA_ATTRIBUTEDEF___OUT_CH_
-
-  class TAO_Export CORBA_AttributeDef_out
-  {
-  public:
-    CORBA_AttributeDef_out (CORBA_AttributeDef_ptr &);
-    CORBA_AttributeDef_out (CORBA_AttributeDef_var &);
-    CORBA_AttributeDef_out (const CORBA_AttributeDef_out &);
-    CORBA_AttributeDef_out &operator= (const CORBA_AttributeDef_out &);
-    CORBA_AttributeDef_out &operator= (const CORBA_AttributeDef_var &);
-    CORBA_AttributeDef_out &operator= (CORBA_AttributeDef_ptr);
-    operator CORBA_AttributeDef_ptr &();
-    CORBA_AttributeDef_ptr &ptr (void);
-    CORBA_AttributeDef_ptr operator-> (void);
-    
-  private:
-    CORBA_AttributeDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ATTRIBUTEDEF_CH_)
-#define _CORBA_ATTRIBUTEDEF_CH_
-
-class TAO_Export CORBA_AttributeDef: public virtual CORBA_Contained
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_AttributeDef_ptr _ptr_type;
-    typedef CORBA_AttributeDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_AttributeDef_ptr _duplicate (CORBA_AttributeDef_ptr obj);
-    static CORBA_AttributeDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_AttributeDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_AttributeDef_ptr _nil (void)
-      {
-        return (CORBA::AttributeDef_ptr)0;
-      }
-
-    virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_IDLType_ptr type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void type_def (
-        CORBA_IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::AttributeMode mode (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void mode (
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_AttributeDef (void);
-    CORBA_AttributeDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_AttributeDef (void);
-  private:
-    CORBA_AttributeDef (const CORBA_AttributeDef &);
-    void operator= (const CORBA_AttributeDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-  struct  CORBA_AttributeDescription
-  {
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-    CORBA::AttributeMode mode;
-  };
-
-  class TAO_Export CORBA_AttributeDescription_var
-  {
-  public:
-    CORBA_AttributeDescription_var (void); // default constructor
-    CORBA_AttributeDescription_var (CORBA_AttributeDescription *);
-    CORBA_AttributeDescription_var (const CORBA_AttributeDescription_var &); // copy constructor
-    ~CORBA_AttributeDescription_var (void); // destructor
-    
-    CORBA_AttributeDescription_var &operator= (CORBA_AttributeDescription *);
-    CORBA_AttributeDescription_var &operator= (const CORBA_AttributeDescription_var &);
-    CORBA_AttributeDescription *operator-> (void);
-    const CORBA_AttributeDescription *operator-> (void) const;
-    
-    operator const CORBA_AttributeDescription &() const;
-    operator CORBA_AttributeDescription &();
-    operator CORBA_AttributeDescription &() const;
-    // in, inout, out, _retn 
-    const CORBA_AttributeDescription &in (void) const;
-    CORBA_AttributeDescription &inout (void);
-    CORBA_AttributeDescription *&out (void);
-    CORBA_AttributeDescription *_retn (void);
-    CORBA_AttributeDescription *ptr (void) const;
-
-  private:
-    CORBA_AttributeDescription *ptr_;
-  };
-
-  class TAO_Export CORBA_AttributeDescription_out
-  {
-  public:
-    CORBA_AttributeDescription_out (CORBA_AttributeDescription *&);
-    CORBA_AttributeDescription_out (CORBA_AttributeDescription_var &);
-    CORBA_AttributeDescription_out (const CORBA_AttributeDescription_out &);
-    CORBA_AttributeDescription_out &operator= (const CORBA_AttributeDescription_out &);
-    CORBA_AttributeDescription_out &operator= (CORBA_AttributeDescription *);
-    operator CORBA_AttributeDescription *&();
-    CORBA_AttributeDescription *&ptr (void);
-    CORBA_AttributeDescription *operator-> (void);
-    
-  private:
-    CORBA_AttributeDescription *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_AttributeDescription_var &);
-  };
-
-  struct  CORBA_ParameterDescription
-  {
-    TAO_String_Manager name;
-    CORBA::TypeCode_var type;
-    TAO_Object_Field_T<CORBA_IDLType,CORBA_IDLType_var> type_def;
-    CORBA::ParameterMode mode;
-  };
-
-  class TAO_Export CORBA_ParameterDescription_var
-  {
-  public:
-    CORBA_ParameterDescription_var (void); // default constructor
-    CORBA_ParameterDescription_var (CORBA_ParameterDescription *);
-    CORBA_ParameterDescription_var (const CORBA_ParameterDescription_var &); // copy constructor
-    ~CORBA_ParameterDescription_var (void); // destructor
-    
-    CORBA_ParameterDescription_var &operator= (CORBA_ParameterDescription *);
-    CORBA_ParameterDescription_var &operator= (const CORBA_ParameterDescription_var &);
-    CORBA_ParameterDescription *operator-> (void);
-    const CORBA_ParameterDescription *operator-> (void) const;
-    
-    operator const CORBA_ParameterDescription &() const;
-    operator CORBA_ParameterDescription &();
-    operator CORBA_ParameterDescription &() const;
-    // in, inout, out, _retn 
-    const CORBA_ParameterDescription &in (void) const;
-    CORBA_ParameterDescription &inout (void);
-    CORBA_ParameterDescription *&out (void);
-    CORBA_ParameterDescription *_retn (void);
-    CORBA_ParameterDescription *ptr (void) const;
-
-  private:
-    CORBA_ParameterDescription *ptr_;
-  };
-
-  class TAO_Export CORBA_ParameterDescription_out
-  {
-  public:
-    CORBA_ParameterDescription_out (CORBA_ParameterDescription *&);
-    CORBA_ParameterDescription_out (CORBA_ParameterDescription_var &);
-    CORBA_ParameterDescription_out (const CORBA_ParameterDescription_out &);
-    CORBA_ParameterDescription_out &operator= (const CORBA_ParameterDescription_out &);
-    CORBA_ParameterDescription_out &operator= (CORBA_ParameterDescription *);
-    operator CORBA_ParameterDescription *&();
-    CORBA_ParameterDescription *&ptr (void);
-    CORBA_ParameterDescription *operator-> (void);
-    
-  private:
-    CORBA_ParameterDescription *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ParameterDescription_var &);
-  };
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_ParameterDescription *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs);
-      _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void); // Dtor.
-      // = Accessors.
-      CORBA_ParameterDescription &operator[] (CORBA::ULong i);
-      const CORBA_ParameterDescription &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA_ParameterDescription *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA_ParameterDescription *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      CORBA_ParameterDescription *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_ParameterDescription *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA_ParameterDescription *data,
-        CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_PARDESCRIPTIONSEQ_CH_)
-#define _CORBA_PARDESCRIPTIONSEQ_CH_
-
-  // *************************************************************
-  // ParDescriptionSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_ParDescriptionSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA_ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_ParDescriptionSeq (void); // default ctor
-    CORBA_ParDescriptionSeq (CORBA::ULong max); // uses max size
-    CORBA_ParDescriptionSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_ParameterDescription *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_ParDescriptionSeq (const CORBA_ParDescriptionSeq &); // copy ctor
-    ~CORBA_ParDescriptionSeq (void); // dtor
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_PARDESCRIPTIONSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::ParDescriptionSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_ParDescriptionSeq_var
-  {
-  public:
-    CORBA_ParDescriptionSeq_var (void); // default constructor
-    CORBA_ParDescriptionSeq_var (CORBA_ParDescriptionSeq *);
-    CORBA_ParDescriptionSeq_var (const CORBA_ParDescriptionSeq_var &); // copy constructor
-    ~CORBA_ParDescriptionSeq_var (void); // destructor
-    
-    CORBA_ParDescriptionSeq_var &operator= (CORBA_ParDescriptionSeq *);
-    CORBA_ParDescriptionSeq_var &operator= (const CORBA_ParDescriptionSeq_var &);
-    CORBA_ParDescriptionSeq *operator-> (void);
-    const CORBA_ParDescriptionSeq *operator-> (void) const;
-    
-    operator const CORBA_ParDescriptionSeq &() const;
-    operator CORBA_ParDescriptionSeq &();
-    operator CORBA_ParDescriptionSeq &() const;
-    CORBA_ParameterDescription &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_ParDescriptionSeq &in (void) const;
-    CORBA_ParDescriptionSeq &inout (void);
-    CORBA_ParDescriptionSeq *&out (void);
-    CORBA_ParDescriptionSeq *_retn (void);
-    CORBA_ParDescriptionSeq *ptr (void) const;
-
-  private:
-    CORBA_ParDescriptionSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_PARDESCRIPTIONSEQ___OUT_CH_
-
-  class TAO_Export CORBA_ParDescriptionSeq_out
-  {
-  public:
-    CORBA_ParDescriptionSeq_out (CORBA_ParDescriptionSeq *&);
-    CORBA_ParDescriptionSeq_out (CORBA_ParDescriptionSeq_var &);
-    CORBA_ParDescriptionSeq_out (const CORBA_ParDescriptionSeq_out &);
-    CORBA_ParDescriptionSeq_out &operator= (const CORBA_ParDescriptionSeq_out &);
-    CORBA_ParDescriptionSeq_out &operator= (CORBA_ParDescriptionSeq *);
-    operator CORBA_ParDescriptionSeq *&();
-    CORBA_ParDescriptionSeq *&ptr (void);
-    CORBA_ParDescriptionSeq *operator-> (void);
-    CORBA_ParameterDescription &operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_ParDescriptionSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ParDescriptionSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTEXTIDSEQ_CH_)
-#define _CORBA_CONTEXTIDSEQ_CH_
-
-  // *************************************************************
-  // ContextIdSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_ContextIdSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_ContextIdSeq (void); // default ctor
-    CORBA_ContextIdSeq (CORBA::ULong max); // uses max size
-    CORBA_ContextIdSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      char * *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_ContextIdSeq (const CORBA_ContextIdSeq &); // copy ctor
-    ~CORBA_ContextIdSeq (void); // dtor
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTEXTIDSEQ___VAR_CH_)
-#define _CORBA_CONTEXTIDSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::ContextIdSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_ContextIdSeq_var
-  {
-  public:
-    CORBA_ContextIdSeq_var (void); // default constructor
-    CORBA_ContextIdSeq_var (CORBA_ContextIdSeq *);
-    CORBA_ContextIdSeq_var (const CORBA_ContextIdSeq_var &); // copy constructor
-    ~CORBA_ContextIdSeq_var (void); // destructor
-    
-    CORBA_ContextIdSeq_var &operator= (CORBA_ContextIdSeq *);
-    CORBA_ContextIdSeq_var &operator= (const CORBA_ContextIdSeq_var &);
-    CORBA_ContextIdSeq *operator-> (void);
-    const CORBA_ContextIdSeq *operator-> (void) const;
-    
-    operator const CORBA_ContextIdSeq &() const;
-    operator CORBA_ContextIdSeq &();
-    operator CORBA_ContextIdSeq &() const;
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_ContextIdSeq &in (void) const;
-    CORBA_ContextIdSeq &inout (void);
-    CORBA_ContextIdSeq *&out (void);
-    CORBA_ContextIdSeq *_retn (void);
-    CORBA_ContextIdSeq *ptr (void) const;
-
-  private:
-    CORBA_ContextIdSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTEXTIDSEQ___OUT_CH_)
-#define _CORBA_CONTEXTIDSEQ___OUT_CH_
-
-  class TAO_Export CORBA_ContextIdSeq_out
-  {
-  public:
-    CORBA_ContextIdSeq_out (CORBA_ContextIdSeq *&);
-    CORBA_ContextIdSeq_out (CORBA_ContextIdSeq_var &);
-    CORBA_ContextIdSeq_out (const CORBA_ContextIdSeq_out &);
-    CORBA_ContextIdSeq_out &operator= (const CORBA_ContextIdSeq_out &);
-    CORBA_ContextIdSeq_out &operator= (CORBA_ContextIdSeq *);
-    operator CORBA_ContextIdSeq *&();
-    CORBA_ContextIdSeq *&ptr (void);
-    CORBA_ContextIdSeq *operator-> (void);
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_ContextIdSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ContextIdSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_ExceptionDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs);
-      TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var> operator[] (CORBA::ULong index) const;
-      static CORBA_ExceptionDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (CORBA_ExceptionDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      CORBA_ExceptionDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_ExceptionDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_EXCEPTIONDEFSEQ_CH_)
-#define _CORBA_EXCEPTIONDEFSEQ_CH_
-
-  // *************************************************************
-  // ExceptionDefSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_ExceptionDefSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_ExceptionDefSeq (void); // default ctor
-    CORBA_ExceptionDefSeq (CORBA::ULong max); // uses max size
-    CORBA_ExceptionDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_ExceptionDef_ptr *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_ExceptionDefSeq (const CORBA_ExceptionDefSeq &); // copy ctor
-    ~CORBA_ExceptionDefSeq (void); // dtor
-  };
-  
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ___VAR_CH_)
-#define _CORBA_EXCEPTIONDEFSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::ExceptionDefSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_ExceptionDefSeq_var
-  {
-  public:
-    CORBA_ExceptionDefSeq_var (void); // default constructor
-    CORBA_ExceptionDefSeq_var (CORBA_ExceptionDefSeq *);
-    CORBA_ExceptionDefSeq_var (const CORBA_ExceptionDefSeq_var &); // copy constructor
-    ~CORBA_ExceptionDefSeq_var (void); // destructor
-    
-    CORBA_ExceptionDefSeq_var &operator= (CORBA_ExceptionDefSeq *);
-    CORBA_ExceptionDefSeq_var &operator= (const CORBA_ExceptionDefSeq_var &);
-    CORBA_ExceptionDefSeq *operator-> (void);
-    const CORBA_ExceptionDefSeq *operator-> (void) const;
-    
-    operator const CORBA_ExceptionDefSeq &() const;
-    operator CORBA_ExceptionDefSeq &();
-    operator CORBA_ExceptionDefSeq &() const;
-    TAO_Object_Manager<CORBA_ExceptionDef,CORBA_ExceptionDef_var> operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_ExceptionDefSeq &in (void) const;
-    CORBA_ExceptionDefSeq &inout (void);
-    CORBA_ExceptionDefSeq *&out (void);
-    CORBA_ExceptionDefSeq *_retn (void);
-    CORBA_ExceptionDefSeq *ptr (void) const;
-
-  private:
-    CORBA_ExceptionDefSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ___OUT_CH_)
-#define _CORBA_EXCEPTIONDEFSEQ___OUT_CH_
-
-  class TAO_Export CORBA_ExceptionDefSeq_out
-  {
-  public:
-    CORBA_ExceptionDefSeq_out (CORBA_ExceptionDefSeq *&);
-    CORBA_ExceptionDefSeq_out (CORBA_ExceptionDefSeq_var &);
-    CORBA_ExceptionDefSeq_out (const CORBA_ExceptionDefSeq_out &);
-    CORBA_ExceptionDefSeq_out &operator= (const CORBA_ExceptionDefSeq_out &);
-    CORBA_ExceptionDefSeq_out &operator= (CORBA_ExceptionDefSeq *);
-    operator CORBA_ExceptionDefSeq *&();
-    CORBA_ExceptionDefSeq *&ptr (void);
-    CORBA_ExceptionDefSeq *operator-> (void);
-    TAO_Object_Manager<CORBA_ExceptionDef,CORBA_ExceptionDef_var> operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_ExceptionDefSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ExceptionDefSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_ExceptionDescription *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs);
-      _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void); // Dtor.
-      // = Accessors.
-      CORBA_ExceptionDescription &operator[] (CORBA::ULong i);
-      const CORBA_ExceptionDescription &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA_ExceptionDescription *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA_ExceptionDescription *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      CORBA_ExceptionDescription *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_ExceptionDescription *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA_ExceptionDescription *data,
-        CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CH_)
-#define _CORBA_EXCDESCRIPTIONSEQ_CH_
-
-  // *************************************************************
-  // ExcDescriptionSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_ExcDescriptionSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_ExcDescriptionSeq (void); // default ctor
-    CORBA_ExcDescriptionSeq (CORBA::ULong max); // uses max size
-    CORBA_ExcDescriptionSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_ExceptionDescription *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_ExcDescriptionSeq (const CORBA_ExcDescriptionSeq &); // copy ctor
-    ~CORBA_ExcDescriptionSeq (void); // dtor
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_EXCDESCRIPTIONSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::ExcDescriptionSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_ExcDescriptionSeq_var
-  {
-  public:
-    CORBA_ExcDescriptionSeq_var (void); // default constructor
-    CORBA_ExcDescriptionSeq_var (CORBA_ExcDescriptionSeq *);
-    CORBA_ExcDescriptionSeq_var (const CORBA_ExcDescriptionSeq_var &); // copy constructor
-    ~CORBA_ExcDescriptionSeq_var (void); // destructor
-    
-    CORBA_ExcDescriptionSeq_var &operator= (CORBA_ExcDescriptionSeq *);
-    CORBA_ExcDescriptionSeq_var &operator= (const CORBA_ExcDescriptionSeq_var &);
-    CORBA_ExcDescriptionSeq *operator-> (void);
-    const CORBA_ExcDescriptionSeq *operator-> (void) const;
-    
-    operator const CORBA_ExcDescriptionSeq &() const;
-    operator CORBA_ExcDescriptionSeq &();
-    operator CORBA_ExcDescriptionSeq &() const;
-    CORBA_ExceptionDescription &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_ExcDescriptionSeq &in (void) const;
-    CORBA_ExcDescriptionSeq &inout (void);
-    CORBA_ExcDescriptionSeq *&out (void);
-    CORBA_ExcDescriptionSeq *_retn (void);
-    CORBA_ExcDescriptionSeq *ptr (void) const;
-
-  private:
-    CORBA_ExcDescriptionSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_EXCDESCRIPTIONSEQ___OUT_CH_
-
-  class TAO_Export CORBA_ExcDescriptionSeq_out
-  {
-  public:
-    CORBA_ExcDescriptionSeq_out (CORBA_ExcDescriptionSeq *&);
-    CORBA_ExcDescriptionSeq_out (CORBA_ExcDescriptionSeq_var &);
-    CORBA_ExcDescriptionSeq_out (const CORBA_ExcDescriptionSeq_out &);
-    CORBA_ExcDescriptionSeq_out &operator= (const CORBA_ExcDescriptionSeq_out &);
-    CORBA_ExcDescriptionSeq_out &operator= (CORBA_ExcDescriptionSeq *);
-    operator CORBA_ExcDescriptionSeq *&();
-    CORBA_ExcDescriptionSeq *&ptr (void);
-    CORBA_ExcDescriptionSeq *operator-> (void);
-    CORBA_ExceptionDescription &operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_ExcDescriptionSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ExcDescriptionSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONDEF___VAR_CH_)
-#define _CORBA_OPERATIONDEF___VAR_CH_
-
-  class TAO_Export CORBA_OperationDef_var
-  {
-  public:
-    CORBA_OperationDef_var (void); // default constructor
-    CORBA_OperationDef_var (CORBA_OperationDef_ptr);
-    CORBA_OperationDef_var (const CORBA_OperationDef_var &); // copy constructor
-    ~CORBA_OperationDef_var (void); // destructor
-    
-    CORBA_OperationDef_var &operator= (CORBA_OperationDef_ptr);
-    CORBA_OperationDef_var &operator= (const CORBA_OperationDef_var &);
-    CORBA_OperationDef_ptr operator-> (void) const;
-    
-    operator const CORBA_OperationDef_ptr &() const;
-    operator CORBA_OperationDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_OperationDef_ptr in (void) const;
-    CORBA_OperationDef_ptr &inout (void);
-    CORBA_OperationDef_ptr &out (void);
-    CORBA_OperationDef_ptr _retn (void);
-    CORBA_OperationDef_ptr ptr (void) const;
-
-  private:
-    CORBA_OperationDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_OPERATIONDEF___OUT_CH_)
-#define _CORBA_OPERATIONDEF___OUT_CH_
-
-  class TAO_Export CORBA_OperationDef_out
-  {
-  public:
-    CORBA_OperationDef_out (CORBA_OperationDef_ptr &);
-    CORBA_OperationDef_out (CORBA_OperationDef_var &);
-    CORBA_OperationDef_out (const CORBA_OperationDef_out &);
-    CORBA_OperationDef_out &operator= (const CORBA_OperationDef_out &);
-    CORBA_OperationDef_out &operator= (const CORBA_OperationDef_var &);
-    CORBA_OperationDef_out &operator= (CORBA_OperationDef_ptr);
-    operator CORBA_OperationDef_ptr &();
-    CORBA_OperationDef_ptr &ptr (void);
-    CORBA_OperationDef_ptr operator-> (void);
-    
-  private:
-    CORBA_OperationDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_OPERATIONDEF_CH_)
-#define _CORBA_OPERATIONDEF_CH_
-
-class TAO_Export CORBA_OperationDef: public virtual CORBA_Contained
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_OperationDef_ptr _ptr_type;
-    typedef CORBA_OperationDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_OperationDef_ptr _duplicate (CORBA_OperationDef_ptr obj);
-    static CORBA_OperationDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_OperationDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_OperationDef_ptr _nil (void)
-      {
-        return (CORBA::OperationDef_ptr)0;
-      }
-
-    virtual CORBA::TypeCode_ptr result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_IDLType_ptr result_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void result_def (
-        CORBA_IDLType_ptr result_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ParDescriptionSeq * params (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void params (
-        const CORBA_ParDescriptionSeq & params,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::OperationMode mode (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void mode (
-        CORBA::OperationMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ContextIdSeq * contexts (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void contexts (
-        const CORBA_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ExceptionDefSeq * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void exceptions (
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_OperationDef (void);
-    CORBA_OperationDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_OperationDef (void);
-  private:
-    CORBA_OperationDef (const CORBA_OperationDef &);
-    void operator= (const CORBA_OperationDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-  struct  CORBA_OperationDescription
-  {
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var result;
-    CORBA::OperationMode mode;
-    CORBA_ContextIdSeq contexts;
-    CORBA_ParDescriptionSeq parameters;
-    CORBA_ExcDescriptionSeq exceptions;
-  };
-
-  class TAO_Export CORBA_OperationDescription_var
-  {
-  public:
-    CORBA_OperationDescription_var (void); // default constructor
-    CORBA_OperationDescription_var (CORBA_OperationDescription *);
-    CORBA_OperationDescription_var (const CORBA_OperationDescription_var &); // copy constructor
-    ~CORBA_OperationDescription_var (void); // destructor
-    
-    CORBA_OperationDescription_var &operator= (CORBA_OperationDescription *);
-    CORBA_OperationDescription_var &operator= (const CORBA_OperationDescription_var &);
-    CORBA_OperationDescription *operator-> (void);
-    const CORBA_OperationDescription *operator-> (void) const;
-    
-    operator const CORBA_OperationDescription &() const;
-    operator CORBA_OperationDescription &();
-    operator CORBA_OperationDescription &() const;
-    // in, inout, out, _retn 
-    const CORBA_OperationDescription &in (void) const;
-    CORBA_OperationDescription &inout (void);
-    CORBA_OperationDescription *&out (void);
-    CORBA_OperationDescription *_retn (void);
-    CORBA_OperationDescription *ptr (void) const;
-
-  private:
-    CORBA_OperationDescription *ptr_;
-  };
-
-  class TAO_Export CORBA_OperationDescription_out
-  {
-  public:
-    CORBA_OperationDescription_out (CORBA_OperationDescription *&);
-    CORBA_OperationDescription_out (CORBA_OperationDescription_var &);
-    CORBA_OperationDescription_out (const CORBA_OperationDescription_out &);
-    CORBA_OperationDescription_out &operator= (const CORBA_OperationDescription_out &);
-    CORBA_OperationDescription_out &operator= (CORBA_OperationDescription *);
-    operator CORBA_OperationDescription *&();
-    CORBA_OperationDescription *&ptr (void);
-    CORBA_OperationDescription *operator-> (void);
-    
-  private:
-    CORBA_OperationDescription *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_OperationDescription_var &);
-  };
-
-
-#if !defined (_CORBA_REPOSITORYIDSEQ_CH_)
-#define _CORBA_REPOSITORYIDSEQ_CH_
-
-  // *************************************************************
-  // RepositoryIdSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_RepositoryIdSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_RepositoryIdSeq (void); // default ctor
-    CORBA_RepositoryIdSeq (CORBA::ULong max); // uses max size
-    CORBA_RepositoryIdSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      char * *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_RepositoryIdSeq (const CORBA_RepositoryIdSeq &); // copy ctor
-    ~CORBA_RepositoryIdSeq (void); // dtor
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_REPOSITORYIDSEQ___VAR_CH_)
-#define _CORBA_REPOSITORYIDSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::RepositoryIdSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_RepositoryIdSeq_var
-  {
-  public:
-    CORBA_RepositoryIdSeq_var (void); // default constructor
-    CORBA_RepositoryIdSeq_var (CORBA_RepositoryIdSeq *);
-    CORBA_RepositoryIdSeq_var (const CORBA_RepositoryIdSeq_var &); // copy constructor
-    ~CORBA_RepositoryIdSeq_var (void); // destructor
-    
-    CORBA_RepositoryIdSeq_var &operator= (CORBA_RepositoryIdSeq *);
-    CORBA_RepositoryIdSeq_var &operator= (const CORBA_RepositoryIdSeq_var &);
-    CORBA_RepositoryIdSeq *operator-> (void);
-    const CORBA_RepositoryIdSeq *operator-> (void) const;
-    
-    operator const CORBA_RepositoryIdSeq &() const;
-    operator CORBA_RepositoryIdSeq &();
-    operator CORBA_RepositoryIdSeq &() const;
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_RepositoryIdSeq &in (void) const;
-    CORBA_RepositoryIdSeq &inout (void);
-    CORBA_RepositoryIdSeq *&out (void);
-    CORBA_RepositoryIdSeq *_retn (void);
-    CORBA_RepositoryIdSeq *ptr (void) const;
-
-  private:
-    CORBA_RepositoryIdSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_REPOSITORYIDSEQ___OUT_CH_)
-#define _CORBA_REPOSITORYIDSEQ___OUT_CH_
-
-  class TAO_Export CORBA_RepositoryIdSeq_out
-  {
-  public:
-    CORBA_RepositoryIdSeq_out (CORBA_RepositoryIdSeq *&);
-    CORBA_RepositoryIdSeq_out (CORBA_RepositoryIdSeq_var &);
-    CORBA_RepositoryIdSeq_out (const CORBA_RepositoryIdSeq_out &);
-    CORBA_RepositoryIdSeq_out &operator= (const CORBA_RepositoryIdSeq_out &);
-    CORBA_RepositoryIdSeq_out &operator= (CORBA_RepositoryIdSeq *);
-    operator CORBA_RepositoryIdSeq *&();
-    CORBA_RepositoryIdSeq *&ptr (void);
-    CORBA_RepositoryIdSeq *operator-> (void);
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_RepositoryIdSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_RepositoryIdSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_OperationDescription *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs);
-      _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void); // Dtor.
-      // = Accessors.
-      CORBA_OperationDescription &operator[] (CORBA::ULong i);
-      const CORBA_OperationDescription &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA_OperationDescription *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA_OperationDescription *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      CORBA_OperationDescription *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_OperationDescription *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA_OperationDescription *data,
-        CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_OPDESCRIPTIONSEQ_CH_)
-#define _CORBA_OPDESCRIPTIONSEQ_CH_
-
-  // *************************************************************
-  // OpDescriptionSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_OpDescriptionSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA_OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_OpDescriptionSeq (void); // default ctor
-    CORBA_OpDescriptionSeq (CORBA::ULong max); // uses max size
-    CORBA_OpDescriptionSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_OperationDescription *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_OpDescriptionSeq (const CORBA_OpDescriptionSeq &); // copy ctor
-    ~CORBA_OpDescriptionSeq (void); // dtor
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_OPDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_OPDESCRIPTIONSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::OpDescriptionSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_OpDescriptionSeq_var
-  {
-  public:
-    CORBA_OpDescriptionSeq_var (void); // default constructor
-    CORBA_OpDescriptionSeq_var (CORBA_OpDescriptionSeq *);
-    CORBA_OpDescriptionSeq_var (const CORBA_OpDescriptionSeq_var &); // copy constructor
-    ~CORBA_OpDescriptionSeq_var (void); // destructor
-    
-    CORBA_OpDescriptionSeq_var &operator= (CORBA_OpDescriptionSeq *);
-    CORBA_OpDescriptionSeq_var &operator= (const CORBA_OpDescriptionSeq_var &);
-    CORBA_OpDescriptionSeq *operator-> (void);
-    const CORBA_OpDescriptionSeq *operator-> (void) const;
-    
-    operator const CORBA_OpDescriptionSeq &() const;
-    operator CORBA_OpDescriptionSeq &();
-    operator CORBA_OpDescriptionSeq &() const;
-    CORBA_OperationDescription &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_OpDescriptionSeq &in (void) const;
-    CORBA_OpDescriptionSeq &inout (void);
-    CORBA_OpDescriptionSeq *&out (void);
-    CORBA_OpDescriptionSeq *_retn (void);
-    CORBA_OpDescriptionSeq *ptr (void) const;
-
-  private:
-    CORBA_OpDescriptionSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_OPDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_OPDESCRIPTIONSEQ___OUT_CH_
-
-  class TAO_Export CORBA_OpDescriptionSeq_out
-  {
-  public:
-    CORBA_OpDescriptionSeq_out (CORBA_OpDescriptionSeq *&);
-    CORBA_OpDescriptionSeq_out (CORBA_OpDescriptionSeq_var &);
-    CORBA_OpDescriptionSeq_out (const CORBA_OpDescriptionSeq_out &);
-    CORBA_OpDescriptionSeq_out &operator= (const CORBA_OpDescriptionSeq_out &);
-    CORBA_OpDescriptionSeq_out &operator= (CORBA_OpDescriptionSeq *);
-    operator CORBA_OpDescriptionSeq *&();
-    CORBA_OpDescriptionSeq *&ptr (void);
-    CORBA_OpDescriptionSeq *operator-> (void);
-    CORBA_OperationDescription &operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_OpDescriptionSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_OpDescriptionSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_AttributeDescription *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs);
-      _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void); // Dtor.
-      // = Accessors.
-      CORBA_AttributeDescription &operator[] (CORBA::ULong i);
-      const CORBA_AttributeDescription &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA_AttributeDescription *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA_AttributeDescription *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      CORBA_AttributeDescription *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_AttributeDescription *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA_AttributeDescription *data,
-        CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CH_)
-#define _CORBA_ATTRDESCRIPTIONSEQ_CH_
-
-  // *************************************************************
-  // AttrDescriptionSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_AttrDescriptionSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA_AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_AttrDescriptionSeq (void); // default ctor
-    CORBA_AttrDescriptionSeq (CORBA::ULong max); // uses max size
-    CORBA_AttrDescriptionSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_AttributeDescription *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_AttrDescriptionSeq (const CORBA_AttrDescriptionSeq &); // copy ctor
-    ~CORBA_AttrDescriptionSeq (void); // dtor
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_ATTRDESCRIPTIONSEQ___VAR_CH_
-
-// *************************************************************
-  // class TAO_ExportCORBA::AttrDescriptionSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_AttrDescriptionSeq_var
-  {
-  public:
-    CORBA_AttrDescriptionSeq_var (void); // default constructor
-    CORBA_AttrDescriptionSeq_var (CORBA_AttrDescriptionSeq *);
-    CORBA_AttrDescriptionSeq_var (const CORBA_AttrDescriptionSeq_var &); // copy constructor
-    ~CORBA_AttrDescriptionSeq_var (void); // destructor
-    
-    CORBA_AttrDescriptionSeq_var &operator= (CORBA_AttrDescriptionSeq *);
-    CORBA_AttrDescriptionSeq_var &operator= (const CORBA_AttrDescriptionSeq_var &);
-    CORBA_AttrDescriptionSeq *operator-> (void);
-    const CORBA_AttrDescriptionSeq *operator-> (void) const;
-    
-    operator const CORBA_AttrDescriptionSeq &() const;
-    operator CORBA_AttrDescriptionSeq &();
-    operator CORBA_AttrDescriptionSeq &() const;
-    CORBA_AttributeDescription &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_AttrDescriptionSeq &in (void) const;
-    CORBA_AttrDescriptionSeq &inout (void);
-    CORBA_AttrDescriptionSeq *&out (void);
-    CORBA_AttrDescriptionSeq *_retn (void);
-    CORBA_AttrDescriptionSeq *ptr (void) const;
-
-  private:
-    CORBA_AttrDescriptionSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_ATTRDESCRIPTIONSEQ___OUT_CH_
-
-  class TAO_Export CORBA_AttrDescriptionSeq_out
-  {
-  public:
-    CORBA_AttrDescriptionSeq_out (CORBA_AttrDescriptionSeq *&);
-    CORBA_AttrDescriptionSeq_out (CORBA_AttrDescriptionSeq_var &);
-    CORBA_AttrDescriptionSeq_out (const CORBA_AttrDescriptionSeq_out &);
-    CORBA_AttrDescriptionSeq_out &operator= (const CORBA_AttrDescriptionSeq_out &);
-    CORBA_AttrDescriptionSeq_out &operator= (CORBA_AttrDescriptionSeq *);
-    operator CORBA_AttrDescriptionSeq *&();
-    CORBA_AttrDescriptionSeq *&ptr (void);
-    CORBA_AttrDescriptionSeq *operator-> (void);
-    CORBA_AttributeDescription &operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_AttrDescriptionSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_AttrDescriptionSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
-#define _CORBA_INTERFACEDEF___VAR_CH_
-
-  class TAO_Export CORBA_InterfaceDef_var
-  {
-  public:
-    CORBA_InterfaceDef_var (void); // default constructor
-    CORBA_InterfaceDef_var (CORBA_InterfaceDef_ptr);
-    CORBA_InterfaceDef_var (const CORBA_InterfaceDef_var &); // copy constructor
-    ~CORBA_InterfaceDef_var (void); // destructor
-    
-    CORBA_InterfaceDef_var &operator= (CORBA_InterfaceDef_ptr);
-    CORBA_InterfaceDef_var &operator= (const CORBA_InterfaceDef_var &);
-    CORBA_InterfaceDef_ptr operator-> (void) const;
-    
-    operator const CORBA_InterfaceDef_ptr &() const;
-    operator CORBA_InterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_InterfaceDef_ptr in (void) const;
-    CORBA_InterfaceDef_ptr &inout (void);
-    CORBA_InterfaceDef_ptr &out (void);
-    CORBA_InterfaceDef_ptr _retn (void);
-    CORBA_InterfaceDef_ptr ptr (void) const;
-
-  private:
-    CORBA_InterfaceDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
-#define _CORBA_INTERFACEDEF___OUT_CH_
-
-  class TAO_Export CORBA_InterfaceDef_out
-  {
-  public:
-    CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &);
-    CORBA_InterfaceDef_out (CORBA_InterfaceDef_var &);
-    CORBA_InterfaceDef_out (const CORBA_InterfaceDef_out &);
-    CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_out &);
-    CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_var &);
-    CORBA_InterfaceDef_out &operator= (CORBA_InterfaceDef_ptr);
-    operator CORBA_InterfaceDef_ptr &();
-    CORBA_InterfaceDef_ptr &ptr (void);
-    CORBA_InterfaceDef_ptr operator-> (void);
-    
-  private:
-    CORBA_InterfaceDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INTERFACEDEF_CH_)
-#define _CORBA_INTERFACEDEF_CH_
-
-class TAO_Export CORBA_InterfaceDef: public virtual CORBA_Container, public virtual CORBA_Contained, public virtual CORBA_IDLType
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_InterfaceDef_ptr _ptr_type;
-    typedef CORBA_InterfaceDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_InterfaceDef_ptr _duplicate (CORBA_InterfaceDef_ptr obj);
-    static CORBA_InterfaceDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_InterfaceDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_InterfaceDef_ptr _nil (void)
-      {
-        return (CORBA::InterfaceDef_ptr)0;
-      }
-
-    virtual CORBA_InterfaceDefSeq * base_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void base_interfaces (
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean is_a (
-        const char * interface_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    struct  FullInterfaceDescription
-    {
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      CORBA_OpDescriptionSeq operations;
-      CORBA_AttrDescriptionSeq attributes;
-      CORBA_RepositoryIdSeq base_interfaces;
-      CORBA::TypeCode_var type;
-      CORBA::Boolean is_abstract;
-    };
-
-    class  FullInterfaceDescription_var
-    {
-    public:
-      FullInterfaceDescription_var (void); // default constructor
-      FullInterfaceDescription_var (FullInterfaceDescription *);
-      FullInterfaceDescription_var (const FullInterfaceDescription_var &); // copy constructor
-      ~FullInterfaceDescription_var (void); // destructor
-      
-      FullInterfaceDescription_var &operator= (FullInterfaceDescription *);
-      FullInterfaceDescription_var &operator= (const FullInterfaceDescription_var &);
-      FullInterfaceDescription *operator-> (void);
-      const FullInterfaceDescription *operator-> (void) const;
-      
-      operator const FullInterfaceDescription &() const;
-      operator FullInterfaceDescription &();
-      operator FullInterfaceDescription &() const;
-      // in, inout, out, _retn 
-      const FullInterfaceDescription &in (void) const;
-      FullInterfaceDescription &inout (void);
-      FullInterfaceDescription *&out (void);
-      FullInterfaceDescription *_retn (void);
-      FullInterfaceDescription *ptr (void) const;
-
-    private:
-      FullInterfaceDescription *ptr_;
-    };
-
-    class  FullInterfaceDescription_out
-    {
-    public:
-      FullInterfaceDescription_out (FullInterfaceDescription *&);
-      FullInterfaceDescription_out (FullInterfaceDescription_var &);
-      FullInterfaceDescription_out (const FullInterfaceDescription_out &);
-      FullInterfaceDescription_out &operator= (const FullInterfaceDescription_out &);
-      FullInterfaceDescription_out &operator= (FullInterfaceDescription *);
-      operator FullInterfaceDescription *&();
-      FullInterfaceDescription *&ptr (void);
-      FullInterfaceDescription *operator-> (void);
-      
-    private:
-      FullInterfaceDescription *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const FullInterfaceDescription_var &);
-    };
-
-    static CORBA::TypeCode_ptr _tc_FullInterfaceDescription;
-
-    virtual FullInterfaceDescription * describe_interface (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_AttributeDef_ptr create_attribute (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA_IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_OperationDef_ptr create_operation (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA_IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        const CORBA_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_InterfaceDef (void);
-    CORBA_InterfaceDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_InterfaceDef (void);
-  private:
-    CORBA_InterfaceDef (const CORBA_InterfaceDef &);
-    void operator= (const CORBA_InterfaceDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-  struct  CORBA_InterfaceDescription
-  {
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA_RepositoryIdSeq base_interfaces;
-    CORBA::Boolean is_abstract;
-  };
-
-  class TAO_Export CORBA_InterfaceDescription_var
-  {
-  public:
-    CORBA_InterfaceDescription_var (void); // default constructor
-    CORBA_InterfaceDescription_var (CORBA_InterfaceDescription *);
-    CORBA_InterfaceDescription_var (const CORBA_InterfaceDescription_var &); // copy constructor
-    ~CORBA_InterfaceDescription_var (void); // destructor
-    
-    CORBA_InterfaceDescription_var &operator= (CORBA_InterfaceDescription *);
-    CORBA_InterfaceDescription_var &operator= (const CORBA_InterfaceDescription_var &);
-    CORBA_InterfaceDescription *operator-> (void);
-    const CORBA_InterfaceDescription *operator-> (void) const;
-    
-    operator const CORBA_InterfaceDescription &() const;
-    operator CORBA_InterfaceDescription &();
-    operator CORBA_InterfaceDescription &() const;
-    // in, inout, out, _retn 
-    const CORBA_InterfaceDescription &in (void) const;
-    CORBA_InterfaceDescription &inout (void);
-    CORBA_InterfaceDescription *&out (void);
-    CORBA_InterfaceDescription *_retn (void);
-    CORBA_InterfaceDescription *ptr (void) const;
-
-  private:
-    CORBA_InterfaceDescription *ptr_;
-  };
-
-  class TAO_Export CORBA_InterfaceDescription_out
-  {
-  public:
-    CORBA_InterfaceDescription_out (CORBA_InterfaceDescription *&);
-    CORBA_InterfaceDescription_out (CORBA_InterfaceDescription_var &);
-    CORBA_InterfaceDescription_out (const CORBA_InterfaceDescription_out &);
-    CORBA_InterfaceDescription_out &operator= (const CORBA_InterfaceDescription_out &);
-    CORBA_InterfaceDescription_out &operator= (CORBA_InterfaceDescription *);
-    operator CORBA_InterfaceDescription *&();
-    CORBA_InterfaceDescription *&ptr (void);
-    CORBA_InterfaceDescription *operator-> (void);
-    
-  private:
-    CORBA_InterfaceDescription *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_InterfaceDescription_var &);
-  };
-
-  struct  CORBA_ValueMember
-  {
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-    TAO_Object_Field_T<CORBA_IDLType,CORBA_IDLType_var> type_def;
-    CORBA::Visibility access;
-  };
-
-  class TAO_Export CORBA_ValueMember_var
-  {
-  public:
-    CORBA_ValueMember_var (void); // default constructor
-    CORBA_ValueMember_var (CORBA_ValueMember *);
-    CORBA_ValueMember_var (const CORBA_ValueMember_var &); // copy constructor
-    ~CORBA_ValueMember_var (void); // destructor
-    
-    CORBA_ValueMember_var &operator= (CORBA_ValueMember *);
-    CORBA_ValueMember_var &operator= (const CORBA_ValueMember_var &);
-    CORBA_ValueMember *operator-> (void);
-    const CORBA_ValueMember *operator-> (void) const;
-    
-    operator const CORBA_ValueMember &() const;
-    operator CORBA_ValueMember &();
-    operator CORBA_ValueMember &() const;
-    // in, inout, out, _retn 
-    const CORBA_ValueMember &in (void) const;
-    CORBA_ValueMember &inout (void);
-    CORBA_ValueMember *&out (void);
-    CORBA_ValueMember *_retn (void);
-    CORBA_ValueMember *ptr (void) const;
-
-  private:
-    CORBA_ValueMember *ptr_;
-  };
-
-  class TAO_Export CORBA_ValueMember_out
-  {
-  public:
-    CORBA_ValueMember_out (CORBA_ValueMember *&);
-    CORBA_ValueMember_out (CORBA_ValueMember_var &);
-    CORBA_ValueMember_out (const CORBA_ValueMember_out &);
-    CORBA_ValueMember_out &operator= (const CORBA_ValueMember_out &);
-    CORBA_ValueMember_out &operator= (CORBA_ValueMember *);
-    operator CORBA_ValueMember *&();
-    CORBA_ValueMember *&ptr (void);
-    CORBA_ValueMember *operator-> (void);
-    
-  private:
-    CORBA_ValueMember *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ValueMember_var &);
-  };
-
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA_ValueMember *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs);
-      _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void); // Dtor.
-      // = Accessors.
-      CORBA_ValueMember &operator[] (CORBA::ULong i);
-      const CORBA_ValueMember &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA_ValueMember *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA_ValueMember *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      CORBA_ValueMember *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_ValueMember *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA_ValueMember *data,
-        CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_CORBA_VALUEMEMBERSEQ_CH_)
-#define _CORBA_VALUEMEMBERSEQ_CH_
-
-  // *************************************************************
-  // ValueMemberSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_ValueMemberSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA_ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_ValueMemberSeq (void); // default ctor
-    CORBA_ValueMemberSeq (CORBA::ULong max); // uses max size
-    CORBA_ValueMemberSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA_ValueMember *buffer, 
-      CORBA::Boolean release=0
-    );
-    CORBA_ValueMemberSeq (const CORBA_ValueMemberSeq &); // copy ctor
-    ~CORBA_ValueMemberSeq (void); // dtor
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEMEMBERSEQ___VAR_CH_)
-#define _CORBA_VALUEMEMBERSEQ___VAR_CH_
-
-// *************************************************************
-  // class CORBA::ValueMemberSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_ValueMemberSeq_var
-  {
-  public:
-    CORBA_ValueMemberSeq_var (void); // default constructor
-    CORBA_ValueMemberSeq_var (CORBA_ValueMemberSeq *);
-    CORBA_ValueMemberSeq_var (const CORBA_ValueMemberSeq_var &); // copy constructor
-    ~CORBA_ValueMemberSeq_var (void); // destructor
-    
-    CORBA_ValueMemberSeq_var &operator= (CORBA_ValueMemberSeq *);
-    CORBA_ValueMemberSeq_var &operator= (const CORBA_ValueMemberSeq_var &);
-    CORBA_ValueMemberSeq *operator-> (void);
-    const CORBA_ValueMemberSeq *operator-> (void) const;
-    
-    operator const CORBA_ValueMemberSeq &() const;
-    operator CORBA_ValueMemberSeq &();
-    operator CORBA_ValueMemberSeq &() const;
-    CORBA_ValueMember &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const CORBA_ValueMemberSeq &in (void) const;
-    CORBA_ValueMemberSeq &inout (void);
-    CORBA_ValueMemberSeq *&out (void);
-    CORBA_ValueMemberSeq *_retn (void);
-    CORBA_ValueMemberSeq *ptr (void) const;
-
-  private:
-    CORBA_ValueMemberSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEMEMBERSEQ___OUT_CH_)
-#define _CORBA_VALUEMEMBERSEQ___OUT_CH_
-
-  class TAO_Export CORBA_ValueMemberSeq_out
-  {
-  public:
-    CORBA_ValueMemberSeq_out (CORBA_ValueMemberSeq *&);
-    CORBA_ValueMemberSeq_out (CORBA_ValueMemberSeq_var &);
-    CORBA_ValueMemberSeq_out (const CORBA_ValueMemberSeq_out &);
-    CORBA_ValueMemberSeq_out &operator= (const CORBA_ValueMemberSeq_out &);
-    CORBA_ValueMemberSeq_out &operator= (CORBA_ValueMemberSeq *);
-    operator CORBA_ValueMemberSeq *&();
-    CORBA_ValueMemberSeq *&ptr (void);
-    CORBA_ValueMemberSeq *operator-> (void);
-    CORBA_ValueMember &operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_ValueMemberSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ValueMemberSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEMEMBERDEF___VAR_CH_)
-#define _CORBA_VALUEMEMBERDEF___VAR_CH_
-
-  class TAO_Export CORBA_ValueMemberDef_var
-  {
-  public:
-    CORBA_ValueMemberDef_var (void); // default constructor
-    CORBA_ValueMemberDef_var (CORBA_ValueMemberDef_ptr);
-    CORBA_ValueMemberDef_var (const CORBA_ValueMemberDef_var &); // copy constructor
-    ~CORBA_ValueMemberDef_var (void); // destructor
-    
-    CORBA_ValueMemberDef_var &operator= (CORBA_ValueMemberDef_ptr);
-    CORBA_ValueMemberDef_var &operator= (const CORBA_ValueMemberDef_var &);
-    CORBA_ValueMemberDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ValueMemberDef_ptr &() const;
-    operator CORBA_ValueMemberDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ValueMemberDef_ptr in (void) const;
-    CORBA_ValueMemberDef_ptr &inout (void);
-    CORBA_ValueMemberDef_ptr &out (void);
-    CORBA_ValueMemberDef_ptr _retn (void);
-    CORBA_ValueMemberDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ValueMemberDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEMEMBERDEF___OUT_CH_)
-#define _CORBA_VALUEMEMBERDEF___OUT_CH_
-
-  class TAO_Export CORBA_ValueMemberDef_out
-  {
-  public:
-    CORBA_ValueMemberDef_out (CORBA_ValueMemberDef_ptr &);
-    CORBA_ValueMemberDef_out (CORBA_ValueMemberDef_var &);
-    CORBA_ValueMemberDef_out (const CORBA_ValueMemberDef_out &);
-    CORBA_ValueMemberDef_out &operator= (const CORBA_ValueMemberDef_out &);
-    CORBA_ValueMemberDef_out &operator= (const CORBA_ValueMemberDef_var &);
-    CORBA_ValueMemberDef_out &operator= (CORBA_ValueMemberDef_ptr);
-    operator CORBA_ValueMemberDef_ptr &();
-    CORBA_ValueMemberDef_ptr &ptr (void);
-    CORBA_ValueMemberDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ValueMemberDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEMEMBERDEF_CH_)
-#define _CORBA_VALUEMEMBERDEF_CH_
-
-class TAO_Export CORBA_ValueMemberDef: public virtual CORBA_Contained
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_ValueMemberDef_ptr _ptr_type;
-    typedef CORBA_ValueMemberDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_ValueMemberDef_ptr _duplicate (CORBA_ValueMemberDef_ptr obj);
-    static CORBA_ValueMemberDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ValueMemberDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ValueMemberDef_ptr _nil (void)
-      {
-        return (CORBA::ValueMemberDef_ptr)0;
-      }
-
-    virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_IDLType_ptr type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void type_def (
-        CORBA_IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Visibility access (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void access (
-        CORBA::Visibility access,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_ValueMemberDef (void);
-    CORBA_ValueMemberDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_ValueMemberDef (void);
-  private:
-    CORBA_ValueMemberDef (const CORBA_ValueMemberDef &);
-    void operator= (const CORBA_ValueMemberDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEDEF___VAR_CH_)
-#define _CORBA_VALUEDEF___VAR_CH_
-
-  class TAO_Export CORBA_ValueDef_var
-  {
-  public:
-    CORBA_ValueDef_var (void); // default constructor
-    CORBA_ValueDef_var (CORBA_ValueDef_ptr);
-    CORBA_ValueDef_var (const CORBA_ValueDef_var &); // copy constructor
-    ~CORBA_ValueDef_var (void); // destructor
-    
-    CORBA_ValueDef_var &operator= (CORBA_ValueDef_ptr);
-    CORBA_ValueDef_var &operator= (const CORBA_ValueDef_var &);
-    CORBA_ValueDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ValueDef_ptr &() const;
-    operator CORBA_ValueDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ValueDef_ptr in (void) const;
-    CORBA_ValueDef_ptr &inout (void);
-    CORBA_ValueDef_ptr &out (void);
-    CORBA_ValueDef_ptr _retn (void);
-    CORBA_ValueDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ValueDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEDEF___OUT_CH_)
-#define _CORBA_VALUEDEF___OUT_CH_
-
-  class TAO_Export CORBA_ValueDef_out
-  {
-  public:
-    CORBA_ValueDef_out (CORBA_ValueDef_ptr &);
-    CORBA_ValueDef_out (CORBA_ValueDef_var &);
-    CORBA_ValueDef_out (const CORBA_ValueDef_out &);
-    CORBA_ValueDef_out &operator= (const CORBA_ValueDef_out &);
-    CORBA_ValueDef_out &operator= (const CORBA_ValueDef_var &);
-    CORBA_ValueDef_out &operator= (CORBA_ValueDef_ptr);
-    operator CORBA_ValueDef_ptr &();
-    CORBA_ValueDef_ptr &ptr (void);
-    CORBA_ValueDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ValueDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEDEF_CH_)
-#define _CORBA_VALUEDEF_CH_
-
-class TAO_Export CORBA_ValueDef: public virtual CORBA_Container, public virtual CORBA_Contained, public virtual CORBA_IDLType
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_ValueDef_ptr _ptr_type;
-    typedef CORBA_ValueDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_ValueDef_ptr _duplicate (CORBA_ValueDef_ptr obj);
-    static CORBA_ValueDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ValueDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ValueDef_ptr _nil (void)
-      {
-        return (CORBA::ValueDef_ptr)0;
-      }
-
-    virtual CORBA_InterfaceDef_ptr supported_interface (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void supported_interface (
-        CORBA_InterfaceDef_ptr supported_interface,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_InitializerSeq * initializers (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void initializers (
-        const CORBA_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ValueDef_ptr base_value (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void base_value (
-        CORBA_ValueDef_ptr base_value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ValueDefSeq * abstract_base_values (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void abstract_base_values (
-        const CORBA_ValueDefSeq & abstract_base_values,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean is_abstract (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void is_abstract (
-        CORBA::Boolean is_abstract,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean is_custom (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void is_custom (
-        CORBA::Boolean is_custom,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean is_truncatable (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void is_truncatable (
-        CORBA::Boolean is_truncatable,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean is_a (
-        const char * value_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    struct  FullValueDescription
-    {
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      CORBA::Boolean is_abstract;
-      CORBA::Boolean is_custom;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      CORBA_OpDescriptionSeq operations;
-      CORBA_AttrDescriptionSeq attributes;
-      CORBA_ValueMemberSeq members;
-      CORBA_InitializerSeq initializers;
-      CORBA_RepositoryIdSeq supported_interfaces;
-      CORBA_RepositoryIdSeq abstract_base_values;
-      CORBA::Boolean is_truncatable;
-      TAO_String_Manager base_value;
-      CORBA::TypeCode_var type;
-    };
-
-    class  FullValueDescription_var
-    {
-    public:
-      FullValueDescription_var (void); // default constructor
-      FullValueDescription_var (FullValueDescription *);
-      FullValueDescription_var (const FullValueDescription_var &); // copy constructor
-      ~FullValueDescription_var (void); // destructor
-      
-      FullValueDescription_var &operator= (FullValueDescription *);
-      FullValueDescription_var &operator= (const FullValueDescription_var &);
-      FullValueDescription *operator-> (void);
-      const FullValueDescription *operator-> (void) const;
-      
-      operator const FullValueDescription &() const;
-      operator FullValueDescription &();
-      operator FullValueDescription &() const;
-      // in, inout, out, _retn 
-      const FullValueDescription &in (void) const;
-      FullValueDescription &inout (void);
-      FullValueDescription *&out (void);
-      FullValueDescription *_retn (void);
-      FullValueDescription *ptr (void) const;
-
-    private:
-      FullValueDescription *ptr_;
-    };
-
-    class  FullValueDescription_out
-    {
-    public:
-      FullValueDescription_out (FullValueDescription *&);
-      FullValueDescription_out (FullValueDescription_var &);
-      FullValueDescription_out (const FullValueDescription_out &);
-      FullValueDescription_out &operator= (const FullValueDescription_out &);
-      FullValueDescription_out &operator= (FullValueDescription *);
-      operator FullValueDescription *&();
-      FullValueDescription *&ptr (void);
-      FullValueDescription *operator-> (void);
-      
-    private:
-      FullValueDescription *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const FullValueDescription_var &);
-    };
-
-    static CORBA::TypeCode_ptr _tc_FullValueDescription;
-
-    virtual FullValueDescription * describe_value (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_ValueMemberDef_ptr create_value_member (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA_IDLType_ptr type,
-        CORBA::Visibility access,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_AttributeDef_ptr create_attribute (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA_IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA_OperationDef_ptr create_operation (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA_IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        const CORBA_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_ValueDef (void);
-    CORBA_ValueDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_ValueDef (void);
-  private:
-    CORBA_ValueDef (const CORBA_ValueDef &);
-    void operator= (const CORBA_ValueDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-  struct  CORBA_ValueDescription
-  {
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    CORBA::Boolean is_abstract;
-    CORBA::Boolean is_custom;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    TAO_String_Manager supported_interface;
-    CORBA_RepositoryIdSeq abstract_base_values;
-    CORBA::Boolean is_truncatable;
-    TAO_String_Manager base_value;
-  };
-
-  class TAO_Export CORBA_ValueDescription_var
-  {
-  public:
-    CORBA_ValueDescription_var (void); // default constructor
-    CORBA_ValueDescription_var (CORBA_ValueDescription *);
-    CORBA_ValueDescription_var (const CORBA_ValueDescription_var &); // copy constructor
-    ~CORBA_ValueDescription_var (void); // destructor
-    
-    CORBA_ValueDescription_var &operator= (CORBA_ValueDescription *);
-    CORBA_ValueDescription_var &operator= (const CORBA_ValueDescription_var &);
-    CORBA_ValueDescription *operator-> (void);
-    const CORBA_ValueDescription *operator-> (void) const;
-    
-    operator const CORBA_ValueDescription &() const;
-    operator CORBA_ValueDescription &();
-    operator CORBA_ValueDescription &() const;
-    // in, inout, out, _retn 
-    const CORBA_ValueDescription &in (void) const;
-    CORBA_ValueDescription &inout (void);
-    CORBA_ValueDescription *&out (void);
-    CORBA_ValueDescription *_retn (void);
-    CORBA_ValueDescription *ptr (void) const;
-
-  private:
-    CORBA_ValueDescription *ptr_;
-  };
-
-  class TAO_Export CORBA_ValueDescription_out
-  {
-  public:
-    CORBA_ValueDescription_out (CORBA_ValueDescription *&);
-    CORBA_ValueDescription_out (CORBA_ValueDescription_var &);
-    CORBA_ValueDescription_out (const CORBA_ValueDescription_out &);
-    CORBA_ValueDescription_out &operator= (const CORBA_ValueDescription_out &);
-    CORBA_ValueDescription_out &operator= (CORBA_ValueDescription *);
-    operator CORBA_ValueDescription *&();
-    CORBA_ValueDescription *&ptr (void);
-    CORBA_ValueDescription *operator-> (void);
-    
-  private:
-    CORBA_ValueDescription *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_ValueDescription_var &);
-  };
-
-
-#if !defined (_CORBA_VALUEBOXDEF___VAR_CH_)
-#define _CORBA_VALUEBOXDEF___VAR_CH_
-
-  class TAO_Export CORBA_ValueBoxDef_var
-  {
-  public:
-    CORBA_ValueBoxDef_var (void); // default constructor
-    CORBA_ValueBoxDef_var (CORBA_ValueBoxDef_ptr);
-    CORBA_ValueBoxDef_var (const CORBA_ValueBoxDef_var &); // copy constructor
-    ~CORBA_ValueBoxDef_var (void); // destructor
-    
-    CORBA_ValueBoxDef_var &operator= (CORBA_ValueBoxDef_ptr);
-    CORBA_ValueBoxDef_var &operator= (const CORBA_ValueBoxDef_var &);
-    CORBA_ValueBoxDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ValueBoxDef_ptr &() const;
-    operator CORBA_ValueBoxDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ValueBoxDef_ptr in (void) const;
-    CORBA_ValueBoxDef_ptr &inout (void);
-    CORBA_ValueBoxDef_ptr &out (void);
-    CORBA_ValueBoxDef_ptr _retn (void);
-    CORBA_ValueBoxDef_ptr ptr (void) const;
-
-  private:
-    CORBA_ValueBoxDef_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEBOXDEF___OUT_CH_)
-#define _CORBA_VALUEBOXDEF___OUT_CH_
-
-  class TAO_Export CORBA_ValueBoxDef_out
-  {
-  public:
-    CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_ptr &);
-    CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_var &);
-    CORBA_ValueBoxDef_out (const CORBA_ValueBoxDef_out &);
-    CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_out &);
-    CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_var &);
-    CORBA_ValueBoxDef_out &operator= (CORBA_ValueBoxDef_ptr);
-    operator CORBA_ValueBoxDef_ptr &();
-    CORBA_ValueBoxDef_ptr &ptr (void);
-    CORBA_ValueBoxDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ValueBoxDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEBOXDEF_CH_)
-#define _CORBA_VALUEBOXDEF_CH_
-
-class TAO_Export CORBA_ValueBoxDef: public virtual CORBA_IDLType
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_ValueBoxDef_ptr _ptr_type;
-    typedef CORBA_ValueBoxDef_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static CORBA_ValueBoxDef_ptr _duplicate (CORBA_ValueBoxDef_ptr obj);
-    static CORBA_ValueBoxDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ValueBoxDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    static CORBA_ValueBoxDef_ptr _nil (void)
-      {
-        return (CORBA::ValueBoxDef_ptr)0;
-      }
-
-    virtual CORBA_IDLType_ptr original_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void original_type_def (
-        CORBA_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_ValueBoxDef (void);
-    CORBA_ValueBoxDef (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~CORBA_ValueBoxDef (void);
-  private:
-    CORBA_ValueBoxDef (const CORBA_ValueBoxDef &);
-    void operator= (const CORBA_ValueBoxDef &);
-  };
-
-
-#endif /* end #if !defined */
-
-void  operator<<= (CORBA::Any &, CORBA::DefinitionKind);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::DefinitionKind &);
-extern CORBA::IRObject_ptr (*_TAO_collocation_CORBA_IRObject_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::IRObject
-void  operator<<= (CORBA::Any &, CORBA::IRObject_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::IRObject *&);
-extern CORBA::Contained_ptr (*_TAO_collocation_CORBA_Contained_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::Contained
-void  operator<<= (CORBA::Any &, CORBA::Contained_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::Contained *&);
-void  operator<<= (CORBA::Any &, const CORBA::Contained::Description &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::Contained::Description*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::Contained::Description *&);
-void  operator<<= (CORBA::Any &, const CORBA::InterfaceDefSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::InterfaceDefSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::InterfaceDefSeq *&);
-void  operator<<= (CORBA::Any &, const CORBA::ValueDefSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ValueDefSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ValueDefSeq *&);
-void  operator<<= (CORBA::Any &, const CORBA::ContainedSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ContainedSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ContainedSeq *&);
-void  operator<<= (CORBA::Any &, const CORBA::StructMember &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::StructMember*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::StructMember *&);
-void  operator<<= (CORBA::Any &, const CORBA::StructMemberSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::StructMemberSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::StructMemberSeq *&);
-void  operator<<= (CORBA::Any &, const CORBA::Initializer &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::Initializer*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::Initializer *&);
-void  operator<<= (CORBA::Any &, const CORBA::InitializerSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::InitializerSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::InitializerSeq *&);
-void  operator<<= (CORBA::Any &, const CORBA::UnionMember &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::UnionMember*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::UnionMember *&);
-void  operator<<= (CORBA::Any &, const CORBA::UnionMemberSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::UnionMemberSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::UnionMemberSeq *&);
-void  operator<<= (CORBA::Any &, const CORBA::EnumMemberSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::EnumMemberSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::EnumMemberSeq *&);
-extern CORBA::Container_ptr (*_TAO_collocation_CORBA_Container_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::Container
-void  operator<<= (CORBA::Any &, CORBA::Container_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::Container *&);
-void  operator<<= (CORBA::Any &, const CORBA::Container::Description &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::Container::Description*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::Container::Description *&);
-void  operator<<= (CORBA::Any &, const CORBA::Container::DescriptionSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::Container::DescriptionSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::Container::DescriptionSeq *&);
-extern CORBA::IDLType_ptr (*_TAO_collocation_CORBA_IDLType_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::IDLType
-void  operator<<= (CORBA::Any &, CORBA::IDLType_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::IDLType *&);
-void  operator<<= (CORBA::Any &, CORBA::PrimitiveKind);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::PrimitiveKind &);
-extern CORBA::Repository_ptr (*_TAO_collocation_CORBA_Repository_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::Repository
-void  operator<<= (CORBA::Any &, CORBA::Repository_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::Repository *&);
-extern CORBA::ModuleDef_ptr (*_TAO_collocation_CORBA_ModuleDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::ModuleDef
-void  operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ModuleDef *&);
-void  operator<<= (CORBA::Any &, const CORBA::ModuleDescription &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ModuleDescription*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ModuleDescription *&);
-extern CORBA::ConstantDef_ptr (*_TAO_collocation_CORBA_ConstantDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::ConstantDef
-void  operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ConstantDef *&);
-void  operator<<= (CORBA::Any &, const CORBA::ConstantDescription &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ConstantDescription*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ConstantDescription *&);
-extern CORBA::TypedefDef_ptr (*_TAO_collocation_CORBA_TypedefDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::TypedefDef
-void  operator<<= (CORBA::Any &, CORBA::TypedefDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::TypedefDef *&);
-void  operator<<= (CORBA::Any &, const CORBA::TypeDescription &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::TypeDescription*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::TypeDescription *&);
-extern CORBA::StructDef_ptr (*_TAO_collocation_CORBA_StructDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::StructDef
-void  operator<<= (CORBA::Any &, CORBA::StructDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::StructDef *&);
-extern CORBA::UnionDef_ptr (*_TAO_collocation_CORBA_UnionDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::UnionDef
-void  operator<<= (CORBA::Any &, CORBA::UnionDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::UnionDef *&);
-extern CORBA::EnumDef_ptr (*_TAO_collocation_CORBA_EnumDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::EnumDef
-void  operator<<= (CORBA::Any &, CORBA::EnumDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::EnumDef *&);
-extern CORBA::AliasDef_ptr (*_TAO_collocation_CORBA_AliasDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::AliasDef
-void  operator<<= (CORBA::Any &, CORBA::AliasDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::AliasDef *&);
-extern CORBA::PrimitiveDef_ptr (*_TAO_collocation_CORBA_PrimitiveDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::PrimitiveDef
-void  operator<<= (CORBA::Any &, CORBA::PrimitiveDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::PrimitiveDef *&);
-extern CORBA::StringDef_ptr (*_TAO_collocation_CORBA_StringDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::StringDef
-void  operator<<= (CORBA::Any &, CORBA::StringDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::StringDef *&);
-extern CORBA::WstringDef_ptr (*_TAO_collocation_CORBA_WstringDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::WstringDef
-void  operator<<= (CORBA::Any &, CORBA::WstringDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::WstringDef *&);
-extern CORBA::FixedDef_ptr (*_TAO_collocation_CORBA_FixedDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::FixedDef
-void  operator<<= (CORBA::Any &, CORBA::FixedDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::FixedDef *&);
-extern CORBA::SequenceDef_ptr (*_TAO_collocation_CORBA_SequenceDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::SequenceDef
-void  operator<<= (CORBA::Any &, CORBA::SequenceDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::SequenceDef *&);
-extern CORBA::ArrayDef_ptr (*_TAO_collocation_CORBA_ArrayDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::ArrayDef
-void  operator<<= (CORBA::Any &, CORBA::ArrayDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ArrayDef *&);
-extern CORBA::ExceptionDef_ptr (*_TAO_collocation_CORBA_ExceptionDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::ExceptionDef
-void  operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ExceptionDef *&);
-void  operator<<= (CORBA::Any &, const CORBA::ExceptionDescription &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ExceptionDescription*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ExceptionDescription *&);
-void  operator<<= (CORBA::Any &, CORBA::AttributeMode);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::AttributeMode &);
-extern CORBA::AttributeDef_ptr (*_TAO_collocation_CORBA_AttributeDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::AttributeDef
-void  operator<<= (CORBA::Any &, CORBA::AttributeDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::AttributeDef *&);
-void  operator<<= (CORBA::Any &, const CORBA::AttributeDescription &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::AttributeDescription*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::AttributeDescription *&);
-void  operator<<= (CORBA::Any &, CORBA::OperationMode);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::OperationMode &);
-void  operator<<= (CORBA::Any &, CORBA::ParameterMode);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ParameterMode &);
-void  operator<<= (CORBA::Any &, const CORBA::ParameterDescription &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ParameterDescription*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ParameterDescription *&);
-void  operator<<= (CORBA::Any &, const CORBA::ParDescriptionSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ParDescriptionSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ParDescriptionSeq *&);
-void  operator<<= (CORBA::Any &, const CORBA::ContextIdSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ContextIdSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ContextIdSeq *&);
-void  operator<<= (CORBA::Any &, const CORBA::ExceptionDefSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ExceptionDefSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ExceptionDefSeq *&);
-void  operator<<= (CORBA::Any &, const CORBA::ExcDescriptionSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ExcDescriptionSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ExcDescriptionSeq *&);
-extern CORBA::OperationDef_ptr (*_TAO_collocation_CORBA_OperationDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::OperationDef
-void  operator<<= (CORBA::Any &, CORBA::OperationDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::OperationDef *&);
-void  operator<<= (CORBA::Any &, const CORBA::OperationDescription &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::OperationDescription*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::OperationDescription *&);
-void  operator<<= (CORBA::Any &, const CORBA::RepositoryIdSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::RepositoryIdSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::RepositoryIdSeq *&);
-void  operator<<= (CORBA::Any &, const CORBA::OpDescriptionSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::OpDescriptionSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::OpDescriptionSeq *&);
-void  operator<<= (CORBA::Any &, const CORBA::AttrDescriptionSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::AttrDescriptionSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::AttrDescriptionSeq *&);
-extern CORBA::InterfaceDef_ptr (*_TAO_collocation_CORBA_InterfaceDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::InterfaceDef
-void  operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::InterfaceDef *&);
-void  operator<<= (CORBA::Any &, const CORBA::InterfaceDef::FullInterfaceDescription &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::InterfaceDef::FullInterfaceDescription*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::InterfaceDef::FullInterfaceDescription *&);
-void  operator<<= (CORBA::Any &, const CORBA::InterfaceDescription &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::InterfaceDescription*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::InterfaceDescription *&);
-void  operator<<= (CORBA::Any &, const CORBA::ValueMember &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ValueMember*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ValueMember *&);
-void  operator<<= (CORBA::Any &, const CORBA::ValueMemberSeq &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ValueMemberSeq*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ValueMemberSeq *&);
-extern CORBA::ValueMemberDef_ptr (*_TAO_collocation_CORBA_ValueMemberDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::ValueMemberDef
-void  operator<<= (CORBA::Any &, CORBA::ValueMemberDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ValueMemberDef *&);
-extern CORBA::ValueDef_ptr (*_TAO_collocation_CORBA_ValueDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::ValueDef
-void  operator<<= (CORBA::Any &, CORBA::ValueDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ValueDef *&);
-void  operator<<= (CORBA::Any &, const CORBA::ValueDef::FullValueDescription &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ValueDef::FullValueDescription*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ValueDef::FullValueDescription *&);
-void  operator<<= (CORBA::Any &, const CORBA::ValueDescription &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ValueDescription*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ValueDescription *&);
-extern CORBA::ValueBoxDef_ptr (*_TAO_collocation_CORBA_ValueBoxDef_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface CORBA::ValueBoxDef
-void  operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ValueBoxDef *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::DefinitionKind &); // 
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::DefinitionKind &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::IRObject_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::IRObject_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::Contained_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::Contained_ptr &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::Contained::Description &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::Contained::Description &);
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::InterfaceDefSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::InterfaceDefSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueDefSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueDefSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ContainedSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ContainedSeq &
-  );
-
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::StructMember &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::StructMember &);
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::StructMemberSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::StructMemberSeq &
-  );
-
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::Initializer &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::Initializer &);
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::InitializerSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::InitializerSeq &
-  );
-
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::UnionMember &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::UnionMember &);
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::UnionMemberSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::UnionMemberSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::EnumMemberSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::EnumMemberSeq &
-  );
-
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::Container_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::Container_ptr &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::Container::Description &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::Container::Description &);
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::Container::DescriptionSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::Container::DescriptionSeq &
-  );
-
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::IDLType_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::IDLType_ptr &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::PrimitiveKind &); // 
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::PrimitiveKind &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::Repository_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::Repository_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::ModuleDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::ModuleDef_ptr &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::ModuleDescription &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::ModuleDescription &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::ConstantDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::ConstantDef_ptr &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::ConstantDescription &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::ConstantDescription &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::TypedefDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::TypedefDef_ptr &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::TypeDescription &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::TypeDescription &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::StructDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::StructDef_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::UnionDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::UnionDef_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::EnumDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::EnumDef_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::AliasDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::AliasDef_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::PrimitiveDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::PrimitiveDef_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::StringDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::StringDef_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::WstringDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::WstringDef_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::FixedDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::FixedDef_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::SequenceDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::SequenceDef_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::ArrayDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::ArrayDef_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::ExceptionDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::ExceptionDef_ptr &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::ExceptionDescription &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::ExceptionDescription &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::AttributeMode &); // 
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::AttributeMode &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::AttributeDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::AttributeDef_ptr &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::AttributeDescription &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::AttributeDescription &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::OperationMode &); // 
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::OperationMode &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::ParameterMode &); // 
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::ParameterDescription &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::ParameterDescription &);
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ParDescriptionSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ParDescriptionSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ContextIdSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ContextIdSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExceptionDefSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ExceptionDefSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExcDescriptionSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ExcDescriptionSeq &
-  );
-
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::OperationDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::OperationDef_ptr &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::OperationDescription &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::OperationDescription &);
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::RepositoryIdSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::RepositoryIdSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::OpDescriptionSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::OpDescriptionSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AttrDescriptionSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::AttrDescriptionSeq &
-  );
-
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::InterfaceDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::InterfaceDef_ptr &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::InterfaceDef::FullInterfaceDescription &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::InterfaceDef::FullInterfaceDescription &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::InterfaceDescription &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::InterfaceDescription &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::ValueMember &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::ValueMember &);
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueMemberSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueMemberSeq &
-  );
-
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::ValueMemberDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::ValueMemberDef_ptr &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::ValueDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::ValueDef_ptr &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::ValueDef::FullValueDescription &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::ValueDef::FullValueDescription &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::ValueDescription &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::ValueDescription &);
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &, const CORBA::ValueBoxDef_ptr );
-CORBA::Boolean 
-operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &);
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "InterfaceC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/InterfaceC.i b/TAO/tao/InterfaceC.i
deleted file mode 100644
index 446336e3ad0..00000000000
--- a/TAO/tao/InterfaceC.i
+++ /dev/null
@@ -1,14854 +0,0 @@
-/* -*- C++ -*- */
-//$Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-ACE_INLINE
-CORBA::IRObject::CORBA_IRObject (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::IRObject::CORBA_IRObject (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::IRObject::~CORBA_IRObject (void) // destructor
-{}
-
-
-#if !defined (_CORBA_IROBJECT___VAR_CI_)
-#define _CORBA_IROBJECT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::IRObject_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::IRObject_var::CORBA_IRObject_var (void) // default constructor
-  : ptr_ (CORBA::IRObject::_nil ())
-{}
-
-ACE_INLINE
-CORBA::IRObject_var::CORBA_IRObject_var (CORBA::IRObject_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::IRObject_ptr 
-CORBA::IRObject_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::IRObject_var::CORBA_IRObject_var (const CORBA::IRObject_var &p) // copy constructor
-  : ptr_ (CORBA::IRObject::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::IRObject_var::~CORBA_IRObject_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::IRObject_var &
-CORBA::IRObject_var::operator= (CORBA::IRObject_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::IRObject_var &
-CORBA::IRObject_var::operator= (const CORBA::IRObject_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::IRObject::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::IRObject_var::operator const CORBA::IRObject_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::IRObject_var::operator CORBA::IRObject_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IRObject_ptr 
-CORBA::IRObject_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IRObject_ptr
-CORBA::IRObject_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IRObject_ptr &
-CORBA::IRObject_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IRObject_ptr &
-CORBA::IRObject_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::IRObject::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IRObject_ptr 
-CORBA::IRObject_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::IRObject_ptr val = this->ptr_;
-  this->ptr_ = CORBA::IRObject::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_IROBJECT___OUT_CI_)
-#define _CORBA_IROBJECT___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::IRObject_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::IRObject_out::CORBA_IRObject_out (CORBA::IRObject_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::IRObject::_nil ();
-}
-
-ACE_INLINE
-CORBA::IRObject_out::CORBA_IRObject_out (CORBA::IRObject_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::IRObject::_nil ();
-}
-
-ACE_INLINE
-CORBA::IRObject_out::CORBA_IRObject_out (const CORBA::IRObject_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::IRObject_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::IRObject_out &
-CORBA::IRObject_out::operator= (const CORBA::IRObject_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::IRObject_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::IRObject_out &
-CORBA::IRObject_out::operator= (const CORBA::IRObject_var &p)
-{
-  this->ptr_ = CORBA::IRObject::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::IRObject_out &
-CORBA::IRObject_out::operator= (CORBA::IRObject_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::IRObject_out::operator CORBA::IRObject_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IRObject_ptr &
-CORBA::IRObject_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IRObject_ptr 
-CORBA::IRObject_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::Contained::CORBA_Contained (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::Contained::CORBA_Contained (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::Contained::~CORBA_Contained (void) // destructor
-{}
-
-
-#if !defined (_CORBA_CONTAINED___VAR_CI_)
-#define _CORBA_CONTAINED___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::Contained_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Contained_var::CORBA_Contained_var (void) // default constructor
-  : ptr_ (CORBA::Contained::_nil ())
-{}
-
-ACE_INLINE
-CORBA::Contained_var::CORBA_Contained_var (CORBA::Contained_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::Contained_ptr 
-CORBA::Contained_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Contained_var::CORBA_Contained_var (const CORBA::Contained_var &p) // copy constructor
-  : ptr_ (CORBA::Contained::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::Contained_var::~CORBA_Contained_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::Contained_var &
-CORBA::Contained_var::operator= (CORBA::Contained_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::Contained_var &
-CORBA::Contained_var::operator= (const CORBA::Contained_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::Contained::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Contained_var::operator const CORBA::Contained_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Contained_var::operator CORBA::Contained_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained_ptr 
-CORBA::Contained_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained_ptr
-CORBA::Contained_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained_ptr &
-CORBA::Contained_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained_ptr &
-CORBA::Contained_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Contained::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained_ptr 
-CORBA::Contained_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::Contained_ptr val = this->ptr_;
-  this->ptr_ = CORBA::Contained::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINED___OUT_CI_)
-#define _CORBA_CONTAINED___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::Contained_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Contained_out::CORBA_Contained_out (CORBA::Contained_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::Contained::_nil ();
-}
-
-ACE_INLINE
-CORBA::Contained_out::CORBA_Contained_out (CORBA::Contained_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Contained::_nil ();
-}
-
-ACE_INLINE
-CORBA::Contained_out::CORBA_Contained_out (const CORBA::Contained_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::Contained_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::Contained_out &
-CORBA::Contained_out::operator= (const CORBA::Contained_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::Contained_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Contained_out &
-CORBA::Contained_out::operator= (const CORBA::Contained_var &p)
-{
-  this->ptr_ = CORBA::Contained::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::Contained_out &
-CORBA::Contained_out::operator= (CORBA::Contained_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Contained_out::operator CORBA::Contained_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained_ptr &
-CORBA::Contained_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained_ptr 
-CORBA::Contained_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::Contained::Description_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Contained::Description_var::Description_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::Contained::Description_var::Description_var (CORBA::Contained::Description *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::Contained::Description_var::Description_var (const CORBA::Contained::Description_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::Contained::Description(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Contained::Description_var::~Description_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained::Description_var &
-CORBA::Contained::Description_var::operator= (CORBA::Contained::Description *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::Contained::Description_var &
-CORBA::Contained::Description_var::operator= (const CORBA::Contained::Description_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::Contained::Description (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::Contained::Description *
-CORBA::Contained::Description_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained::Description *
-CORBA::Contained::Description_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Contained::Description_var::operator const CORBA::Contained::Description &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Contained::Description_var::operator CORBA::Contained::Description &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Contained::Description_var::operator CORBA::Contained::Description &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::Contained::Description &
-CORBA::Contained::Description_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained::Description &
-CORBA::Contained::Description_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::Contained::Description *&
-CORBA::Contained::Description_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained::Description *
-CORBA::Contained::Description_var::_retn (void)
-{
-  CORBA::Contained::Description *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::Contained::Description *
-CORBA::Contained::Description_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Contained::Description_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Contained::Description_out::Description_out (CORBA::Contained::Description *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Contained::Description_out::Description_out (CORBA::Contained::Description_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Contained::Description_out::Description_out (const CORBA::Contained::Description_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::Contained::Description_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::Contained::Description_out &
-CORBA::Contained::Description_out::operator= (const CORBA::Contained::Description_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::Contained::Description_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Contained::Description_out &
-CORBA::Contained::Description_out::operator= (CORBA::Contained::Description *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Contained::Description_out::operator CORBA::Contained::Description *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained::Description *&
-CORBA::Contained::Description_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Contained::Description *
-CORBA::Contained::Description_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CI_
-
-  ACE_INLINE CORBA::InterfaceDef **
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-  {
-    CORBA::InterfaceDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA::InterfaceDef*[nelems], 0);
-    
-    for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA::InterfaceDef::_nil ();
-    
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (CORBA::InterfaceDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::InterfaceDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::InterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
-    CORBA::InterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA::InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::InterfaceDef::_duplicate (tmp2[i]);
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      CORBA::InterfaceDef **tmp = ACE_reinterpret_cast (CORBA::InterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA::InterfaceDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::InterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA::InterfaceDef **, this->buffer_);
-    CORBA::InterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA::InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::InterfaceDef::_duplicate (tmp2[i]);
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA::InterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA::InterfaceDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE CORBA::InterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::InterfaceDef **result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::InterfaceDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::InterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::InterfaceDef ** ACE_CAST_CONST, this->buffer_);
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INTERFACEDEFSEQ_CI_)
-#define _CORBA_INTERFACEDEFSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::CORBA_InterfaceDefSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::CORBA_InterfaceDefSeq_var (CORBA::InterfaceDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::CORBA_InterfaceDefSeq_var (const CORBA::InterfaceDefSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::InterfaceDefSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::~CORBA_InterfaceDefSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDefSeq_var &
-CORBA::InterfaceDefSeq_var::operator= (CORBA::InterfaceDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::InterfaceDefSeq_var &
-CORBA::InterfaceDefSeq_var::operator= (const CORBA::InterfaceDefSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::InterfaceDefSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::InterfaceDefSeq *
-CORBA::InterfaceDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDefSeq *
-CORBA::InterfaceDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDefSeq_var::operator const CORBA::InterfaceDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDefSeq_var::operator CORBA::InterfaceDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDefSeq_var::operator CORBA::InterfaceDefSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var> 
-CORBA::InterfaceDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::InterfaceDefSeq &
-CORBA::InterfaceDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDefSeq &
-CORBA::InterfaceDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::InterfaceDefSeq *&
-CORBA::InterfaceDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDefSeq *
-CORBA::InterfaceDefSeq_var::_retn (void)
-{
-  CORBA::InterfaceDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::InterfaceDefSeq *
-CORBA::InterfaceDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_out::CORBA_InterfaceDefSeq_out (CORBA::InterfaceDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_out::CORBA_InterfaceDefSeq_out (CORBA::InterfaceDefSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_out::CORBA_InterfaceDefSeq_out (const CORBA::InterfaceDefSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::InterfaceDefSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::InterfaceDefSeq_out &
-CORBA::InterfaceDefSeq_out::operator= (const CORBA::InterfaceDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::InterfaceDefSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::InterfaceDefSeq_out &
-CORBA::InterfaceDefSeq_out::operator= (CORBA::InterfaceDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDefSeq_out::operator CORBA::InterfaceDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDefSeq *&
-CORBA::InterfaceDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDefSeq *
-CORBA::InterfaceDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var> 
-CORBA::InterfaceDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CI_
-
-  ACE_INLINE CORBA::ValueDef **
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (CORBA::ULong nelems)
-  {
-    CORBA::ValueDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA::ValueDef*[nelems], 0);
-    
-    for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA::ValueDef::_nil ();
-    
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (CORBA::ValueDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ValueDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ValueDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
-    CORBA::ValueDef ** const tmp2 = ACE_reinterpret_cast (CORBA::ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::ValueDef::_duplicate (tmp2[i]);
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      CORBA::ValueDef **tmp = ACE_reinterpret_cast (CORBA::ValueDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA::ValueDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::ValueDef **tmp1 = ACE_reinterpret_cast (CORBA::ValueDef **, this->buffer_);
-    CORBA::ValueDef ** const tmp2 = ACE_reinterpret_cast (CORBA::ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::ValueDef::_duplicate (tmp2[i]);
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA::ValueDef ** const tmp = ACE_reinterpret_cast (CORBA::ValueDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE CORBA::ValueDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ValueDef **result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::ValueDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::ValueDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ValueDef ** ACE_CAST_CONST, this->buffer_);
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEDEFSEQ_CI_)
-#define _CORBA_VALUEDEFSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDefSeq_var::CORBA_ValueDefSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ValueDefSeq_var::CORBA_ValueDefSeq_var (CORBA::ValueDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ValueDefSeq_var::CORBA_ValueDefSeq_var (const CORBA::ValueDefSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ValueDefSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDefSeq_var::~CORBA_ValueDefSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDefSeq_var &
-CORBA::ValueDefSeq_var::operator= (CORBA::ValueDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueDefSeq_var &
-CORBA::ValueDefSeq_var::operator= (const CORBA::ValueDefSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ValueDefSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ValueDefSeq *
-CORBA::ValueDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDefSeq *
-CORBA::ValueDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueDefSeq_var::operator const CORBA::ValueDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueDefSeq_var::operator CORBA::ValueDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueDefSeq_var::operator CORBA::ValueDefSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var> 
-CORBA::ValueDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::ValueDefSeq &
-CORBA::ValueDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDefSeq &
-CORBA::ValueDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ValueDefSeq *&
-CORBA::ValueDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDefSeq *
-CORBA::ValueDefSeq_var::_retn (void)
-{
-  CORBA::ValueDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ValueDefSeq *
-CORBA::ValueDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDefSeq_out::CORBA_ValueDefSeq_out (CORBA::ValueDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDefSeq_out::CORBA_ValueDefSeq_out (CORBA::ValueDefSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDefSeq_out::CORBA_ValueDefSeq_out (const CORBA::ValueDefSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ValueDefSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ValueDefSeq_out &
-CORBA::ValueDefSeq_out::operator= (const CORBA::ValueDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ValueDefSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueDefSeq_out &
-CORBA::ValueDefSeq_out::operator= (CORBA::ValueDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueDefSeq_out::operator CORBA::ValueDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDefSeq *&
-CORBA::ValueDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDefSeq *
-CORBA::ValueDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var> 
-CORBA::ValueDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_
-
-  ACE_INLINE CORBA::Contained **
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (CORBA::ULong nelems)
-  {
-    CORBA::Contained **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA::Contained*[nelems], 0);
-    
-    for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA::Contained::_nil ();
-    
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (CORBA::Contained **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Contained* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::Contained **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
-    CORBA::Contained ** const tmp2 = ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::Contained::_duplicate (tmp2[i]);
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      CORBA::Contained **tmp = ACE_reinterpret_cast (CORBA::Contained **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA::Contained::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::Contained **tmp1 = ACE_reinterpret_cast (CORBA::Contained **, this->buffer_);
-    CORBA::Contained ** const tmp2 = ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::Contained::_duplicate (tmp2[i]);
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA::Contained ** const tmp = ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE CORBA::Contained* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::Contained **result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::Contained**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::Contained* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::Contained ** ACE_CAST_CONST, this->buffer_);
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_CONTAINEDSEQ_CI_)
-#define _CORBA_CONTAINEDSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ContainedSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContainedSeq_var::CORBA_ContainedSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::CORBA_ContainedSeq_var (CORBA::ContainedSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::CORBA_ContainedSeq_var (const CORBA::ContainedSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ContainedSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::~CORBA_ContainedSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ContainedSeq_var &
-CORBA::ContainedSeq_var::operator= (CORBA::ContainedSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ContainedSeq_var &
-CORBA::ContainedSeq_var::operator= (const CORBA::ContainedSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ContainedSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ContainedSeq_var::operator const CORBA::ContainedSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ContainedSeq_var::operator CORBA::ContainedSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ContainedSeq_var::operator CORBA::ContainedSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> 
-CORBA::ContainedSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::ContainedSeq &
-CORBA::ContainedSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ContainedSeq &
-CORBA::ContainedSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ContainedSeq *&
-CORBA::ContainedSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::_retn (void)
-{
-  CORBA::ContainedSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ContainedSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContainedSeq_out::CORBA_ContainedSeq_out (CORBA::ContainedSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_out::CORBA_ContainedSeq_out (CORBA::ContainedSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_out::CORBA_ContainedSeq_out (const CORBA::ContainedSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ContainedSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ContainedSeq_out &
-CORBA::ContainedSeq_out::operator= (const CORBA::ContainedSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ContainedSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ContainedSeq_out &
-CORBA::ContainedSeq_out::operator= (CORBA::ContainedSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ContainedSeq_out::operator CORBA::ContainedSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContainedSeq *&
-CORBA::ContainedSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContainedSeq *
-CORBA::ContainedSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> 
-CORBA::ContainedSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::StructMember_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::StructMember_var::CORBA_StructMember_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::StructMember_var::CORBA_StructMember_var (CORBA::StructMember *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::StructMember_var::CORBA_StructMember_var (const CORBA::StructMember_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::StructMember(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StructMember_var::~CORBA_StructMember_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMember_var &
-CORBA::StructMember_var::operator= (CORBA::StructMember *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::StructMember_var &
-CORBA::StructMember_var::operator= (const CORBA::StructMember_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::StructMember (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::StructMember *
-CORBA::StructMember_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMember *
-CORBA::StructMember_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::StructMember_var::operator const CORBA::StructMember &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::StructMember_var::operator CORBA::StructMember &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::StructMember_var::operator CORBA::StructMember &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::StructMember &
-CORBA::StructMember_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMember &
-CORBA::StructMember_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::StructMember *&
-CORBA::StructMember_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMember *
-CORBA::StructMember_var::_retn (void)
-{
-  CORBA::StructMember *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::StructMember *
-CORBA::StructMember_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::StructMember_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::StructMember_out::CORBA_StructMember_out (CORBA::StructMember *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StructMember_out::CORBA_StructMember_out (CORBA::StructMember_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StructMember_out::CORBA_StructMember_out (const CORBA::StructMember_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::StructMember_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::StructMember_out &
-CORBA::StructMember_out::operator= (const CORBA::StructMember_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::StructMember_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::StructMember_out &
-CORBA::StructMember_out::operator= (CORBA::StructMember *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::StructMember_out::operator CORBA::StructMember *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMember *&
-CORBA::StructMember_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMember *
-CORBA::StructMember_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::StructMember *
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::StructMember[size];
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (CORBA::StructMember *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::StructMember *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::StructMember *tmp1 = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (this->maximum_);
-    CORBA::StructMember * const tmp2 = ACE_reinterpret_cast (CORBA::StructMember * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::StructMember *tmp = ACE_reinterpret_cast (CORBA::StructMember *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::StructMember *tmp1 = ACE_reinterpret_cast (CORBA::StructMember *, this->buffer_);
-    CORBA::StructMember * const tmp2 = ACE_reinterpret_cast (CORBA::StructMember * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::StructMember &
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::StructMember* tmp = ACE_reinterpret_cast(CORBA::StructMember*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::StructMember &
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::StructMember * const tmp = ACE_reinterpret_cast (CORBA::StructMember* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::StructMember *
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::StructMember *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::StructMember*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::StructMember*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::StructMember *
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::StructMember * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::StructMember *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::StructMember *tmp = ACE_reinterpret_cast(CORBA::StructMember*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ_CI_)
-#define _CORBA_STRUCTMEMBERSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::StructMemberSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::StructMemberSeq_var::CORBA_StructMemberSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::StructMemberSeq_var::CORBA_StructMemberSeq_var (CORBA::StructMemberSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::StructMemberSeq_var::CORBA_StructMemberSeq_var (const CORBA::StructMemberSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::StructMemberSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StructMemberSeq_var::~CORBA_StructMemberSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMemberSeq_var &
-CORBA::StructMemberSeq_var::operator= (CORBA::StructMemberSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::StructMemberSeq_var &
-CORBA::StructMemberSeq_var::operator= (const CORBA::StructMemberSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::StructMemberSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::StructMemberSeq *
-CORBA::StructMemberSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMemberSeq *
-CORBA::StructMemberSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::StructMemberSeq_var::operator const CORBA::StructMemberSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::StructMemberSeq_var::operator CORBA::StructMemberSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::StructMemberSeq_var::operator CORBA::StructMemberSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMember &
-CORBA::StructMemberSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::StructMemberSeq &
-CORBA::StructMemberSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMemberSeq &
-CORBA::StructMemberSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::StructMemberSeq *&
-CORBA::StructMemberSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMemberSeq *
-CORBA::StructMemberSeq_var::_retn (void)
-{
-  CORBA::StructMemberSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::StructMemberSeq *
-CORBA::StructMemberSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::StructMemberSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::StructMemberSeq_out::CORBA_StructMemberSeq_out (CORBA::StructMemberSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StructMemberSeq_out::CORBA_StructMemberSeq_out (CORBA::StructMemberSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StructMemberSeq_out::CORBA_StructMemberSeq_out (const CORBA::StructMemberSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::StructMemberSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::StructMemberSeq_out &
-CORBA::StructMemberSeq_out::operator= (const CORBA::StructMemberSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::StructMemberSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::StructMemberSeq_out &
-CORBA::StructMemberSeq_out::operator= (CORBA::StructMemberSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::StructMemberSeq_out::operator CORBA::StructMemberSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMemberSeq *&
-CORBA::StructMemberSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMemberSeq *
-CORBA::StructMemberSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructMember &
-CORBA::StructMemberSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::Initializer_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Initializer_var::CORBA_Initializer_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::Initializer_var::CORBA_Initializer_var (CORBA::Initializer *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::Initializer_var::CORBA_Initializer_var (const CORBA::Initializer_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::Initializer(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Initializer_var::~CORBA_Initializer_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::Initializer_var &
-CORBA::Initializer_var::operator= (CORBA::Initializer *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::Initializer_var &
-CORBA::Initializer_var::operator= (const CORBA::Initializer_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::Initializer (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::Initializer *
-CORBA::Initializer_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Initializer *
-CORBA::Initializer_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Initializer_var::operator const CORBA::Initializer &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Initializer_var::operator CORBA::Initializer &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Initializer_var::operator CORBA::Initializer &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::Initializer &
-CORBA::Initializer_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Initializer &
-CORBA::Initializer_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::Initializer *&
-CORBA::Initializer_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Initializer *
-CORBA::Initializer_var::_retn (void)
-{
-  CORBA::Initializer *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::Initializer *
-CORBA::Initializer_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Initializer_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Initializer_out::CORBA_Initializer_out (CORBA::Initializer *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Initializer_out::CORBA_Initializer_out (CORBA::Initializer_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Initializer_out::CORBA_Initializer_out (const CORBA::Initializer_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::Initializer_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::Initializer_out &
-CORBA::Initializer_out::operator= (const CORBA::Initializer_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::Initializer_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Initializer_out &
-CORBA::Initializer_out::operator= (CORBA::Initializer *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Initializer_out::operator CORBA::Initializer *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Initializer *&
-CORBA::Initializer_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Initializer *
-CORBA::Initializer_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::Initializer *
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::Initializer[size];
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (CORBA::Initializer *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Initializer *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::Initializer *tmp1 = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (this->maximum_);
-    CORBA::Initializer * const tmp2 = ACE_reinterpret_cast (CORBA::Initializer * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_InitializerSeq &
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::Initializer *tmp = ACE_reinterpret_cast (CORBA::Initializer *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::Initializer *tmp1 = ACE_reinterpret_cast (CORBA::Initializer *, this->buffer_);
-    CORBA::Initializer * const tmp2 = ACE_reinterpret_cast (CORBA::Initializer * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::Initializer &
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::Initializer* tmp = ACE_reinterpret_cast(CORBA::Initializer*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::Initializer &
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::Initializer * const tmp = ACE_reinterpret_cast (CORBA::Initializer* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::Initializer *
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::Initializer *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::Initializer*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::Initializer*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::Initializer *
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::Initializer * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::Initializer *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::Initializer *tmp = ACE_reinterpret_cast(CORBA::Initializer*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INITIALIZERSEQ_CI_)
-#define _CORBA_INITIALIZERSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::InitializerSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::InitializerSeq_var::CORBA_InitializerSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::InitializerSeq_var::CORBA_InitializerSeq_var (CORBA::InitializerSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::InitializerSeq_var::CORBA_InitializerSeq_var (const CORBA::InitializerSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::InitializerSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InitializerSeq_var::~CORBA_InitializerSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::InitializerSeq_var &
-CORBA::InitializerSeq_var::operator= (CORBA::InitializerSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::InitializerSeq_var &
-CORBA::InitializerSeq_var::operator= (const CORBA::InitializerSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::InitializerSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::InitializerSeq *
-CORBA::InitializerSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InitializerSeq *
-CORBA::InitializerSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InitializerSeq_var::operator const CORBA::InitializerSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InitializerSeq_var::operator CORBA::InitializerSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InitializerSeq_var::operator CORBA::InitializerSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Initializer &
-CORBA::InitializerSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::InitializerSeq &
-CORBA::InitializerSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::InitializerSeq &
-CORBA::InitializerSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::InitializerSeq *&
-CORBA::InitializerSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InitializerSeq *
-CORBA::InitializerSeq_var::_retn (void)
-{
-  CORBA::InitializerSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::InitializerSeq *
-CORBA::InitializerSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::InitializerSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::InitializerSeq_out::CORBA_InitializerSeq_out (CORBA::InitializerSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InitializerSeq_out::CORBA_InitializerSeq_out (CORBA::InitializerSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InitializerSeq_out::CORBA_InitializerSeq_out (const CORBA::InitializerSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::InitializerSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::InitializerSeq_out &
-CORBA::InitializerSeq_out::operator= (const CORBA::InitializerSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::InitializerSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::InitializerSeq_out &
-CORBA::InitializerSeq_out::operator= (CORBA::InitializerSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::InitializerSeq_out::operator CORBA::InitializerSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InitializerSeq *&
-CORBA::InitializerSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InitializerSeq *
-CORBA::InitializerSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Initializer &
-CORBA::InitializerSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::UnionMember_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::UnionMember_var::CORBA_UnionMember_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::UnionMember_var::CORBA_UnionMember_var (CORBA::UnionMember *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::UnionMember_var::CORBA_UnionMember_var (const CORBA::UnionMember_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::UnionMember(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::UnionMember_var::~CORBA_UnionMember_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMember_var &
-CORBA::UnionMember_var::operator= (CORBA::UnionMember *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::UnionMember_var &
-CORBA::UnionMember_var::operator= (const CORBA::UnionMember_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::UnionMember (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::UnionMember *
-CORBA::UnionMember_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMember *
-CORBA::UnionMember_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::UnionMember_var::operator const CORBA::UnionMember &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::UnionMember_var::operator CORBA::UnionMember &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::UnionMember_var::operator CORBA::UnionMember &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::UnionMember &
-CORBA::UnionMember_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMember &
-CORBA::UnionMember_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::UnionMember *&
-CORBA::UnionMember_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMember *
-CORBA::UnionMember_var::_retn (void)
-{
-  CORBA::UnionMember *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::UnionMember *
-CORBA::UnionMember_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::UnionMember_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::UnionMember_out::CORBA_UnionMember_out (CORBA::UnionMember *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::UnionMember_out::CORBA_UnionMember_out (CORBA::UnionMember_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::UnionMember_out::CORBA_UnionMember_out (const CORBA::UnionMember_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::UnionMember_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::UnionMember_out &
-CORBA::UnionMember_out::operator= (const CORBA::UnionMember_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::UnionMember_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::UnionMember_out &
-CORBA::UnionMember_out::operator= (CORBA::UnionMember *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::UnionMember_out::operator CORBA::UnionMember *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMember *&
-CORBA::UnionMember_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMember *
-CORBA::UnionMember_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::UnionMember *
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::UnionMember[size];
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (CORBA::UnionMember *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::UnionMember *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::UnionMember *tmp1 = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (this->maximum_);
-    CORBA::UnionMember * const tmp2 = ACE_reinterpret_cast (CORBA::UnionMember * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::UnionMember *tmp = ACE_reinterpret_cast (CORBA::UnionMember *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::UnionMember *tmp1 = ACE_reinterpret_cast (CORBA::UnionMember *, this->buffer_);
-    CORBA::UnionMember * const tmp2 = ACE_reinterpret_cast (CORBA::UnionMember * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::UnionMember &
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::UnionMember* tmp = ACE_reinterpret_cast(CORBA::UnionMember*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::UnionMember &
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::UnionMember * const tmp = ACE_reinterpret_cast (CORBA::UnionMember* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::UnionMember *
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::UnionMember *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::UnionMember*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::UnionMember*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::UnionMember *
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::UnionMember * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::UnionMember *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::UnionMember *tmp = ACE_reinterpret_cast(CORBA::UnionMember*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_UNIONMEMBERSEQ_CI_)
-#define _CORBA_UNIONMEMBERSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::UnionMemberSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var::CORBA_UnionMemberSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var::CORBA_UnionMemberSeq_var (CORBA::UnionMemberSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var::CORBA_UnionMemberSeq_var (const CORBA::UnionMemberSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::UnionMemberSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var::~CORBA_UnionMemberSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMemberSeq_var &
-CORBA::UnionMemberSeq_var::operator= (CORBA::UnionMemberSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::UnionMemberSeq_var &
-CORBA::UnionMemberSeq_var::operator= (const CORBA::UnionMemberSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::UnionMemberSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::UnionMemberSeq *
-CORBA::UnionMemberSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMemberSeq *
-CORBA::UnionMemberSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::UnionMemberSeq_var::operator const CORBA::UnionMemberSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::UnionMemberSeq_var::operator CORBA::UnionMemberSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::UnionMemberSeq_var::operator CORBA::UnionMemberSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMember &
-CORBA::UnionMemberSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::UnionMemberSeq &
-CORBA::UnionMemberSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMemberSeq &
-CORBA::UnionMemberSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::UnionMemberSeq *&
-CORBA::UnionMemberSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMemberSeq *
-CORBA::UnionMemberSeq_var::_retn (void)
-{
-  CORBA::UnionMemberSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::UnionMemberSeq *
-CORBA::UnionMemberSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::UnionMemberSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::UnionMemberSeq_out::CORBA_UnionMemberSeq_out (CORBA::UnionMemberSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_out::CORBA_UnionMemberSeq_out (CORBA::UnionMemberSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_out::CORBA_UnionMemberSeq_out (const CORBA::UnionMemberSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::UnionMemberSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::UnionMemberSeq_out &
-CORBA::UnionMemberSeq_out::operator= (const CORBA::UnionMemberSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::UnionMemberSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::UnionMemberSeq_out &
-CORBA::UnionMemberSeq_out::operator= (CORBA::UnionMemberSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::UnionMemberSeq_out::operator CORBA::UnionMemberSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMemberSeq *&
-CORBA::UnionMemberSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMemberSeq *
-CORBA::UnionMemberSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionMember &
-CORBA::UnionMemberSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ENUMMEMBERSEQ_CI_)
-#define _CORBA_ENUMMEMBERSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::EnumMemberSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var::CORBA_EnumMemberSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var::CORBA_EnumMemberSeq_var (CORBA::EnumMemberSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var::CORBA_EnumMemberSeq_var (const CORBA::EnumMemberSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::EnumMemberSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var::~CORBA_EnumMemberSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumMemberSeq_var &
-CORBA::EnumMemberSeq_var::operator= (CORBA::EnumMemberSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::EnumMemberSeq_var &
-CORBA::EnumMemberSeq_var::operator= (const CORBA::EnumMemberSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::EnumMemberSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::EnumMemberSeq *
-CORBA::EnumMemberSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumMemberSeq *
-CORBA::EnumMemberSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::EnumMemberSeq_var::operator const CORBA::EnumMemberSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::EnumMemberSeq_var::operator CORBA::EnumMemberSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::EnumMemberSeq_var::operator CORBA::EnumMemberSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager 
-CORBA::EnumMemberSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::EnumMemberSeq &
-CORBA::EnumMemberSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumMemberSeq &
-CORBA::EnumMemberSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::EnumMemberSeq *&
-CORBA::EnumMemberSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumMemberSeq *
-CORBA::EnumMemberSeq_var::_retn (void)
-{
-  CORBA::EnumMemberSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::EnumMemberSeq *
-CORBA::EnumMemberSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::EnumMemberSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::EnumMemberSeq_out::CORBA_EnumMemberSeq_out (CORBA::EnumMemberSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_out::CORBA_EnumMemberSeq_out (CORBA::EnumMemberSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_out::CORBA_EnumMemberSeq_out (const CORBA::EnumMemberSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::EnumMemberSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::EnumMemberSeq_out &
-CORBA::EnumMemberSeq_out::operator= (const CORBA::EnumMemberSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::EnumMemberSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::EnumMemberSeq_out &
-CORBA::EnumMemberSeq_out::operator= (CORBA::EnumMemberSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::EnumMemberSeq_out::operator CORBA::EnumMemberSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumMemberSeq *&
-CORBA::EnumMemberSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumMemberSeq *
-CORBA::EnumMemberSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager 
-CORBA::EnumMemberSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::Container::CORBA_Container (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::Container::CORBA_Container (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::Container::~CORBA_Container (void) // destructor
-{}
-
-
-#if !defined (_CORBA_CONTAINER___VAR_CI_)
-#define _CORBA_CONTAINER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::Container_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Container_var::CORBA_Container_var (void) // default constructor
-  : ptr_ (CORBA::Container::_nil ())
-{}
-
-ACE_INLINE
-CORBA::Container_var::CORBA_Container_var (CORBA::Container_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::Container_ptr 
-CORBA::Container_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Container_var::CORBA_Container_var (const CORBA::Container_var &p) // copy constructor
-  : ptr_ (CORBA::Container::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::Container_var::~CORBA_Container_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::Container_var &
-CORBA::Container_var::operator= (CORBA::Container_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::Container_var &
-CORBA::Container_var::operator= (const CORBA::Container_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::Container::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Container_var::operator const CORBA::Container_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Container_var::operator CORBA::Container_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container_ptr 
-CORBA::Container_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container_ptr
-CORBA::Container_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container_ptr &
-CORBA::Container_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container_ptr &
-CORBA::Container_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Container::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container_ptr 
-CORBA::Container_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::Container_ptr val = this->ptr_;
-  this->ptr_ = CORBA::Container::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTAINER___OUT_CI_)
-#define _CORBA_CONTAINER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::Container_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Container_out::CORBA_Container_out (CORBA::Container_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::Container::_nil ();
-}
-
-ACE_INLINE
-CORBA::Container_out::CORBA_Container_out (CORBA::Container_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Container::_nil ();
-}
-
-ACE_INLINE
-CORBA::Container_out::CORBA_Container_out (const CORBA::Container_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::Container_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::Container_out &
-CORBA::Container_out::operator= (const CORBA::Container_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::Container_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Container_out &
-CORBA::Container_out::operator= (const CORBA::Container_var &p)
-{
-  this->ptr_ = CORBA::Container::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::Container_out &
-CORBA::Container_out::operator= (CORBA::Container_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Container_out::operator CORBA::Container_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container_ptr &
-CORBA::Container_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container_ptr 
-CORBA::Container_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::Container::Description_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Container::Description_var::Description_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::Container::Description_var::Description_var (CORBA::Container::Description *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::Container::Description_var::Description_var (const CORBA::Container::Description_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::Container::Description(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Container::Description_var::~Description_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::Description_var &
-CORBA::Container::Description_var::operator= (CORBA::Container::Description *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::Container::Description_var &
-CORBA::Container::Description_var::operator= (const CORBA::Container::Description_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::Container::Description (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::Container::Description *
-CORBA::Container::Description_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::Description *
-CORBA::Container::Description_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Container::Description_var::operator const CORBA::Container::Description &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Container::Description_var::operator CORBA::Container::Description &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Container::Description_var::operator CORBA::Container::Description &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::Container::Description &
-CORBA::Container::Description_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::Description &
-CORBA::Container::Description_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::Container::Description *&
-CORBA::Container::Description_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::Description *
-CORBA::Container::Description_var::_retn (void)
-{
-  CORBA::Container::Description *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::Container::Description *
-CORBA::Container::Description_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Container::Description_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Container::Description_out::Description_out (CORBA::Container::Description *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Container::Description_out::Description_out (CORBA::Container::Description_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Container::Description_out::Description_out (const CORBA::Container::Description_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::Container::Description_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::Container::Description_out &
-CORBA::Container::Description_out::operator= (const CORBA::Container::Description_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::Container::Description_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Container::Description_out &
-CORBA::Container::Description_out::operator= (CORBA::Container::Description *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Container::Description_out::operator CORBA::Container::Description *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::Description *&
-CORBA::Container::Description_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::Description *
-CORBA::Container::Description_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::Container::Description *
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::Container::Description[size];
-  }
-  
-  ACE_INLINE void CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (CORBA::Container::Description *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Container::Description *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (const CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::Container::Description *tmp1 = CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (this->maximum_);
-    CORBA::Container::Description * const tmp2 = ACE_reinterpret_cast (CORBA::Container::Description * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator= (const CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::Container::Description *tmp = ACE_reinterpret_cast (CORBA::Container::Description *, this->buffer_);
-        CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
-        this->buffer_ = CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::Container::Description *tmp1 = ACE_reinterpret_cast (CORBA::Container::Description *, this->buffer_);
-    CORBA::Container::Description * const tmp2 = ACE_reinterpret_cast (CORBA::Container::Description * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::Container::Description &
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::Container::Description* tmp = ACE_reinterpret_cast(CORBA::Container::Description*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::Container::Description &
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::Container::Description * const tmp = ACE_reinterpret_cast (CORBA::Container::Description* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::Container::Description *
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::Container::Description *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::Container::Description*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::Container::Description*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::Container::Description *
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::Container::Description * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::Container::Description *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::Container::Description *tmp = ACE_reinterpret_cast(CORBA::Container::Description*,this->buffer_);
-      CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CI_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::Container::DescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::DescriptionSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::DescriptionSeq_var (CORBA::Container::DescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::DescriptionSeq_var (const CORBA::Container::DescriptionSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::Container::DescriptionSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::~DescriptionSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::DescriptionSeq_var &
-CORBA::Container::DescriptionSeq_var::operator= (CORBA::Container::DescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::Container::DescriptionSeq_var &
-CORBA::Container::DescriptionSeq_var::operator= (const CORBA::Container::DescriptionSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::Container::DescriptionSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Container::DescriptionSeq_var::operator const CORBA::Container::DescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Container::DescriptionSeq_var::operator CORBA::Container::DescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Container::DescriptionSeq_var::operator CORBA::Container::DescriptionSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::Description &
-CORBA::Container::DescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::Container::DescriptionSeq &
-CORBA::Container::DescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::DescriptionSeq &
-CORBA::Container::DescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::Container::DescriptionSeq *&
-CORBA::Container::DescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::_retn (void)
-{
-  CORBA::Container::DescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Container::DescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_out::DescriptionSeq_out (CORBA::Container::DescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_out::DescriptionSeq_out (CORBA::Container::DescriptionSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_out::DescriptionSeq_out (const CORBA::Container::DescriptionSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::Container::DescriptionSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::Container::DescriptionSeq_out &
-CORBA::Container::DescriptionSeq_out::operator= (const CORBA::Container::DescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::Container::DescriptionSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Container::DescriptionSeq_out &
-CORBA::Container::DescriptionSeq_out::operator= (CORBA::Container::DescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Container::DescriptionSeq_out::operator CORBA::Container::DescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::DescriptionSeq *&
-CORBA::Container::DescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Container::Description &
-CORBA::Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::IDLType::CORBA_IDLType (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::IDLType::CORBA_IDLType (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::IDLType::~CORBA_IDLType (void) // destructor
-{}
-
-
-#if !defined (_CORBA_IDLTYPE___VAR_CI_)
-#define _CORBA_IDLTYPE___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::IDLType_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::IDLType_var::CORBA_IDLType_var (void) // default constructor
-  : ptr_ (CORBA::IDLType::_nil ())
-{}
-
-ACE_INLINE
-CORBA::IDLType_var::CORBA_IDLType_var (CORBA::IDLType_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::IDLType_ptr 
-CORBA::IDLType_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::IDLType_var::CORBA_IDLType_var (const CORBA::IDLType_var &p) // copy constructor
-  : ptr_ (CORBA::IDLType::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::IDLType_var::~CORBA_IDLType_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::IDLType_var &
-CORBA::IDLType_var::operator= (CORBA::IDLType_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::IDLType_var &
-CORBA::IDLType_var::operator= (const CORBA::IDLType_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::IDLType::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::IDLType_var::operator const CORBA::IDLType_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::IDLType_var::operator CORBA::IDLType_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IDLType_ptr 
-CORBA::IDLType_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IDLType_ptr
-CORBA::IDLType_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IDLType_ptr &
-CORBA::IDLType_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IDLType_ptr &
-CORBA::IDLType_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::IDLType::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IDLType_ptr 
-CORBA::IDLType_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::IDLType_ptr val = this->ptr_;
-  this->ptr_ = CORBA::IDLType::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_IDLTYPE___OUT_CI_)
-#define _CORBA_IDLTYPE___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::IDLType_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::IDLType_out::CORBA_IDLType_out (CORBA::IDLType_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::IDLType::_nil ();
-}
-
-ACE_INLINE
-CORBA::IDLType_out::CORBA_IDLType_out (CORBA::IDLType_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::IDLType::_nil ();
-}
-
-ACE_INLINE
-CORBA::IDLType_out::CORBA_IDLType_out (const CORBA::IDLType_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::IDLType_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::IDLType_out &
-CORBA::IDLType_out::operator= (const CORBA::IDLType_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::IDLType_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::IDLType_out &
-CORBA::IDLType_out::operator= (const CORBA::IDLType_var &p)
-{
-  this->ptr_ = CORBA::IDLType::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::IDLType_out &
-CORBA::IDLType_out::operator= (CORBA::IDLType_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::IDLType_out::operator CORBA::IDLType_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IDLType_ptr &
-CORBA::IDLType_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::IDLType_ptr 
-CORBA::IDLType_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::Repository::CORBA_Repository (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::Repository::CORBA_Repository (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::Repository::~CORBA_Repository (void) // destructor
-{}
-
-
-#if !defined (_CORBA_REPOSITORY___VAR_CI_)
-#define _CORBA_REPOSITORY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::Repository_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Repository_var::CORBA_Repository_var (void) // default constructor
-  : ptr_ (CORBA::Repository::_nil ())
-{}
-
-ACE_INLINE
-CORBA::Repository_var::CORBA_Repository_var (CORBA::Repository_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::Repository_ptr 
-CORBA::Repository_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Repository_var::CORBA_Repository_var (const CORBA::Repository_var &p) // copy constructor
-  : ptr_ (CORBA::Repository::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::Repository_var::~CORBA_Repository_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::Repository_var &
-CORBA::Repository_var::operator= (CORBA::Repository_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::Repository_var &
-CORBA::Repository_var::operator= (const CORBA::Repository_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::Repository::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Repository_var::operator const CORBA::Repository_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::Repository_var::operator CORBA::Repository_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Repository_ptr 
-CORBA::Repository_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Repository_ptr
-CORBA::Repository_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Repository_ptr &
-CORBA::Repository_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Repository_ptr &
-CORBA::Repository_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Repository::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Repository_ptr 
-CORBA::Repository_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::Repository_ptr val = this->ptr_;
-  this->ptr_ = CORBA::Repository::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_REPOSITORY___OUT_CI_)
-#define _CORBA_REPOSITORY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::Repository_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Repository_out::CORBA_Repository_out (CORBA::Repository_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::Repository::_nil ();
-}
-
-ACE_INLINE
-CORBA::Repository_out::CORBA_Repository_out (CORBA::Repository_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Repository::_nil ();
-}
-
-ACE_INLINE
-CORBA::Repository_out::CORBA_Repository_out (const CORBA::Repository_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::Repository_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::Repository_out &
-CORBA::Repository_out::operator= (const CORBA::Repository_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::Repository_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Repository_out &
-CORBA::Repository_out::operator= (const CORBA::Repository_var &p)
-{
-  this->ptr_ = CORBA::Repository::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::Repository_out &
-CORBA::Repository_out::operator= (CORBA::Repository_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Repository_out::operator CORBA::Repository_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Repository_ptr &
-CORBA::Repository_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Repository_ptr 
-CORBA::Repository_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::ModuleDef::CORBA_ModuleDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::ModuleDef::CORBA_ModuleDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::ModuleDef::~CORBA_ModuleDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_MODULEDEF___VAR_CI_)
-#define _CORBA_MODULEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ModuleDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ModuleDef_var::CORBA_ModuleDef_var (void) // default constructor
-  : ptr_ (CORBA::ModuleDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::ModuleDef_var::CORBA_ModuleDef_var (CORBA::ModuleDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::ModuleDef_ptr 
-CORBA::ModuleDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ModuleDef_var::CORBA_ModuleDef_var (const CORBA::ModuleDef_var &p) // copy constructor
-  : ptr_ (CORBA::ModuleDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::ModuleDef_var::~CORBA_ModuleDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::ModuleDef_var &
-CORBA::ModuleDef_var::operator= (CORBA::ModuleDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ModuleDef_var &
-CORBA::ModuleDef_var::operator= (const CORBA::ModuleDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::ModuleDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ModuleDef_var::operator const CORBA::ModuleDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ModuleDef_var::operator CORBA::ModuleDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDef_ptr 
-CORBA::ModuleDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDef_ptr
-CORBA::ModuleDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDef_ptr &
-CORBA::ModuleDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDef_ptr &
-CORBA::ModuleDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ModuleDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDef_ptr 
-CORBA::ModuleDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::ModuleDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::ModuleDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_MODULEDEF___OUT_CI_)
-#define _CORBA_MODULEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ModuleDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ModuleDef_out::CORBA_ModuleDef_out (CORBA::ModuleDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::ModuleDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ModuleDef_out::CORBA_ModuleDef_out (CORBA::ModuleDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ModuleDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ModuleDef_out::CORBA_ModuleDef_out (const CORBA::ModuleDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ModuleDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ModuleDef_out &
-CORBA::ModuleDef_out::operator= (const CORBA::ModuleDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ModuleDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ModuleDef_out &
-CORBA::ModuleDef_out::operator= (const CORBA::ModuleDef_var &p)
-{
-  this->ptr_ = CORBA::ModuleDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::ModuleDef_out &
-CORBA::ModuleDef_out::operator= (CORBA::ModuleDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ModuleDef_out::operator CORBA::ModuleDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDef_ptr &
-CORBA::ModuleDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDef_ptr 
-CORBA::ModuleDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::ModuleDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ModuleDescription_var::CORBA_ModuleDescription_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ModuleDescription_var::CORBA_ModuleDescription_var (CORBA::ModuleDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ModuleDescription_var::CORBA_ModuleDescription_var (const CORBA::ModuleDescription_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ModuleDescription(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ModuleDescription_var::~CORBA_ModuleDescription_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDescription_var &
-CORBA::ModuleDescription_var::operator= (CORBA::ModuleDescription *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ModuleDescription_var &
-CORBA::ModuleDescription_var::operator= (const CORBA::ModuleDescription_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ModuleDescription (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ModuleDescription *
-CORBA::ModuleDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDescription *
-CORBA::ModuleDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ModuleDescription_var::operator const CORBA::ModuleDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ModuleDescription_var::operator CORBA::ModuleDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ModuleDescription_var::operator CORBA::ModuleDescription &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::ModuleDescription &
-CORBA::ModuleDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDescription &
-CORBA::ModuleDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ModuleDescription *&
-CORBA::ModuleDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDescription *
-CORBA::ModuleDescription_var::_retn (void)
-{
-  CORBA::ModuleDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ModuleDescription *
-CORBA::ModuleDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ModuleDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ModuleDescription_out::CORBA_ModuleDescription_out (CORBA::ModuleDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ModuleDescription_out::CORBA_ModuleDescription_out (CORBA::ModuleDescription_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ModuleDescription_out::CORBA_ModuleDescription_out (const CORBA::ModuleDescription_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ModuleDescription_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ModuleDescription_out &
-CORBA::ModuleDescription_out::operator= (const CORBA::ModuleDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ModuleDescription_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ModuleDescription_out &
-CORBA::ModuleDescription_out::operator= (CORBA::ModuleDescription *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ModuleDescription_out::operator CORBA::ModuleDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDescription *&
-CORBA::ModuleDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ModuleDescription *
-CORBA::ModuleDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ConstantDef::CORBA_ConstantDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::ConstantDef::CORBA_ConstantDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::ConstantDef::~CORBA_ConstantDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_CONSTANTDEF___VAR_CI_)
-#define _CORBA_CONSTANTDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ConstantDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ConstantDef_var::CORBA_ConstantDef_var (void) // default constructor
-  : ptr_ (CORBA::ConstantDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::ConstantDef_var::CORBA_ConstantDef_var (CORBA::ConstantDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::ConstantDef_ptr 
-CORBA::ConstantDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ConstantDef_var::CORBA_ConstantDef_var (const CORBA::ConstantDef_var &p) // copy constructor
-  : ptr_ (CORBA::ConstantDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::ConstantDef_var::~CORBA_ConstantDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::ConstantDef_var &
-CORBA::ConstantDef_var::operator= (CORBA::ConstantDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ConstantDef_var &
-CORBA::ConstantDef_var::operator= (const CORBA::ConstantDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::ConstantDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ConstantDef_var::operator const CORBA::ConstantDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ConstantDef_var::operator CORBA::ConstantDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDef_ptr 
-CORBA::ConstantDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDef_ptr
-CORBA::ConstantDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDef_ptr &
-CORBA::ConstantDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDef_ptr &
-CORBA::ConstantDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ConstantDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDef_ptr 
-CORBA::ConstantDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::ConstantDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::ConstantDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTANTDEF___OUT_CI_)
-#define _CORBA_CONSTANTDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ConstantDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ConstantDef_out::CORBA_ConstantDef_out (CORBA::ConstantDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::ConstantDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ConstantDef_out::CORBA_ConstantDef_out (CORBA::ConstantDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ConstantDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ConstantDef_out::CORBA_ConstantDef_out (const CORBA::ConstantDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ConstantDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ConstantDef_out &
-CORBA::ConstantDef_out::operator= (const CORBA::ConstantDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ConstantDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ConstantDef_out &
-CORBA::ConstantDef_out::operator= (const CORBA::ConstantDef_var &p)
-{
-  this->ptr_ = CORBA::ConstantDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::ConstantDef_out &
-CORBA::ConstantDef_out::operator= (CORBA::ConstantDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ConstantDef_out::operator CORBA::ConstantDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDef_ptr &
-CORBA::ConstantDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDef_ptr 
-CORBA::ConstantDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::ConstantDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ConstantDescription_var::CORBA_ConstantDescription_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ConstantDescription_var::CORBA_ConstantDescription_var (CORBA::ConstantDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ConstantDescription_var::CORBA_ConstantDescription_var (const CORBA::ConstantDescription_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ConstantDescription(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ConstantDescription_var::~CORBA_ConstantDescription_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDescription_var &
-CORBA::ConstantDescription_var::operator= (CORBA::ConstantDescription *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ConstantDescription_var &
-CORBA::ConstantDescription_var::operator= (const CORBA::ConstantDescription_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ConstantDescription (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ConstantDescription *
-CORBA::ConstantDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDescription *
-CORBA::ConstantDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ConstantDescription_var::operator const CORBA::ConstantDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ConstantDescription_var::operator CORBA::ConstantDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ConstantDescription_var::operator CORBA::ConstantDescription &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::ConstantDescription &
-CORBA::ConstantDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDescription &
-CORBA::ConstantDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ConstantDescription *&
-CORBA::ConstantDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDescription *
-CORBA::ConstantDescription_var::_retn (void)
-{
-  CORBA::ConstantDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ConstantDescription *
-CORBA::ConstantDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ConstantDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ConstantDescription_out::CORBA_ConstantDescription_out (CORBA::ConstantDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ConstantDescription_out::CORBA_ConstantDescription_out (CORBA::ConstantDescription_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ConstantDescription_out::CORBA_ConstantDescription_out (const CORBA::ConstantDescription_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ConstantDescription_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ConstantDescription_out &
-CORBA::ConstantDescription_out::operator= (const CORBA::ConstantDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ConstantDescription_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ConstantDescription_out &
-CORBA::ConstantDescription_out::operator= (CORBA::ConstantDescription *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ConstantDescription_out::operator CORBA::ConstantDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDescription *&
-CORBA::ConstantDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ConstantDescription *
-CORBA::ConstantDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::TypedefDef::CORBA_TypedefDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::TypedefDef::CORBA_TypedefDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::TypedefDef::~CORBA_TypedefDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_TYPEDEFDEF___VAR_CI_)
-#define _CORBA_TYPEDEFDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::TypedefDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::TypedefDef_var::CORBA_TypedefDef_var (void) // default constructor
-  : ptr_ (CORBA::TypedefDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::TypedefDef_var::CORBA_TypedefDef_var (CORBA::TypedefDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::TypedefDef_ptr 
-CORBA::TypedefDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::TypedefDef_var::CORBA_TypedefDef_var (const CORBA::TypedefDef_var &p) // copy constructor
-  : ptr_ (CORBA::TypedefDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::TypedefDef_var::~CORBA_TypedefDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::TypedefDef_var &
-CORBA::TypedefDef_var::operator= (CORBA::TypedefDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::TypedefDef_var &
-CORBA::TypedefDef_var::operator= (const CORBA::TypedefDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::TypedefDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::TypedefDef_var::operator const CORBA::TypedefDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::TypedefDef_var::operator CORBA::TypedefDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypedefDef_ptr 
-CORBA::TypedefDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypedefDef_ptr
-CORBA::TypedefDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypedefDef_ptr &
-CORBA::TypedefDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypedefDef_ptr &
-CORBA::TypedefDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::TypedefDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypedefDef_ptr 
-CORBA::TypedefDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::TypedefDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::TypedefDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_TYPEDEFDEF___OUT_CI_)
-#define _CORBA_TYPEDEFDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::TypedefDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::TypedefDef_out::CORBA_TypedefDef_out (CORBA::TypedefDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::TypedefDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::TypedefDef_out::CORBA_TypedefDef_out (CORBA::TypedefDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::TypedefDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::TypedefDef_out::CORBA_TypedefDef_out (const CORBA::TypedefDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::TypedefDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::TypedefDef_out &
-CORBA::TypedefDef_out::operator= (const CORBA::TypedefDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::TypedefDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::TypedefDef_out &
-CORBA::TypedefDef_out::operator= (const CORBA::TypedefDef_var &p)
-{
-  this->ptr_ = CORBA::TypedefDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::TypedefDef_out &
-CORBA::TypedefDef_out::operator= (CORBA::TypedefDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::TypedefDef_out::operator CORBA::TypedefDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypedefDef_ptr &
-CORBA::TypedefDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypedefDef_ptr 
-CORBA::TypedefDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::TypeDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::TypeDescription_var::CORBA_TypeDescription_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::TypeDescription_var::CORBA_TypeDescription_var (CORBA::TypeDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::TypeDescription_var::CORBA_TypeDescription_var (const CORBA::TypeDescription_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::TypeDescription(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::TypeDescription_var::~CORBA_TypeDescription_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeDescription_var &
-CORBA::TypeDescription_var::operator= (CORBA::TypeDescription *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::TypeDescription_var &
-CORBA::TypeDescription_var::operator= (const CORBA::TypeDescription_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::TypeDescription (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::TypeDescription *
-CORBA::TypeDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeDescription *
-CORBA::TypeDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::TypeDescription_var::operator const CORBA::TypeDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::TypeDescription_var::operator CORBA::TypeDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::TypeDescription_var::operator CORBA::TypeDescription &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::TypeDescription &
-CORBA::TypeDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeDescription &
-CORBA::TypeDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::TypeDescription *&
-CORBA::TypeDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeDescription *
-CORBA::TypeDescription_var::_retn (void)
-{
-  CORBA::TypeDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::TypeDescription *
-CORBA::TypeDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::TypeDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::TypeDescription_out::CORBA_TypeDescription_out (CORBA::TypeDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::TypeDescription_out::CORBA_TypeDescription_out (CORBA::TypeDescription_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::TypeDescription_out::CORBA_TypeDescription_out (const CORBA::TypeDescription_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::TypeDescription_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::TypeDescription_out &
-CORBA::TypeDescription_out::operator= (const CORBA::TypeDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::TypeDescription_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::TypeDescription_out &
-CORBA::TypeDescription_out::operator= (CORBA::TypeDescription *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::TypeDescription_out::operator CORBA::TypeDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeDescription *&
-CORBA::TypeDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeDescription *
-CORBA::TypeDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructDef::CORBA_StructDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::StructDef::CORBA_StructDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::StructDef::~CORBA_StructDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_STRUCTDEF___VAR_CI_)
-#define _CORBA_STRUCTDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::StructDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::StructDef_var::CORBA_StructDef_var (void) // default constructor
-  : ptr_ (CORBA::StructDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::StructDef_var::CORBA_StructDef_var (CORBA::StructDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::StructDef_ptr 
-CORBA::StructDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructDef_var::CORBA_StructDef_var (const CORBA::StructDef_var &p) // copy constructor
-  : ptr_ (CORBA::StructDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::StructDef_var::~CORBA_StructDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::StructDef_var &
-CORBA::StructDef_var::operator= (CORBA::StructDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::StructDef_var &
-CORBA::StructDef_var::operator= (const CORBA::StructDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::StructDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::StructDef_var::operator const CORBA::StructDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::StructDef_var::operator CORBA::StructDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructDef_ptr 
-CORBA::StructDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructDef_ptr
-CORBA::StructDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructDef_ptr &
-CORBA::StructDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructDef_ptr &
-CORBA::StructDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::StructDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructDef_ptr 
-CORBA::StructDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::StructDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::StructDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRUCTDEF___OUT_CI_)
-#define _CORBA_STRUCTDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::StructDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::StructDef_out::CORBA_StructDef_out (CORBA::StructDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::StructDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::StructDef_out::CORBA_StructDef_out (CORBA::StructDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::StructDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::StructDef_out::CORBA_StructDef_out (const CORBA::StructDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::StructDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::StructDef_out &
-CORBA::StructDef_out::operator= (const CORBA::StructDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::StructDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::StructDef_out &
-CORBA::StructDef_out::operator= (const CORBA::StructDef_var &p)
-{
-  this->ptr_ = CORBA::StructDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::StructDef_out &
-CORBA::StructDef_out::operator= (CORBA::StructDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::StructDef_out::operator CORBA::StructDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructDef_ptr &
-CORBA::StructDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StructDef_ptr 
-CORBA::StructDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::UnionDef::CORBA_UnionDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::UnionDef::CORBA_UnionDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::UnionDef::~CORBA_UnionDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_UNIONDEF___VAR_CI_)
-#define _CORBA_UNIONDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::UnionDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::UnionDef_var::CORBA_UnionDef_var (void) // default constructor
-  : ptr_ (CORBA::UnionDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::UnionDef_var::CORBA_UnionDef_var (CORBA::UnionDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::UnionDef_ptr 
-CORBA::UnionDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::UnionDef_var::CORBA_UnionDef_var (const CORBA::UnionDef_var &p) // copy constructor
-  : ptr_ (CORBA::UnionDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::UnionDef_var::~CORBA_UnionDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::UnionDef_var &
-CORBA::UnionDef_var::operator= (CORBA::UnionDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::UnionDef_var &
-CORBA::UnionDef_var::operator= (const CORBA::UnionDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::UnionDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::UnionDef_var::operator const CORBA::UnionDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::UnionDef_var::operator CORBA::UnionDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionDef_ptr 
-CORBA::UnionDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionDef_ptr
-CORBA::UnionDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionDef_ptr &
-CORBA::UnionDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionDef_ptr &
-CORBA::UnionDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::UnionDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionDef_ptr 
-CORBA::UnionDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::UnionDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::UnionDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_UNIONDEF___OUT_CI_)
-#define _CORBA_UNIONDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::UnionDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::UnionDef_out::CORBA_UnionDef_out (CORBA::UnionDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::UnionDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::UnionDef_out::CORBA_UnionDef_out (CORBA::UnionDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::UnionDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::UnionDef_out::CORBA_UnionDef_out (const CORBA::UnionDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::UnionDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::UnionDef_out &
-CORBA::UnionDef_out::operator= (const CORBA::UnionDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::UnionDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::UnionDef_out &
-CORBA::UnionDef_out::operator= (const CORBA::UnionDef_var &p)
-{
-  this->ptr_ = CORBA::UnionDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::UnionDef_out &
-CORBA::UnionDef_out::operator= (CORBA::UnionDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::UnionDef_out::operator CORBA::UnionDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionDef_ptr &
-CORBA::UnionDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::UnionDef_ptr 
-CORBA::UnionDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::EnumDef::CORBA_EnumDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::EnumDef::CORBA_EnumDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::EnumDef::~CORBA_EnumDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_ENUMDEF___VAR_CI_)
-#define _CORBA_ENUMDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::EnumDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::EnumDef_var::CORBA_EnumDef_var (void) // default constructor
-  : ptr_ (CORBA::EnumDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::EnumDef_var::CORBA_EnumDef_var (CORBA::EnumDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::EnumDef_ptr 
-CORBA::EnumDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::EnumDef_var::CORBA_EnumDef_var (const CORBA::EnumDef_var &p) // copy constructor
-  : ptr_ (CORBA::EnumDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::EnumDef_var::~CORBA_EnumDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::EnumDef_var &
-CORBA::EnumDef_var::operator= (CORBA::EnumDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::EnumDef_var &
-CORBA::EnumDef_var::operator= (const CORBA::EnumDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::EnumDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::EnumDef_var::operator const CORBA::EnumDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::EnumDef_var::operator CORBA::EnumDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumDef_ptr 
-CORBA::EnumDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumDef_ptr
-CORBA::EnumDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumDef_ptr &
-CORBA::EnumDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumDef_ptr &
-CORBA::EnumDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::EnumDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumDef_ptr 
-CORBA::EnumDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::EnumDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::EnumDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ENUMDEF___OUT_CI_)
-#define _CORBA_ENUMDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::EnumDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::EnumDef_out::CORBA_EnumDef_out (CORBA::EnumDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::EnumDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::EnumDef_out::CORBA_EnumDef_out (CORBA::EnumDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::EnumDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::EnumDef_out::CORBA_EnumDef_out (const CORBA::EnumDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::EnumDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::EnumDef_out &
-CORBA::EnumDef_out::operator= (const CORBA::EnumDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::EnumDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::EnumDef_out &
-CORBA::EnumDef_out::operator= (const CORBA::EnumDef_var &p)
-{
-  this->ptr_ = CORBA::EnumDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::EnumDef_out &
-CORBA::EnumDef_out::operator= (CORBA::EnumDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::EnumDef_out::operator CORBA::EnumDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumDef_ptr &
-CORBA::EnumDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::EnumDef_ptr 
-CORBA::EnumDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::AliasDef::CORBA_AliasDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::AliasDef::CORBA_AliasDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::AliasDef::~CORBA_AliasDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_ALIASDEF___VAR_CI_)
-#define _CORBA_ALIASDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::AliasDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::AliasDef_var::CORBA_AliasDef_var (void) // default constructor
-  : ptr_ (CORBA::AliasDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::AliasDef_var::CORBA_AliasDef_var (CORBA::AliasDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::AliasDef_ptr 
-CORBA::AliasDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AliasDef_var::CORBA_AliasDef_var (const CORBA::AliasDef_var &p) // copy constructor
-  : ptr_ (CORBA::AliasDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::AliasDef_var::~CORBA_AliasDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::AliasDef_var &
-CORBA::AliasDef_var::operator= (CORBA::AliasDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::AliasDef_var &
-CORBA::AliasDef_var::operator= (const CORBA::AliasDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::AliasDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::AliasDef_var::operator const CORBA::AliasDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::AliasDef_var::operator CORBA::AliasDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AliasDef_ptr 
-CORBA::AliasDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AliasDef_ptr
-CORBA::AliasDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AliasDef_ptr &
-CORBA::AliasDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AliasDef_ptr &
-CORBA::AliasDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::AliasDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AliasDef_ptr 
-CORBA::AliasDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::AliasDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::AliasDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ALIASDEF___OUT_CI_)
-#define _CORBA_ALIASDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::AliasDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::AliasDef_out::CORBA_AliasDef_out (CORBA::AliasDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::AliasDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::AliasDef_out::CORBA_AliasDef_out (CORBA::AliasDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::AliasDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::AliasDef_out::CORBA_AliasDef_out (const CORBA::AliasDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::AliasDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::AliasDef_out &
-CORBA::AliasDef_out::operator= (const CORBA::AliasDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::AliasDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::AliasDef_out &
-CORBA::AliasDef_out::operator= (const CORBA::AliasDef_var &p)
-{
-  this->ptr_ = CORBA::AliasDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::AliasDef_out &
-CORBA::AliasDef_out::operator= (CORBA::AliasDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::AliasDef_out::operator CORBA::AliasDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AliasDef_ptr &
-CORBA::AliasDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AliasDef_ptr 
-CORBA::AliasDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::PrimitiveDef::CORBA_PrimitiveDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::PrimitiveDef::CORBA_PrimitiveDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::PrimitiveDef::~CORBA_PrimitiveDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_PRIMITIVEDEF___VAR_CI_)
-#define _CORBA_PRIMITIVEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::PrimitiveDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::PrimitiveDef_var::CORBA_PrimitiveDef_var (void) // default constructor
-  : ptr_ (CORBA::PrimitiveDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::PrimitiveDef_var::CORBA_PrimitiveDef_var (CORBA::PrimitiveDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::PrimitiveDef_ptr 
-CORBA::PrimitiveDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::PrimitiveDef_var::CORBA_PrimitiveDef_var (const CORBA::PrimitiveDef_var &p) // copy constructor
-  : ptr_ (CORBA::PrimitiveDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::PrimitiveDef_var::~CORBA_PrimitiveDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::PrimitiveDef_var &
-CORBA::PrimitiveDef_var::operator= (CORBA::PrimitiveDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::PrimitiveDef_var &
-CORBA::PrimitiveDef_var::operator= (const CORBA::PrimitiveDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::PrimitiveDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::PrimitiveDef_var::operator const CORBA::PrimitiveDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::PrimitiveDef_var::operator CORBA::PrimitiveDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::PrimitiveDef_ptr 
-CORBA::PrimitiveDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::PrimitiveDef_ptr &
-CORBA::PrimitiveDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::PrimitiveDef_ptr &
-CORBA::PrimitiveDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::PrimitiveDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::PrimitiveDef_ptr 
-CORBA::PrimitiveDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::PrimitiveDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::PrimitiveDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PRIMITIVEDEF___OUT_CI_)
-#define _CORBA_PRIMITIVEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::PrimitiveDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::PrimitiveDef_out::CORBA_PrimitiveDef_out (CORBA::PrimitiveDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::PrimitiveDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::PrimitiveDef_out::CORBA_PrimitiveDef_out (CORBA::PrimitiveDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::PrimitiveDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::PrimitiveDef_out::CORBA_PrimitiveDef_out (const CORBA::PrimitiveDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::PrimitiveDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::PrimitiveDef_out &
-CORBA::PrimitiveDef_out::operator= (const CORBA::PrimitiveDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::PrimitiveDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::PrimitiveDef_out &
-CORBA::PrimitiveDef_out::operator= (const CORBA::PrimitiveDef_var &p)
-{
-  this->ptr_ = CORBA::PrimitiveDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::PrimitiveDef_out &
-CORBA::PrimitiveDef_out::operator= (CORBA::PrimitiveDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::PrimitiveDef_out::operator CORBA::PrimitiveDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::PrimitiveDef_ptr &
-CORBA::PrimitiveDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::PrimitiveDef_ptr 
-CORBA::PrimitiveDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::StringDef::CORBA_StringDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::StringDef::CORBA_StringDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::StringDef::~CORBA_StringDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_STRINGDEF___VAR_CI_)
-#define _CORBA_STRINGDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::StringDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::StringDef_var::CORBA_StringDef_var (void) // default constructor
-  : ptr_ (CORBA::StringDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::StringDef_var::CORBA_StringDef_var (CORBA::StringDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::StringDef_ptr 
-CORBA::StringDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StringDef_var::CORBA_StringDef_var (const CORBA::StringDef_var &p) // copy constructor
-  : ptr_ (CORBA::StringDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::StringDef_var::~CORBA_StringDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::StringDef_var &
-CORBA::StringDef_var::operator= (CORBA::StringDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::StringDef_var &
-CORBA::StringDef_var::operator= (const CORBA::StringDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::StringDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::StringDef_var::operator const CORBA::StringDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::StringDef_var::operator CORBA::StringDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StringDef_ptr 
-CORBA::StringDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StringDef_ptr
-CORBA::StringDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StringDef_ptr &
-CORBA::StringDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StringDef_ptr &
-CORBA::StringDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::StringDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StringDef_ptr 
-CORBA::StringDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::StringDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::StringDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRINGDEF___OUT_CI_)
-#define _CORBA_STRINGDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::StringDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::StringDef_out::CORBA_StringDef_out (CORBA::StringDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::StringDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::StringDef_out::CORBA_StringDef_out (CORBA::StringDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::StringDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::StringDef_out::CORBA_StringDef_out (const CORBA::StringDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::StringDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::StringDef_out &
-CORBA::StringDef_out::operator= (const CORBA::StringDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::StringDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::StringDef_out &
-CORBA::StringDef_out::operator= (const CORBA::StringDef_var &p)
-{
-  this->ptr_ = CORBA::StringDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::StringDef_out &
-CORBA::StringDef_out::operator= (CORBA::StringDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::StringDef_out::operator CORBA::StringDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StringDef_ptr &
-CORBA::StringDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::StringDef_ptr 
-CORBA::StringDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::WstringDef::CORBA_WstringDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::WstringDef::CORBA_WstringDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::WstringDef::~CORBA_WstringDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_WSTRINGDEF___VAR_CI_)
-#define _CORBA_WSTRINGDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::WstringDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::WstringDef_var::CORBA_WstringDef_var (void) // default constructor
-  : ptr_ (CORBA::WstringDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::WstringDef_var::CORBA_WstringDef_var (CORBA::WstringDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::WstringDef_ptr 
-CORBA::WstringDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::WstringDef_var::CORBA_WstringDef_var (const CORBA::WstringDef_var &p) // copy constructor
-  : ptr_ (CORBA::WstringDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::WstringDef_var::~CORBA_WstringDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::WstringDef_var &
-CORBA::WstringDef_var::operator= (CORBA::WstringDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::WstringDef_var &
-CORBA::WstringDef_var::operator= (const CORBA::WstringDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::WstringDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::WstringDef_var::operator const CORBA::WstringDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::WstringDef_var::operator CORBA::WstringDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WstringDef_ptr 
-CORBA::WstringDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WstringDef_ptr
-CORBA::WstringDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WstringDef_ptr &
-CORBA::WstringDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WstringDef_ptr &
-CORBA::WstringDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::WstringDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WstringDef_ptr 
-CORBA::WstringDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::WstringDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::WstringDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_WSTRINGDEF___OUT_CI_)
-#define _CORBA_WSTRINGDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::WstringDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::WstringDef_out::CORBA_WstringDef_out (CORBA::WstringDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::WstringDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::WstringDef_out::CORBA_WstringDef_out (CORBA::WstringDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::WstringDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::WstringDef_out::CORBA_WstringDef_out (const CORBA::WstringDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::WstringDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::WstringDef_out &
-CORBA::WstringDef_out::operator= (const CORBA::WstringDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::WstringDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::WstringDef_out &
-CORBA::WstringDef_out::operator= (const CORBA::WstringDef_var &p)
-{
-  this->ptr_ = CORBA::WstringDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::WstringDef_out &
-CORBA::WstringDef_out::operator= (CORBA::WstringDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::WstringDef_out::operator CORBA::WstringDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WstringDef_ptr &
-CORBA::WstringDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WstringDef_ptr 
-CORBA::WstringDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::FixedDef::CORBA_FixedDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::FixedDef::CORBA_FixedDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::FixedDef::~CORBA_FixedDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_FIXEDDEF___VAR_CI_)
-#define _CORBA_FIXEDDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::FixedDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::FixedDef_var::CORBA_FixedDef_var (void) // default constructor
-  : ptr_ (CORBA::FixedDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::FixedDef_var::CORBA_FixedDef_var (CORBA::FixedDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::FixedDef_ptr 
-CORBA::FixedDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::FixedDef_var::CORBA_FixedDef_var (const CORBA::FixedDef_var &p) // copy constructor
-  : ptr_ (CORBA::FixedDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::FixedDef_var::~CORBA_FixedDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::FixedDef_var &
-CORBA::FixedDef_var::operator= (CORBA::FixedDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::FixedDef_var &
-CORBA::FixedDef_var::operator= (const CORBA::FixedDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::FixedDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::FixedDef_var::operator const CORBA::FixedDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::FixedDef_var::operator CORBA::FixedDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::FixedDef_ptr 
-CORBA::FixedDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::FixedDef_ptr
-CORBA::FixedDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::FixedDef_ptr &
-CORBA::FixedDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::FixedDef_ptr &
-CORBA::FixedDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::FixedDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::FixedDef_ptr 
-CORBA::FixedDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::FixedDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::FixedDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_FIXEDDEF___OUT_CI_)
-#define _CORBA_FIXEDDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::FixedDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::FixedDef_out::CORBA_FixedDef_out (CORBA::FixedDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::FixedDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::FixedDef_out::CORBA_FixedDef_out (CORBA::FixedDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::FixedDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::FixedDef_out::CORBA_FixedDef_out (const CORBA::FixedDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::FixedDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::FixedDef_out &
-CORBA::FixedDef_out::operator= (const CORBA::FixedDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::FixedDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::FixedDef_out &
-CORBA::FixedDef_out::operator= (const CORBA::FixedDef_var &p)
-{
-  this->ptr_ = CORBA::FixedDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::FixedDef_out &
-CORBA::FixedDef_out::operator= (CORBA::FixedDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::FixedDef_out::operator CORBA::FixedDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::FixedDef_ptr &
-CORBA::FixedDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::FixedDef_ptr 
-CORBA::FixedDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::SequenceDef::CORBA_SequenceDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::SequenceDef::CORBA_SequenceDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::SequenceDef::~CORBA_SequenceDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_SEQUENCEDEF___VAR_CI_)
-#define _CORBA_SEQUENCEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::SequenceDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::SequenceDef_var::CORBA_SequenceDef_var (void) // default constructor
-  : ptr_ (CORBA::SequenceDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::SequenceDef_var::CORBA_SequenceDef_var (CORBA::SequenceDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::SequenceDef_ptr 
-CORBA::SequenceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::SequenceDef_var::CORBA_SequenceDef_var (const CORBA::SequenceDef_var &p) // copy constructor
-  : ptr_ (CORBA::SequenceDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::SequenceDef_var::~CORBA_SequenceDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::SequenceDef_var &
-CORBA::SequenceDef_var::operator= (CORBA::SequenceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::SequenceDef_var &
-CORBA::SequenceDef_var::operator= (const CORBA::SequenceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::SequenceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::SequenceDef_var::operator const CORBA::SequenceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::SequenceDef_var::operator CORBA::SequenceDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::SequenceDef_ptr 
-CORBA::SequenceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::SequenceDef_ptr
-CORBA::SequenceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::SequenceDef_ptr &
-CORBA::SequenceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::SequenceDef_ptr &
-CORBA::SequenceDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::SequenceDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::SequenceDef_ptr 
-CORBA::SequenceDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::SequenceDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::SequenceDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SEQUENCEDEF___OUT_CI_)
-#define _CORBA_SEQUENCEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::SequenceDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::SequenceDef_out::CORBA_SequenceDef_out (CORBA::SequenceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::SequenceDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::SequenceDef_out::CORBA_SequenceDef_out (CORBA::SequenceDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::SequenceDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::SequenceDef_out::CORBA_SequenceDef_out (const CORBA::SequenceDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::SequenceDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::SequenceDef_out &
-CORBA::SequenceDef_out::operator= (const CORBA::SequenceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::SequenceDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::SequenceDef_out &
-CORBA::SequenceDef_out::operator= (const CORBA::SequenceDef_var &p)
-{
-  this->ptr_ = CORBA::SequenceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::SequenceDef_out &
-CORBA::SequenceDef_out::operator= (CORBA::SequenceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::SequenceDef_out::operator CORBA::SequenceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::SequenceDef_ptr &
-CORBA::SequenceDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::SequenceDef_ptr 
-CORBA::SequenceDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::ArrayDef::CORBA_ArrayDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::ArrayDef::CORBA_ArrayDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::ArrayDef::~CORBA_ArrayDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_ARRAYDEF___VAR_CI_)
-#define _CORBA_ARRAYDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ArrayDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ArrayDef_var::CORBA_ArrayDef_var (void) // default constructor
-  : ptr_ (CORBA::ArrayDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::ArrayDef_var::CORBA_ArrayDef_var (CORBA::ArrayDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::ArrayDef_ptr 
-CORBA::ArrayDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ArrayDef_var::CORBA_ArrayDef_var (const CORBA::ArrayDef_var &p) // copy constructor
-  : ptr_ (CORBA::ArrayDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::ArrayDef_var::~CORBA_ArrayDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::ArrayDef_var &
-CORBA::ArrayDef_var::operator= (CORBA::ArrayDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ArrayDef_var &
-CORBA::ArrayDef_var::operator= (const CORBA::ArrayDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::ArrayDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ArrayDef_var::operator const CORBA::ArrayDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ArrayDef_var::operator CORBA::ArrayDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ArrayDef_ptr 
-CORBA::ArrayDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ArrayDef_ptr
-CORBA::ArrayDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ArrayDef_ptr &
-CORBA::ArrayDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ArrayDef_ptr &
-CORBA::ArrayDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ArrayDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ArrayDef_ptr 
-CORBA::ArrayDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::ArrayDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::ArrayDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ARRAYDEF___OUT_CI_)
-#define _CORBA_ARRAYDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ArrayDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ArrayDef_out::CORBA_ArrayDef_out (CORBA::ArrayDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::ArrayDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ArrayDef_out::CORBA_ArrayDef_out (CORBA::ArrayDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ArrayDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ArrayDef_out::CORBA_ArrayDef_out (const CORBA::ArrayDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ArrayDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ArrayDef_out &
-CORBA::ArrayDef_out::operator= (const CORBA::ArrayDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ArrayDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ArrayDef_out &
-CORBA::ArrayDef_out::operator= (const CORBA::ArrayDef_var &p)
-{
-  this->ptr_ = CORBA::ArrayDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::ArrayDef_out &
-CORBA::ArrayDef_out::operator= (CORBA::ArrayDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ArrayDef_out::operator CORBA::ArrayDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ArrayDef_ptr &
-CORBA::ArrayDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ArrayDef_ptr 
-CORBA::ArrayDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::ExceptionDef::CORBA_ExceptionDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::ExceptionDef::CORBA_ExceptionDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDef::~CORBA_ExceptionDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_EXCEPTIONDEF___VAR_CI_)
-#define _CORBA_EXCEPTIONDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDef_var::CORBA_ExceptionDef_var (void) // default constructor
-  : ptr_ (CORBA::ExceptionDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::ExceptionDef_var::CORBA_ExceptionDef_var (CORBA::ExceptionDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::ExceptionDef_ptr 
-CORBA::ExceptionDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDef_var::CORBA_ExceptionDef_var (const CORBA::ExceptionDef_var &p) // copy constructor
-  : ptr_ (CORBA::ExceptionDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::ExceptionDef_var::~CORBA_ExceptionDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::ExceptionDef_var &
-CORBA::ExceptionDef_var::operator= (CORBA::ExceptionDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ExceptionDef_var &
-CORBA::ExceptionDef_var::operator= (const CORBA::ExceptionDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::ExceptionDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDef_var::operator const CORBA::ExceptionDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDef_var::operator CORBA::ExceptionDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDef_ptr 
-CORBA::ExceptionDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDef_ptr &
-CORBA::ExceptionDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDef_ptr &
-CORBA::ExceptionDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ExceptionDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDef_ptr 
-CORBA::ExceptionDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::ExceptionDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::ExceptionDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_EXCEPTIONDEF___OUT_CI_)
-#define _CORBA_EXCEPTIONDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDef_out::CORBA_ExceptionDef_out (CORBA::ExceptionDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::ExceptionDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ExceptionDef_out::CORBA_ExceptionDef_out (CORBA::ExceptionDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ExceptionDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ExceptionDef_out::CORBA_ExceptionDef_out (const CORBA::ExceptionDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ExceptionDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ExceptionDef_out &
-CORBA::ExceptionDef_out::operator= (const CORBA::ExceptionDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ExceptionDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ExceptionDef_out &
-CORBA::ExceptionDef_out::operator= (const CORBA::ExceptionDef_var &p)
-{
-  this->ptr_ = CORBA::ExceptionDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::ExceptionDef_out &
-CORBA::ExceptionDef_out::operator= (CORBA::ExceptionDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDef_out::operator CORBA::ExceptionDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDef_ptr &
-CORBA::ExceptionDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDef_ptr 
-CORBA::ExceptionDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::CORBA_ExceptionDescription_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::CORBA_ExceptionDescription_var (CORBA::ExceptionDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::CORBA_ExceptionDescription_var (const CORBA::ExceptionDescription_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ExceptionDescription(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::~CORBA_ExceptionDescription_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDescription_var &
-CORBA::ExceptionDescription_var::operator= (CORBA::ExceptionDescription *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ExceptionDescription_var &
-CORBA::ExceptionDescription_var::operator= (const CORBA::ExceptionDescription_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ExceptionDescription (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDescription_var::operator const CORBA::ExceptionDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDescription_var::operator CORBA::ExceptionDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDescription_var::operator CORBA::ExceptionDescription &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::ExceptionDescription &
-CORBA::ExceptionDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDescription &
-CORBA::ExceptionDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ExceptionDescription *&
-CORBA::ExceptionDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::_retn (void)
-{
-  CORBA::ExceptionDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDescription_out::CORBA_ExceptionDescription_out (CORBA::ExceptionDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_out::CORBA_ExceptionDescription_out (CORBA::ExceptionDescription_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_out::CORBA_ExceptionDescription_out (const CORBA::ExceptionDescription_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ExceptionDescription_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ExceptionDescription_out &
-CORBA::ExceptionDescription_out::operator= (const CORBA::ExceptionDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ExceptionDescription_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ExceptionDescription_out &
-CORBA::ExceptionDescription_out::operator= (CORBA::ExceptionDescription *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDescription_out::operator CORBA::ExceptionDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDescription *&
-CORBA::ExceptionDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AttributeDef::CORBA_AttributeDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::AttributeDef::CORBA_AttributeDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::AttributeDef::~CORBA_AttributeDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_ATTRIBUTEDEF___VAR_CI_)
-#define _CORBA_ATTRIBUTEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::AttributeDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::AttributeDef_var::CORBA_AttributeDef_var (void) // default constructor
-  : ptr_ (CORBA::AttributeDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::AttributeDef_var::CORBA_AttributeDef_var (CORBA::AttributeDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::AttributeDef_ptr 
-CORBA::AttributeDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AttributeDef_var::CORBA_AttributeDef_var (const CORBA::AttributeDef_var &p) // copy constructor
-  : ptr_ (CORBA::AttributeDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::AttributeDef_var::~CORBA_AttributeDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::AttributeDef_var &
-CORBA::AttributeDef_var::operator= (CORBA::AttributeDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::AttributeDef_var &
-CORBA::AttributeDef_var::operator= (const CORBA::AttributeDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::AttributeDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::AttributeDef_var::operator const CORBA::AttributeDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::AttributeDef_var::operator CORBA::AttributeDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDef_ptr 
-CORBA::AttributeDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDef_ptr
-CORBA::AttributeDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDef_ptr &
-CORBA::AttributeDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDef_ptr &
-CORBA::AttributeDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::AttributeDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDef_ptr 
-CORBA::AttributeDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::AttributeDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::AttributeDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ATTRIBUTEDEF___OUT_CI_)
-#define _CORBA_ATTRIBUTEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::AttributeDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::AttributeDef_out::CORBA_AttributeDef_out (CORBA::AttributeDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::AttributeDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::AttributeDef_out::CORBA_AttributeDef_out (CORBA::AttributeDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::AttributeDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::AttributeDef_out::CORBA_AttributeDef_out (const CORBA::AttributeDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::AttributeDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::AttributeDef_out &
-CORBA::AttributeDef_out::operator= (const CORBA::AttributeDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::AttributeDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::AttributeDef_out &
-CORBA::AttributeDef_out::operator= (const CORBA::AttributeDef_var &p)
-{
-  this->ptr_ = CORBA::AttributeDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::AttributeDef_out &
-CORBA::AttributeDef_out::operator= (CORBA::AttributeDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::AttributeDef_out::operator CORBA::AttributeDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDef_ptr &
-CORBA::AttributeDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDef_ptr 
-CORBA::AttributeDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::AttributeDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::AttributeDescription_var::CORBA_AttributeDescription_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::AttributeDescription_var::CORBA_AttributeDescription_var (CORBA::AttributeDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::AttributeDescription_var::CORBA_AttributeDescription_var (const CORBA::AttributeDescription_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::AttributeDescription(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AttributeDescription_var::~CORBA_AttributeDescription_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDescription_var &
-CORBA::AttributeDescription_var::operator= (CORBA::AttributeDescription *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::AttributeDescription_var &
-CORBA::AttributeDescription_var::operator= (const CORBA::AttributeDescription_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::AttributeDescription (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::AttributeDescription_var::operator const CORBA::AttributeDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::AttributeDescription_var::operator CORBA::AttributeDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::AttributeDescription_var::operator CORBA::AttributeDescription &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::AttributeDescription &
-CORBA::AttributeDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDescription &
-CORBA::AttributeDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::AttributeDescription *&
-CORBA::AttributeDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::_retn (void)
-{
-  CORBA::AttributeDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::AttributeDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::AttributeDescription_out::CORBA_AttributeDescription_out (CORBA::AttributeDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AttributeDescription_out::CORBA_AttributeDescription_out (CORBA::AttributeDescription_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AttributeDescription_out::CORBA_AttributeDescription_out (const CORBA::AttributeDescription_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::AttributeDescription_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::AttributeDescription_out &
-CORBA::AttributeDescription_out::operator= (const CORBA::AttributeDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::AttributeDescription_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::AttributeDescription_out &
-CORBA::AttributeDescription_out::operator= (CORBA::AttributeDescription *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::AttributeDescription_out::operator CORBA::AttributeDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDescription *&
-CORBA::AttributeDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDescription *
-CORBA::AttributeDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ParameterDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ParameterDescription_var::CORBA_ParameterDescription_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ParameterDescription_var::CORBA_ParameterDescription_var (CORBA::ParameterDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ParameterDescription_var::CORBA_ParameterDescription_var (const CORBA::ParameterDescription_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ParameterDescription(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription_var::~CORBA_ParameterDescription_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ParameterDescription_var &
-CORBA::ParameterDescription_var::operator= (CORBA::ParameterDescription *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ParameterDescription_var &
-CORBA::ParameterDescription_var::operator= (const CORBA::ParameterDescription_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ParameterDescription (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ParameterDescription *
-CORBA::ParameterDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ParameterDescription *
-CORBA::ParameterDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ParameterDescription_var::operator const CORBA::ParameterDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ParameterDescription_var::operator CORBA::ParameterDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ParameterDescription_var::operator CORBA::ParameterDescription &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::ParameterDescription &
-CORBA::ParameterDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ParameterDescription &
-CORBA::ParameterDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ParameterDescription *&
-CORBA::ParameterDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ParameterDescription *
-CORBA::ParameterDescription_var::_retn (void)
-{
-  CORBA::ParameterDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ParameterDescription *
-CORBA::ParameterDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ParameterDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ParameterDescription_out::CORBA_ParameterDescription_out (CORBA::ParameterDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription_out::CORBA_ParameterDescription_out (CORBA::ParameterDescription_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription_out::CORBA_ParameterDescription_out (const CORBA::ParameterDescription_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ParameterDescription_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ParameterDescription_out &
-CORBA::ParameterDescription_out::operator= (const CORBA::ParameterDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ParameterDescription_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ParameterDescription_out &
-CORBA::ParameterDescription_out::operator= (CORBA::ParameterDescription *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ParameterDescription_out::operator CORBA::ParameterDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ParameterDescription *&
-CORBA::ParameterDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ParameterDescription *
-CORBA::ParameterDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::ParameterDescription *
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::ParameterDescription[size];
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (CORBA::ParameterDescription *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ParameterDescription *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ParameterDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (this->maximum_);
-    CORBA::ParameterDescription * const tmp2 = ACE_reinterpret_cast (CORBA::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::ParameterDescription *tmp = ACE_reinterpret_cast (CORBA::ParameterDescription *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::ParameterDescription *tmp1 = ACE_reinterpret_cast (CORBA::ParameterDescription *, this->buffer_);
-    CORBA::ParameterDescription * const tmp2 = ACE_reinterpret_cast (CORBA::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::ParameterDescription &
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ParameterDescription* tmp = ACE_reinterpret_cast(CORBA::ParameterDescription*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::ParameterDescription &
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ParameterDescription * const tmp = ACE_reinterpret_cast (CORBA::ParameterDescription* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::ParameterDescription *
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ParameterDescription *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ParameterDescription*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::ParameterDescription*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::ParameterDescription *
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ParameterDescription * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::ParameterDescription *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ParameterDescription *tmp = ACE_reinterpret_cast(CORBA::ParameterDescription*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ_CI_)
-#define _CORBA_PARDESCRIPTIONSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ParDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::CORBA_ParDescriptionSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::CORBA_ParDescriptionSeq_var (CORBA::ParDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::CORBA_ParDescriptionSeq_var (const CORBA::ParDescriptionSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ParDescriptionSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::~CORBA_ParDescriptionSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ParDescriptionSeq_var &
-CORBA::ParDescriptionSeq_var::operator= (CORBA::ParDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ParDescriptionSeq_var &
-CORBA::ParDescriptionSeq_var::operator= (const CORBA::ParDescriptionSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ParDescriptionSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ParDescriptionSeq *
-CORBA::ParDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ParDescriptionSeq *
-CORBA::ParDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ParDescriptionSeq_var::operator const CORBA::ParDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ParDescriptionSeq_var::operator CORBA::ParDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ParDescriptionSeq_var::operator CORBA::ParDescriptionSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ParameterDescription &
-CORBA::ParDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::ParDescriptionSeq &
-CORBA::ParDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ParDescriptionSeq &
-CORBA::ParDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ParDescriptionSeq *&
-CORBA::ParDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ParDescriptionSeq *
-CORBA::ParDescriptionSeq_var::_retn (void)
-{
-  CORBA::ParDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ParDescriptionSeq *
-CORBA::ParDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ParDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_out::CORBA_ParDescriptionSeq_out (CORBA::ParDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_out::CORBA_ParDescriptionSeq_out (CORBA::ParDescriptionSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_out::CORBA_ParDescriptionSeq_out (const CORBA::ParDescriptionSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ParDescriptionSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ParDescriptionSeq_out &
-CORBA::ParDescriptionSeq_out::operator= (const CORBA::ParDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ParDescriptionSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ParDescriptionSeq_out &
-CORBA::ParDescriptionSeq_out::operator= (CORBA::ParDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ParDescriptionSeq_out::operator CORBA::ParDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ParDescriptionSeq *&
-CORBA::ParDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ParDescriptionSeq *
-CORBA::ParDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ParameterDescription &
-CORBA::ParDescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONTEXTIDSEQ_CI_)
-#define _CORBA_CONTEXTIDSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ContextIdSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContextIdSeq_var::CORBA_ContextIdSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ContextIdSeq_var::CORBA_ContextIdSeq_var (CORBA::ContextIdSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ContextIdSeq_var::CORBA_ContextIdSeq_var (const CORBA::ContextIdSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ContextIdSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContextIdSeq_var::~CORBA_ContextIdSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextIdSeq_var &
-CORBA::ContextIdSeq_var::operator= (CORBA::ContextIdSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ContextIdSeq_var &
-CORBA::ContextIdSeq_var::operator= (const CORBA::ContextIdSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ContextIdSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ContextIdSeq *
-CORBA::ContextIdSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextIdSeq *
-CORBA::ContextIdSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ContextIdSeq_var::operator const CORBA::ContextIdSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ContextIdSeq_var::operator CORBA::ContextIdSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ContextIdSeq_var::operator CORBA::ContextIdSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager 
-CORBA::ContextIdSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::ContextIdSeq &
-CORBA::ContextIdSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextIdSeq &
-CORBA::ContextIdSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ContextIdSeq *&
-CORBA::ContextIdSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextIdSeq *
-CORBA::ContextIdSeq_var::_retn (void)
-{
-  CORBA::ContextIdSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ContextIdSeq *
-CORBA::ContextIdSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ContextIdSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContextIdSeq_out::CORBA_ContextIdSeq_out (CORBA::ContextIdSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContextIdSeq_out::CORBA_ContextIdSeq_out (CORBA::ContextIdSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContextIdSeq_out::CORBA_ContextIdSeq_out (const CORBA::ContextIdSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ContextIdSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ContextIdSeq_out &
-CORBA::ContextIdSeq_out::operator= (const CORBA::ContextIdSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ContextIdSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ContextIdSeq_out &
-CORBA::ContextIdSeq_out::operator= (CORBA::ContextIdSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ContextIdSeq_out::operator CORBA::ContextIdSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextIdSeq *&
-CORBA::ContextIdSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextIdSeq *
-CORBA::ContextIdSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager 
-CORBA::ContextIdSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CI_
-
-  ACE_INLINE CORBA::ExceptionDef **
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
-  {
-    CORBA::ExceptionDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA::ExceptionDef*[nelems], 0);
-    
-    for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA::ExceptionDef::_nil ();
-    
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (CORBA::ExceptionDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ExceptionDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ExceptionDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (this->maximum_);
-    CORBA::ExceptionDef ** const tmp2 = ACE_reinterpret_cast (CORBA::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::ExceptionDef::_duplicate (tmp2[i]);
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      CORBA::ExceptionDef **tmp = ACE_reinterpret_cast (CORBA::ExceptionDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA::ExceptionDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::ExceptionDef **tmp1 = ACE_reinterpret_cast (CORBA::ExceptionDef **, this->buffer_);
-    CORBA::ExceptionDef ** const tmp2 = ACE_reinterpret_cast (CORBA::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::ExceptionDef::_duplicate (tmp2[i]);
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA::ExceptionDef ** const tmp = ACE_reinterpret_cast (CORBA::ExceptionDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE CORBA::ExceptionDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ExceptionDef **result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::ExceptionDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::ExceptionDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ExceptionDef ** ACE_CAST_CONST, this->buffer_);
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ_CI_)
-#define _CORBA_EXCEPTIONDEFSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::CORBA_ExceptionDefSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::CORBA_ExceptionDefSeq_var (CORBA::ExceptionDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::CORBA_ExceptionDefSeq_var (const CORBA::ExceptionDefSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ExceptionDefSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::~CORBA_ExceptionDefSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDefSeq_var &
-CORBA::ExceptionDefSeq_var::operator= (CORBA::ExceptionDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ExceptionDefSeq_var &
-CORBA::ExceptionDefSeq_var::operator= (const CORBA::ExceptionDefSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ExceptionDefSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ExceptionDefSeq *
-CORBA::ExceptionDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDefSeq *
-CORBA::ExceptionDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDefSeq_var::operator const CORBA::ExceptionDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDefSeq_var::operator CORBA::ExceptionDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDefSeq_var::operator CORBA::ExceptionDefSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var> 
-CORBA::ExceptionDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::ExceptionDefSeq &
-CORBA::ExceptionDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDefSeq &
-CORBA::ExceptionDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ExceptionDefSeq *&
-CORBA::ExceptionDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDefSeq *
-CORBA::ExceptionDefSeq_var::_retn (void)
-{
-  CORBA::ExceptionDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ExceptionDefSeq *
-CORBA::ExceptionDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_out::CORBA_ExceptionDefSeq_out (CORBA::ExceptionDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_out::CORBA_ExceptionDefSeq_out (CORBA::ExceptionDefSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_out::CORBA_ExceptionDefSeq_out (const CORBA::ExceptionDefSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ExceptionDefSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ExceptionDefSeq_out &
-CORBA::ExceptionDefSeq_out::operator= (const CORBA::ExceptionDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ExceptionDefSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ExceptionDefSeq_out &
-CORBA::ExceptionDefSeq_out::operator= (CORBA::ExceptionDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDefSeq_out::operator CORBA::ExceptionDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDefSeq *&
-CORBA::ExceptionDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDefSeq *
-CORBA::ExceptionDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var> 
-CORBA::ExceptionDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::ExceptionDescription *
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::ExceptionDescription[size];
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (CORBA::ExceptionDescription *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ExceptionDescription *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ExceptionDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (this->maximum_);
-    CORBA::ExceptionDescription * const tmp2 = ACE_reinterpret_cast (CORBA::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::ExceptionDescription *tmp = ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::ExceptionDescription *tmp1 = ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
-    CORBA::ExceptionDescription * const tmp2 = ACE_reinterpret_cast (CORBA::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::ExceptionDescription &
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ExceptionDescription* tmp = ACE_reinterpret_cast(CORBA::ExceptionDescription*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::ExceptionDescription &
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ExceptionDescription * const tmp = ACE_reinterpret_cast (CORBA::ExceptionDescription* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::ExceptionDescription *
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ExceptionDescription *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ExceptionDescription*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::ExceptionDescription*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::ExceptionDescription *
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ExceptionDescription * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::ExceptionDescription *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ExceptionDescription *tmp = ACE_reinterpret_cast(CORBA::ExceptionDescription*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CI_)
-#define _CORBA_EXCDESCRIPTIONSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ExcDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::CORBA_ExcDescriptionSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::CORBA_ExcDescriptionSeq_var (CORBA::ExcDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::CORBA_ExcDescriptionSeq_var (const CORBA::ExcDescriptionSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ExcDescriptionSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::~CORBA_ExcDescriptionSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ExcDescriptionSeq_var &
-CORBA::ExcDescriptionSeq_var::operator= (CORBA::ExcDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ExcDescriptionSeq_var &
-CORBA::ExcDescriptionSeq_var::operator= (const CORBA::ExcDescriptionSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ExcDescriptionSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ExcDescriptionSeq_var::operator const CORBA::ExcDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ExcDescriptionSeq_var::operator CORBA::ExcDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ExcDescriptionSeq_var::operator CORBA::ExcDescriptionSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDescription &
-CORBA::ExcDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::ExcDescriptionSeq &
-CORBA::ExcDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ExcDescriptionSeq &
-CORBA::ExcDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ExcDescriptionSeq *&
-CORBA::ExcDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::_retn (void)
-{
-  CORBA::ExcDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ExcDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_out::CORBA_ExcDescriptionSeq_out (CORBA::ExcDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_out::CORBA_ExcDescriptionSeq_out (CORBA::ExcDescriptionSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_out::CORBA_ExcDescriptionSeq_out (const CORBA::ExcDescriptionSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ExcDescriptionSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ExcDescriptionSeq_out &
-CORBA::ExcDescriptionSeq_out::operator= (const CORBA::ExcDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ExcDescriptionSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ExcDescriptionSeq_out &
-CORBA::ExcDescriptionSeq_out::operator= (CORBA::ExcDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ExcDescriptionSeq_out::operator CORBA::ExcDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExcDescriptionSeq *&
-CORBA::ExcDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionDescription &
-CORBA::ExcDescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::OperationDef::CORBA_OperationDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::OperationDef::CORBA_OperationDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::OperationDef::~CORBA_OperationDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_OPERATIONDEF___VAR_CI_)
-#define _CORBA_OPERATIONDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::OperationDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::OperationDef_var::CORBA_OperationDef_var (void) // default constructor
-  : ptr_ (CORBA::OperationDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::OperationDef_var::CORBA_OperationDef_var (CORBA::OperationDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::OperationDef_ptr 
-CORBA::OperationDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OperationDef_var::CORBA_OperationDef_var (const CORBA::OperationDef_var &p) // copy constructor
-  : ptr_ (CORBA::OperationDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::OperationDef_var::~CORBA_OperationDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::OperationDef_var &
-CORBA::OperationDef_var::operator= (CORBA::OperationDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::OperationDef_var &
-CORBA::OperationDef_var::operator= (const CORBA::OperationDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::OperationDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::OperationDef_var::operator const CORBA::OperationDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::OperationDef_var::operator CORBA::OperationDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDef_ptr 
-CORBA::OperationDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDef_ptr
-CORBA::OperationDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDef_ptr &
-CORBA::OperationDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDef_ptr &
-CORBA::OperationDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::OperationDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDef_ptr 
-CORBA::OperationDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::OperationDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::OperationDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_OPERATIONDEF___OUT_CI_)
-#define _CORBA_OPERATIONDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::OperationDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::OperationDef_out::CORBA_OperationDef_out (CORBA::OperationDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::OperationDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::OperationDef_out::CORBA_OperationDef_out (CORBA::OperationDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::OperationDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::OperationDef_out::CORBA_OperationDef_out (const CORBA::OperationDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::OperationDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::OperationDef_out &
-CORBA::OperationDef_out::operator= (const CORBA::OperationDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::OperationDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::OperationDef_out &
-CORBA::OperationDef_out::operator= (const CORBA::OperationDef_var &p)
-{
-  this->ptr_ = CORBA::OperationDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::OperationDef_out &
-CORBA::OperationDef_out::operator= (CORBA::OperationDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::OperationDef_out::operator CORBA::OperationDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDef_ptr &
-CORBA::OperationDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDef_ptr 
-CORBA::OperationDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::OperationDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::OperationDescription_var::CORBA_OperationDescription_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::OperationDescription_var::CORBA_OperationDescription_var (CORBA::OperationDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::OperationDescription_var::CORBA_OperationDescription_var (const CORBA::OperationDescription_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::OperationDescription(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OperationDescription_var::~CORBA_OperationDescription_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDescription_var &
-CORBA::OperationDescription_var::operator= (CORBA::OperationDescription *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::OperationDescription_var &
-CORBA::OperationDescription_var::operator= (const CORBA::OperationDescription_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::OperationDescription (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::OperationDescription *
-CORBA::OperationDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDescription *
-CORBA::OperationDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::OperationDescription_var::operator const CORBA::OperationDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::OperationDescription_var::operator CORBA::OperationDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::OperationDescription_var::operator CORBA::OperationDescription &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::OperationDescription &
-CORBA::OperationDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDescription &
-CORBA::OperationDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::OperationDescription *&
-CORBA::OperationDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDescription *
-CORBA::OperationDescription_var::_retn (void)
-{
-  CORBA::OperationDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::OperationDescription *
-CORBA::OperationDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::OperationDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::OperationDescription_out::CORBA_OperationDescription_out (CORBA::OperationDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OperationDescription_out::CORBA_OperationDescription_out (CORBA::OperationDescription_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OperationDescription_out::CORBA_OperationDescription_out (const CORBA::OperationDescription_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::OperationDescription_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::OperationDescription_out &
-CORBA::OperationDescription_out::operator= (const CORBA::OperationDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::OperationDescription_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::OperationDescription_out &
-CORBA::OperationDescription_out::operator= (CORBA::OperationDescription *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::OperationDescription_out::operator CORBA::OperationDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDescription *&
-CORBA::OperationDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDescription *
-CORBA::OperationDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (_CORBA_REPOSITORYIDSEQ_CI_)
-#define _CORBA_REPOSITORYIDSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::RepositoryIdSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::CORBA_RepositoryIdSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::CORBA_RepositoryIdSeq_var (CORBA::RepositoryIdSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::CORBA_RepositoryIdSeq_var (const CORBA::RepositoryIdSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::RepositoryIdSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::~CORBA_RepositoryIdSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::RepositoryIdSeq_var &
-CORBA::RepositoryIdSeq_var::operator= (CORBA::RepositoryIdSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::RepositoryIdSeq_var &
-CORBA::RepositoryIdSeq_var::operator= (const CORBA::RepositoryIdSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::RepositoryIdSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::RepositoryIdSeq *
-CORBA::RepositoryIdSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::RepositoryIdSeq *
-CORBA::RepositoryIdSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::RepositoryIdSeq_var::operator const CORBA::RepositoryIdSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::RepositoryIdSeq_var::operator CORBA::RepositoryIdSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::RepositoryIdSeq_var::operator CORBA::RepositoryIdSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager 
-CORBA::RepositoryIdSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::RepositoryIdSeq &
-CORBA::RepositoryIdSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::RepositoryIdSeq &
-CORBA::RepositoryIdSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::RepositoryIdSeq *&
-CORBA::RepositoryIdSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::RepositoryIdSeq *
-CORBA::RepositoryIdSeq_var::_retn (void)
-{
-  CORBA::RepositoryIdSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::RepositoryIdSeq *
-CORBA::RepositoryIdSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::RepositoryIdSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_out::CORBA_RepositoryIdSeq_out (CORBA::RepositoryIdSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_out::CORBA_RepositoryIdSeq_out (CORBA::RepositoryIdSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_out::CORBA_RepositoryIdSeq_out (const CORBA::RepositoryIdSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::RepositoryIdSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::RepositoryIdSeq_out &
-CORBA::RepositoryIdSeq_out::operator= (const CORBA::RepositoryIdSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::RepositoryIdSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::RepositoryIdSeq_out &
-CORBA::RepositoryIdSeq_out::operator= (CORBA::RepositoryIdSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::RepositoryIdSeq_out::operator CORBA::RepositoryIdSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::RepositoryIdSeq *&
-CORBA::RepositoryIdSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::RepositoryIdSeq *
-CORBA::RepositoryIdSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager 
-CORBA::RepositoryIdSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::OperationDescription *
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::OperationDescription[size];
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (CORBA::OperationDescription *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::OperationDescription *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::OperationDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (this->maximum_);
-    CORBA::OperationDescription * const tmp2 = ACE_reinterpret_cast (CORBA::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::OperationDescription *tmp = ACE_reinterpret_cast (CORBA::OperationDescription *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::OperationDescription *tmp1 = ACE_reinterpret_cast (CORBA::OperationDescription *, this->buffer_);
-    CORBA::OperationDescription * const tmp2 = ACE_reinterpret_cast (CORBA::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::OperationDescription &
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::OperationDescription* tmp = ACE_reinterpret_cast(CORBA::OperationDescription*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::OperationDescription &
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::OperationDescription * const tmp = ACE_reinterpret_cast (CORBA::OperationDescription* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::OperationDescription *
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::OperationDescription *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::OperationDescription*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::OperationDescription*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::OperationDescription *
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::OperationDescription * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::OperationDescription *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::OperationDescription *tmp = ACE_reinterpret_cast(CORBA::OperationDescription*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_OPDESCRIPTIONSEQ_CI_)
-#define _CORBA_OPDESCRIPTIONSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::OpDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::CORBA_OpDescriptionSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::CORBA_OpDescriptionSeq_var (CORBA::OpDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::CORBA_OpDescriptionSeq_var (const CORBA::OpDescriptionSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::OpDescriptionSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::~CORBA_OpDescriptionSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::OpDescriptionSeq_var &
-CORBA::OpDescriptionSeq_var::operator= (CORBA::OpDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::OpDescriptionSeq_var &
-CORBA::OpDescriptionSeq_var::operator= (const CORBA::OpDescriptionSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::OpDescriptionSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::OpDescriptionSeq *
-CORBA::OpDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OpDescriptionSeq *
-CORBA::OpDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::OpDescriptionSeq_var::operator const CORBA::OpDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::OpDescriptionSeq_var::operator CORBA::OpDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::OpDescriptionSeq_var::operator CORBA::OpDescriptionSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDescription &
-CORBA::OpDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::OpDescriptionSeq &
-CORBA::OpDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::OpDescriptionSeq &
-CORBA::OpDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::OpDescriptionSeq *&
-CORBA::OpDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OpDescriptionSeq *
-CORBA::OpDescriptionSeq_var::_retn (void)
-{
-  CORBA::OpDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::OpDescriptionSeq *
-CORBA::OpDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::OpDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_out::CORBA_OpDescriptionSeq_out (CORBA::OpDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_out::CORBA_OpDescriptionSeq_out (CORBA::OpDescriptionSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_out::CORBA_OpDescriptionSeq_out (const CORBA::OpDescriptionSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::OpDescriptionSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::OpDescriptionSeq_out &
-CORBA::OpDescriptionSeq_out::operator= (const CORBA::OpDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::OpDescriptionSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::OpDescriptionSeq_out &
-CORBA::OpDescriptionSeq_out::operator= (CORBA::OpDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::OpDescriptionSeq_out::operator CORBA::OpDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OpDescriptionSeq *&
-CORBA::OpDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OpDescriptionSeq *
-CORBA::OpDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::OperationDescription &
-CORBA::OpDescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::AttributeDescription *
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::AttributeDescription[size];
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (CORBA::AttributeDescription *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::AttributeDescription *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::AttributeDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (this->maximum_);
-    CORBA::AttributeDescription * const tmp2 = ACE_reinterpret_cast (CORBA::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::AttributeDescription *tmp = ACE_reinterpret_cast (CORBA::AttributeDescription *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::AttributeDescription *tmp1 = ACE_reinterpret_cast (CORBA::AttributeDescription *, this->buffer_);
-    CORBA::AttributeDescription * const tmp2 = ACE_reinterpret_cast (CORBA::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::AttributeDescription &
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::AttributeDescription* tmp = ACE_reinterpret_cast(CORBA::AttributeDescription*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::AttributeDescription &
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::AttributeDescription * const tmp = ACE_reinterpret_cast (CORBA::AttributeDescription* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::AttributeDescription *
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::AttributeDescription *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::AttributeDescription*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::AttributeDescription*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::AttributeDescription *
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::AttributeDescription * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::AttributeDescription *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::AttributeDescription *tmp = ACE_reinterpret_cast(CORBA::AttributeDescription*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CI_)
-#define _CORBA_ATTRDESCRIPTIONSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::AttrDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::CORBA_AttrDescriptionSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::CORBA_AttrDescriptionSeq_var (CORBA::AttrDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::CORBA_AttrDescriptionSeq_var (const CORBA::AttrDescriptionSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::AttrDescriptionSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::~CORBA_AttrDescriptionSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::AttrDescriptionSeq_var &
-CORBA::AttrDescriptionSeq_var::operator= (CORBA::AttrDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::AttrDescriptionSeq_var &
-CORBA::AttrDescriptionSeq_var::operator= (const CORBA::AttrDescriptionSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::AttrDescriptionSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::AttrDescriptionSeq *
-CORBA::AttrDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttrDescriptionSeq *
-CORBA::AttrDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::AttrDescriptionSeq_var::operator const CORBA::AttrDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::AttrDescriptionSeq_var::operator CORBA::AttrDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::AttrDescriptionSeq_var::operator CORBA::AttrDescriptionSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDescription &
-CORBA::AttrDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::AttrDescriptionSeq &
-CORBA::AttrDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::AttrDescriptionSeq &
-CORBA::AttrDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::AttrDescriptionSeq *&
-CORBA::AttrDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttrDescriptionSeq *
-CORBA::AttrDescriptionSeq_var::_retn (void)
-{
-  CORBA::AttrDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::AttrDescriptionSeq *
-CORBA::AttrDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::AttrDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_out::CORBA_AttrDescriptionSeq_out (CORBA::AttrDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_out::CORBA_AttrDescriptionSeq_out (CORBA::AttrDescriptionSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_out::CORBA_AttrDescriptionSeq_out (const CORBA::AttrDescriptionSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::AttrDescriptionSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::AttrDescriptionSeq_out &
-CORBA::AttrDescriptionSeq_out::operator= (const CORBA::AttrDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::AttrDescriptionSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::AttrDescriptionSeq_out &
-CORBA::AttrDescriptionSeq_out::operator= (CORBA::AttrDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::AttrDescriptionSeq_out::operator CORBA::AttrDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttrDescriptionSeq *&
-CORBA::AttrDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttrDescriptionSeq *
-CORBA::AttrDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AttributeDescription &
-CORBA::AttrDescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::InterfaceDef::CORBA_InterfaceDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::InterfaceDef::CORBA_InterfaceDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDef::~CORBA_InterfaceDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_INTERFACEDEF___VAR_CI_)
-#define _CORBA_INTERFACEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDef_var::CORBA_InterfaceDef_var (void) // default constructor
-  : ptr_ (CORBA::InterfaceDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::InterfaceDef_var::CORBA_InterfaceDef_var (CORBA::InterfaceDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::InterfaceDef_ptr 
-CORBA::InterfaceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDef_var::CORBA_InterfaceDef_var (const CORBA::InterfaceDef_var &p) // copy constructor
-  : ptr_ (CORBA::InterfaceDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::InterfaceDef_var::~CORBA_InterfaceDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::InterfaceDef_var &
-CORBA::InterfaceDef_var::operator= (CORBA::InterfaceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::InterfaceDef_var &
-CORBA::InterfaceDef_var::operator= (const CORBA::InterfaceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::InterfaceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDef_var::operator const CORBA::InterfaceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDef_var::operator CORBA::InterfaceDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef_ptr 
-CORBA::InterfaceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef_ptr &
-CORBA::InterfaceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef_ptr &
-CORBA::InterfaceDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::InterfaceDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef_ptr 
-CORBA::InterfaceDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::InterfaceDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::InterfaceDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INTERFACEDEF___OUT_CI_)
-#define _CORBA_INTERFACEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDef_out::CORBA_InterfaceDef_out (CORBA::InterfaceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::InterfaceDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::InterfaceDef_out::CORBA_InterfaceDef_out (CORBA::InterfaceDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::InterfaceDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::InterfaceDef_out::CORBA_InterfaceDef_out (const CORBA::InterfaceDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::InterfaceDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::InterfaceDef_out &
-CORBA::InterfaceDef_out::operator= (const CORBA::InterfaceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::InterfaceDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::InterfaceDef_out &
-CORBA::InterfaceDef_out::operator= (const CORBA::InterfaceDef_var &p)
-{
-  this->ptr_ = CORBA::InterfaceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::InterfaceDef_out &
-CORBA::InterfaceDef_out::operator= (CORBA::InterfaceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDef_out::operator CORBA::InterfaceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef_ptr &
-CORBA::InterfaceDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef_ptr 
-CORBA::InterfaceDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDef::FullInterfaceDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (CORBA::InterfaceDef::FullInterfaceDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (const CORBA::InterfaceDef::FullInterfaceDescription_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::InterfaceDef::FullInterfaceDescription(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::~FullInterfaceDescription_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription_var &
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator= (CORBA::InterfaceDef::FullInterfaceDescription *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription_var &
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator= (const CORBA::InterfaceDef::FullInterfaceDescription_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::InterfaceDef::FullInterfaceDescription (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator const CORBA::InterfaceDef::FullInterfaceDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator CORBA::InterfaceDef::FullInterfaceDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator CORBA::InterfaceDef::FullInterfaceDescription &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::InterfaceDef::FullInterfaceDescription &
-CORBA::InterfaceDef::FullInterfaceDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription &
-CORBA::InterfaceDef::FullInterfaceDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription *&
-CORBA::InterfaceDef::FullInterfaceDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::_retn (void)
-{
-  CORBA::InterfaceDef::FullInterfaceDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDef::FullInterfaceDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (CORBA::InterfaceDef::FullInterfaceDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (CORBA::InterfaceDef::FullInterfaceDescription_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (const CORBA::InterfaceDef::FullInterfaceDescription_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::InterfaceDef::FullInterfaceDescription_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription_out &
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator= (const CORBA::InterfaceDef::FullInterfaceDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::InterfaceDef::FullInterfaceDescription_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription_out &
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator= (CORBA::InterfaceDef::FullInterfaceDescription *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator CORBA::InterfaceDef::FullInterfaceDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription *&
-CORBA::InterfaceDef::FullInterfaceDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDescription_var::CORBA_InterfaceDescription_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDescription_var::CORBA_InterfaceDescription_var (CORBA::InterfaceDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDescription_var::CORBA_InterfaceDescription_var (const CORBA::InterfaceDescription_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::InterfaceDescription(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDescription_var::~CORBA_InterfaceDescription_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDescription_var &
-CORBA::InterfaceDescription_var::operator= (CORBA::InterfaceDescription *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::InterfaceDescription_var &
-CORBA::InterfaceDescription_var::operator= (const CORBA::InterfaceDescription_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::InterfaceDescription (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::InterfaceDescription *
-CORBA::InterfaceDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDescription *
-CORBA::InterfaceDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDescription_var::operator const CORBA::InterfaceDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDescription_var::operator CORBA::InterfaceDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDescription_var::operator CORBA::InterfaceDescription &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::InterfaceDescription &
-CORBA::InterfaceDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDescription &
-CORBA::InterfaceDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::InterfaceDescription *&
-CORBA::InterfaceDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDescription *
-CORBA::InterfaceDescription_var::_retn (void)
-{
-  CORBA::InterfaceDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::InterfaceDescription *
-CORBA::InterfaceDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDescription_out::CORBA_InterfaceDescription_out (CORBA::InterfaceDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDescription_out::CORBA_InterfaceDescription_out (CORBA::InterfaceDescription_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDescription_out::CORBA_InterfaceDescription_out (const CORBA::InterfaceDescription_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::InterfaceDescription_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::InterfaceDescription_out &
-CORBA::InterfaceDescription_out::operator= (const CORBA::InterfaceDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::InterfaceDescription_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::InterfaceDescription_out &
-CORBA::InterfaceDescription_out::operator= (CORBA::InterfaceDescription *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDescription_out::operator CORBA::InterfaceDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDescription *&
-CORBA::InterfaceDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::InterfaceDescription *
-CORBA::InterfaceDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ValueMember_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueMember_var::CORBA_ValueMember_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ValueMember_var::CORBA_ValueMember_var (CORBA::ValueMember *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ValueMember_var::CORBA_ValueMember_var (const CORBA::ValueMember_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ValueMember(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueMember_var::~CORBA_ValueMember_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMember_var &
-CORBA::ValueMember_var::operator= (CORBA::ValueMember *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueMember_var &
-CORBA::ValueMember_var::operator= (const CORBA::ValueMember_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ValueMember (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ValueMember *
-CORBA::ValueMember_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMember *
-CORBA::ValueMember_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueMember_var::operator const CORBA::ValueMember &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueMember_var::operator CORBA::ValueMember &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueMember_var::operator CORBA::ValueMember &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::ValueMember &
-CORBA::ValueMember_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMember &
-CORBA::ValueMember_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ValueMember *&
-CORBA::ValueMember_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMember *
-CORBA::ValueMember_var::_retn (void)
-{
-  CORBA::ValueMember *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ValueMember *
-CORBA::ValueMember_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ValueMember_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueMember_out::CORBA_ValueMember_out (CORBA::ValueMember *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueMember_out::CORBA_ValueMember_out (CORBA::ValueMember_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueMember_out::CORBA_ValueMember_out (const CORBA::ValueMember_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ValueMember_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ValueMember_out &
-CORBA::ValueMember_out::operator= (const CORBA::ValueMember_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ValueMember_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueMember_out &
-CORBA::ValueMember_out::operator= (CORBA::ValueMember *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueMember_out::operator CORBA::ValueMember *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMember *&
-CORBA::ValueMember_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMember *
-CORBA::ValueMember_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::ValueMember *
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::ValueMember[size];
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (CORBA::ValueMember *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ValueMember *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ValueMember *tmp1 = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (this->maximum_);
-    CORBA::ValueMember * const tmp2 = ACE_reinterpret_cast (CORBA::ValueMember * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::ValueMember *tmp = ACE_reinterpret_cast (CORBA::ValueMember *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::ValueMember *tmp1 = ACE_reinterpret_cast (CORBA::ValueMember *, this->buffer_);
-    CORBA::ValueMember * const tmp2 = ACE_reinterpret_cast (CORBA::ValueMember * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::ValueMember &
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ValueMember* tmp = ACE_reinterpret_cast(CORBA::ValueMember*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::ValueMember &
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ValueMember * const tmp = ACE_reinterpret_cast (CORBA::ValueMember* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::ValueMember *
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ValueMember *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ValueMember*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::ValueMember*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::ValueMember *
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ValueMember * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::ValueMember *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ValueMember *tmp = ACE_reinterpret_cast(CORBA::ValueMember*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEMEMBERSEQ_CI_)
-#define _CORBA_VALUEMEMBERSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ValueMemberSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var::CORBA_ValueMemberSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var::CORBA_ValueMemberSeq_var (CORBA::ValueMemberSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var::CORBA_ValueMemberSeq_var (const CORBA::ValueMemberSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ValueMemberSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var::~CORBA_ValueMemberSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberSeq_var &
-CORBA::ValueMemberSeq_var::operator= (CORBA::ValueMemberSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueMemberSeq_var &
-CORBA::ValueMemberSeq_var::operator= (const CORBA::ValueMemberSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ValueMemberSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ValueMemberSeq *
-CORBA::ValueMemberSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberSeq *
-CORBA::ValueMemberSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueMemberSeq_var::operator const CORBA::ValueMemberSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueMemberSeq_var::operator CORBA::ValueMemberSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueMemberSeq_var::operator CORBA::ValueMemberSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMember &
-CORBA::ValueMemberSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::ValueMemberSeq &
-CORBA::ValueMemberSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberSeq &
-CORBA::ValueMemberSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ValueMemberSeq *&
-CORBA::ValueMemberSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberSeq *
-CORBA::ValueMemberSeq_var::_retn (void)
-{
-  CORBA::ValueMemberSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ValueMemberSeq *
-CORBA::ValueMemberSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ValueMemberSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueMemberSeq_out::CORBA_ValueMemberSeq_out (CORBA::ValueMemberSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_out::CORBA_ValueMemberSeq_out (CORBA::ValueMemberSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_out::CORBA_ValueMemberSeq_out (const CORBA::ValueMemberSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ValueMemberSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ValueMemberSeq_out &
-CORBA::ValueMemberSeq_out::operator= (const CORBA::ValueMemberSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ValueMemberSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueMemberSeq_out &
-CORBA::ValueMemberSeq_out::operator= (CORBA::ValueMemberSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueMemberSeq_out::operator CORBA::ValueMemberSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberSeq *&
-CORBA::ValueMemberSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberSeq *
-CORBA::ValueMemberSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMember &
-CORBA::ValueMemberSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::ValueMemberDef::CORBA_ValueMemberDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::ValueMemberDef::CORBA_ValueMemberDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::ValueMemberDef::~CORBA_ValueMemberDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_VALUEMEMBERDEF___VAR_CI_)
-#define _CORBA_VALUEMEMBERDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ValueMemberDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueMemberDef_var::CORBA_ValueMemberDef_var (void) // default constructor
-  : ptr_ (CORBA::ValueMemberDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::ValueMemberDef_var::CORBA_ValueMemberDef_var (CORBA::ValueMemberDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::ValueMemberDef_ptr 
-CORBA::ValueMemberDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueMemberDef_var::CORBA_ValueMemberDef_var (const CORBA::ValueMemberDef_var &p) // copy constructor
-  : ptr_ (CORBA::ValueMemberDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::ValueMemberDef_var::~CORBA_ValueMemberDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::ValueMemberDef_var &
-CORBA::ValueMemberDef_var::operator= (CORBA::ValueMemberDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueMemberDef_var &
-CORBA::ValueMemberDef_var::operator= (const CORBA::ValueMemberDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::ValueMemberDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueMemberDef_var::operator const CORBA::ValueMemberDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueMemberDef_var::operator CORBA::ValueMemberDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberDef_ptr 
-CORBA::ValueMemberDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberDef_ptr &
-CORBA::ValueMemberDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberDef_ptr &
-CORBA::ValueMemberDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ValueMemberDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberDef_ptr 
-CORBA::ValueMemberDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::ValueMemberDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::ValueMemberDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEMEMBERDEF___OUT_CI_)
-#define _CORBA_VALUEMEMBERDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ValueMemberDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueMemberDef_out::CORBA_ValueMemberDef_out (CORBA::ValueMemberDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::ValueMemberDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ValueMemberDef_out::CORBA_ValueMemberDef_out (CORBA::ValueMemberDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ValueMemberDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ValueMemberDef_out::CORBA_ValueMemberDef_out (const CORBA::ValueMemberDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ValueMemberDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ValueMemberDef_out &
-CORBA::ValueMemberDef_out::operator= (const CORBA::ValueMemberDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ValueMemberDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueMemberDef_out &
-CORBA::ValueMemberDef_out::operator= (const CORBA::ValueMemberDef_var &p)
-{
-  this->ptr_ = CORBA::ValueMemberDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueMemberDef_out &
-CORBA::ValueMemberDef_out::operator= (CORBA::ValueMemberDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueMemberDef_out::operator CORBA::ValueMemberDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberDef_ptr &
-CORBA::ValueMemberDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueMemberDef_ptr 
-CORBA::ValueMemberDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA::ValueDef::CORBA_ValueDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::ValueDef::CORBA_ValueDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::ValueDef::~CORBA_ValueDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_VALUEDEF___VAR_CI_)
-#define _CORBA_VALUEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDef_var::CORBA_ValueDef_var (void) // default constructor
-  : ptr_ (CORBA::ValueDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::ValueDef_var::CORBA_ValueDef_var (CORBA::ValueDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::ValueDef_ptr 
-CORBA::ValueDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDef_var::CORBA_ValueDef_var (const CORBA::ValueDef_var &p) // copy constructor
-  : ptr_ (CORBA::ValueDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::ValueDef_var::~CORBA_ValueDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::ValueDef_var &
-CORBA::ValueDef_var::operator= (CORBA::ValueDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueDef_var &
-CORBA::ValueDef_var::operator= (const CORBA::ValueDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::ValueDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueDef_var::operator const CORBA::ValueDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueDef_var::operator CORBA::ValueDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef_ptr 
-CORBA::ValueDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef_ptr
-CORBA::ValueDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef_ptr &
-CORBA::ValueDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef_ptr &
-CORBA::ValueDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ValueDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef_ptr 
-CORBA::ValueDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::ValueDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::ValueDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEDEF___OUT_CI_)
-#define _CORBA_VALUEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDef_out::CORBA_ValueDef_out (CORBA::ValueDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::ValueDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ValueDef_out::CORBA_ValueDef_out (CORBA::ValueDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ValueDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ValueDef_out::CORBA_ValueDef_out (const CORBA::ValueDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ValueDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ValueDef_out &
-CORBA::ValueDef_out::operator= (const CORBA::ValueDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ValueDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueDef_out &
-CORBA::ValueDef_out::operator= (const CORBA::ValueDef_var &p)
-{
-  this->ptr_ = CORBA::ValueDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueDef_out &
-CORBA::ValueDef_out::operator= (CORBA::ValueDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueDef_out::operator CORBA::ValueDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef_ptr &
-CORBA::ValueDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef_ptr 
-CORBA::ValueDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDef::FullValueDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::FullValueDescription_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::FullValueDescription_var (CORBA::ValueDef::FullValueDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::FullValueDescription_var (const CORBA::ValueDef::FullValueDescription_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ValueDef::FullValueDescription(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::~FullValueDescription_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef::FullValueDescription_var &
-CORBA::ValueDef::FullValueDescription_var::operator= (CORBA::ValueDef::FullValueDescription *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueDef::FullValueDescription_var &
-CORBA::ValueDef::FullValueDescription_var::operator= (const CORBA::ValueDef::FullValueDescription_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ValueDef::FullValueDescription (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueDef::FullValueDescription_var::operator const CORBA::ValueDef::FullValueDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueDef::FullValueDescription_var::operator CORBA::ValueDef::FullValueDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueDef::FullValueDescription_var::operator CORBA::ValueDef::FullValueDescription &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::ValueDef::FullValueDescription &
-CORBA::ValueDef::FullValueDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef::FullValueDescription &
-CORBA::ValueDef::FullValueDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ValueDef::FullValueDescription *&
-CORBA::ValueDef::FullValueDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::_retn (void)
-{
-  CORBA::ValueDef::FullValueDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDef::FullValueDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_out::FullValueDescription_out (CORBA::ValueDef::FullValueDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_out::FullValueDescription_out (CORBA::ValueDef::FullValueDescription_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_out::FullValueDescription_out (const CORBA::ValueDef::FullValueDescription_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ValueDef::FullValueDescription_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ValueDef::FullValueDescription_out &
-CORBA::ValueDef::FullValueDescription_out::operator= (const CORBA::ValueDef::FullValueDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ValueDef::FullValueDescription_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueDef::FullValueDescription_out &
-CORBA::ValueDef::FullValueDescription_out::operator= (CORBA::ValueDef::FullValueDescription *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueDef::FullValueDescription_out::operator CORBA::ValueDef::FullValueDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef::FullValueDescription *&
-CORBA::ValueDef::FullValueDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDescription_var::CORBA_ValueDescription_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ValueDescription_var::CORBA_ValueDescription_var (CORBA::ValueDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ValueDescription_var::CORBA_ValueDescription_var (const CORBA::ValueDescription_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA::ValueDescription(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDescription_var::~CORBA_ValueDescription_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDescription_var &
-CORBA::ValueDescription_var::operator= (CORBA::ValueDescription *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueDescription_var &
-CORBA::ValueDescription_var::operator= (const CORBA::ValueDescription_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA::ValueDescription (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA::ValueDescription *
-CORBA::ValueDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDescription *
-CORBA::ValueDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueDescription_var::operator const CORBA::ValueDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueDescription_var::operator CORBA::ValueDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueDescription_var::operator CORBA::ValueDescription &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::ValueDescription &
-CORBA::ValueDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDescription &
-CORBA::ValueDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA::ValueDescription *&
-CORBA::ValueDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDescription *
-CORBA::ValueDescription_var::_retn (void)
-{
-  CORBA::ValueDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA::ValueDescription *
-CORBA::ValueDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDescription_out::CORBA_ValueDescription_out (CORBA::ValueDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDescription_out::CORBA_ValueDescription_out (CORBA::ValueDescription_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDescription_out::CORBA_ValueDescription_out (const CORBA::ValueDescription_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ValueDescription_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ValueDescription_out &
-CORBA::ValueDescription_out::operator= (const CORBA::ValueDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ValueDescription_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueDescription_out &
-CORBA::ValueDescription_out::operator= (CORBA::ValueDescription *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueDescription_out::operator CORBA::ValueDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDescription *&
-CORBA::ValueDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueDescription *
-CORBA::ValueDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueBoxDef::CORBA_ValueBoxDef (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA::ValueBoxDef::CORBA_ValueBoxDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA::ValueBoxDef::~CORBA_ValueBoxDef (void) // destructor
-{}
-
-
-#if !defined (_CORBA_VALUEBOXDEF___VAR_CI_)
-#define _CORBA_VALUEBOXDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ValueBoxDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueBoxDef_var::CORBA_ValueBoxDef_var (void) // default constructor
-  : ptr_ (CORBA::ValueBoxDef::_nil ())
-{}
-
-ACE_INLINE
-CORBA::ValueBoxDef_var::CORBA_ValueBoxDef_var (CORBA::ValueBoxDef_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::ValueBoxDef_ptr 
-CORBA::ValueBoxDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueBoxDef_var::CORBA_ValueBoxDef_var (const CORBA::ValueBoxDef_var &p) // copy constructor
-  : ptr_ (CORBA::ValueBoxDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::ValueBoxDef_var::~CORBA_ValueBoxDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::ValueBoxDef_var &
-CORBA::ValueBoxDef_var::operator= (CORBA::ValueBoxDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueBoxDef_var &
-CORBA::ValueBoxDef_var::operator= (const CORBA::ValueBoxDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::ValueBoxDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueBoxDef_var::operator const CORBA::ValueBoxDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA::ValueBoxDef_var::operator CORBA::ValueBoxDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBoxDef_ptr 
-CORBA::ValueBoxDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBoxDef_ptr &
-CORBA::ValueBoxDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBoxDef_ptr &
-CORBA::ValueBoxDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ValueBoxDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBoxDef_ptr 
-CORBA::ValueBoxDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::ValueBoxDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA::ValueBoxDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEBOXDEF___OUT_CI_)
-#define _CORBA_VALUEBOXDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ValueBoxDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueBoxDef_out::CORBA_ValueBoxDef_out (CORBA::ValueBoxDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::ValueBoxDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ValueBoxDef_out::CORBA_ValueBoxDef_out (CORBA::ValueBoxDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ValueBoxDef::_nil ();
-}
-
-ACE_INLINE
-CORBA::ValueBoxDef_out::CORBA_ValueBoxDef_out (const CORBA::ValueBoxDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ValueBoxDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA::ValueBoxDef_out &
-CORBA::ValueBoxDef_out::operator= (const CORBA::ValueBoxDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::ValueBoxDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueBoxDef_out &
-CORBA::ValueBoxDef_out::operator= (const CORBA::ValueBoxDef_var &p)
-{
-  this->ptr_ = CORBA::ValueBoxDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueBoxDef_out &
-CORBA::ValueBoxDef_out::operator= (CORBA::ValueBoxDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueBoxDef_out::operator CORBA::ValueBoxDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBoxDef_ptr &
-CORBA::ValueBoxDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBoxDef_ptr 
-CORBA::ValueBoxDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::DefinitionKind &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::DefinitionKind &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::IRObject_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::IRObject_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::IRObject_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::IRObject_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::IRObject::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::Contained_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::Contained_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::Repository_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::Repository_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::Container_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::Container_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::Contained_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::Contained_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Contained::Description &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.kind) &&
-    (strm << _tao_aggregate.value)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::Contained::Description &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.kind) &&
-    (strm >> _tao_aggregate.value)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Contained_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Contained_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::Contained::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ModuleDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ModuleDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ConstantDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ConstantDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::IDLType_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::IDLType_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::StructDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::StructDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::UnionDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::UnionDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::EnumDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::EnumDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AliasDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::AliasDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::InterfaceDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::InterfaceDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExceptionDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ExceptionDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::NativeDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::NativeDef_ptr &
-  );
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::InterfaceDefSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::InterfaceDefSeq &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueDef_ptr &
-  );
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueDefSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueDefSeq &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueBoxDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueBoxDef_ptr &
-  );
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ContainedSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ContainedSeq &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::StructMember &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.type_def.in ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::StructMember &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.type_def.out ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::StructMemberSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::StructMemberSeq &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Initializer &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.members)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::Initializer &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.members)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::InitializerSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::InitializerSeq &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::UnionMember &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.label) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.type_def.in ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::UnionMember &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.label) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.type_def.out ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::UnionMemberSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::UnionMemberSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::EnumMemberSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::EnumMemberSeq &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::Container_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::Container_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Container::Description &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.contained_object.in ()) &&
-    (strm << _tao_aggregate.kind) &&
-    (strm << _tao_aggregate.value)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::Container::Description &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.contained_object.out ()) &&
-    (strm >> _tao_aggregate.kind) &&
-    (strm >> _tao_aggregate.value)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::Container::DescriptionSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::Container::DescriptionSeq &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Container_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Container_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::Container::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::IDLType_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::IDLType_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::IDLType_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::IDLType_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::IDLType::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::PrimitiveDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::PrimitiveDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::StringDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::StringDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::SequenceDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::SequenceDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ArrayDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ArrayDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::WstringDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::WstringDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::FixedDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::FixedDef_ptr &
-  );
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::PrimitiveKind &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::PrimitiveKind &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::Repository_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::Repository_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Repository_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Repository_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::Repository::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ModuleDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ModuleDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ModuleDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ModuleDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ModuleDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ModuleDescription &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ModuleDescription &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ConstantDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ConstantDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ConstantDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ConstantDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ConstantDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ConstantDescription &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.value)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ConstantDescription &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.value)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::TypedefDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::TypedefDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::TypedefDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::TypedefDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::TypedefDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::TypeDescription &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::TypeDescription &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::StructDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::StructDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::StructDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::StructDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::StructDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::UnionDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::UnionDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::UnionDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::UnionDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::UnionDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::EnumDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::EnumDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::EnumDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::EnumDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::EnumDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AliasDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::AliasDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AliasDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AliasDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::AliasDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::PrimitiveDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::PrimitiveDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::PrimitiveDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::PrimitiveDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::PrimitiveDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::StringDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::StringDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::StringDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::StringDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::StringDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::WstringDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::WstringDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::WstringDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::WstringDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::WstringDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::FixedDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::FixedDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::FixedDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::FixedDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::FixedDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::SequenceDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::SequenceDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::SequenceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::SequenceDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::SequenceDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ArrayDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ArrayDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ArrayDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ArrayDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ArrayDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExceptionDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ExceptionDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExceptionDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExceptionDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ExceptionDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ExceptionDescription &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ExceptionDescription &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::AttributeMode &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::AttributeMode &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AttributeDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::AttributeDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AttributeDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AttributeDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::AttributeDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::AttributeDescription &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.mode)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::AttributeDescription &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.mode)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::OperationMode &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::OperationMode &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ParameterMode &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ParameterDescription &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.type_def.in ()) &&
-    (strm << _tao_aggregate.mode)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ParameterDescription &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.type_def.out ()) &&
-    (strm >> _tao_aggregate.mode)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ParDescriptionSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ParDescriptionSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ContextIdSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ContextIdSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExceptionDefSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ExceptionDefSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExcDescriptionSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ExcDescriptionSeq &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::OperationDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::OperationDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::OperationDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::OperationDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::OperationDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::OperationDescription &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.result.in ()) &&
-    (strm << _tao_aggregate.mode) &&
-    (strm << _tao_aggregate.contexts) &&
-    (strm << _tao_aggregate.parameters) &&
-    (strm << _tao_aggregate.exceptions)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::OperationDescription &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.result.out ()) &&
-    (strm >> _tao_aggregate.mode) &&
-    (strm >> _tao_aggregate.contexts) &&
-    (strm >> _tao_aggregate.parameters) &&
-    (strm >> _tao_aggregate.exceptions)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::RepositoryIdSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::RepositoryIdSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::OpDescriptionSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::OpDescriptionSeq &
-  );
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AttrDescriptionSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::AttrDescriptionSeq &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::InterfaceDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::InterfaceDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::InterfaceDef::FullInterfaceDescription &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.operations) &&
-    (strm << _tao_aggregate.attributes) &&
-    (strm << _tao_aggregate.base_interfaces) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_abstract))
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::InterfaceDef::FullInterfaceDescription &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.operations) &&
-    (strm >> _tao_aggregate.attributes) &&
-    (strm >> _tao_aggregate.base_interfaces) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_abstract))
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InterfaceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InterfaceDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::InterfaceDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::InterfaceDescription &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.base_interfaces) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_abstract))
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::InterfaceDescription &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.base_interfaces) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_abstract))
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ValueMember &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.type_def.in ()) &&
-    (strm << _tao_aggregate.access)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ValueMember &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.type_def.out ()) &&
-    (strm >> _tao_aggregate.access)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueMemberSeq &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueMemberSeq &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueMemberDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueMemberDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueMemberDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueMemberDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ValueMemberDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ValueDef::FullValueDescription &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_abstract)) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_custom)) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.operations) &&
-    (strm << _tao_aggregate.attributes) &&
-    (strm << _tao_aggregate.members) &&
-    (strm << _tao_aggregate.initializers) &&
-    (strm << _tao_aggregate.supported_interfaces) &&
-    (strm << _tao_aggregate.abstract_base_values) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_truncatable)) &&
-    (strm << _tao_aggregate.base_value.in ()) &&
-    (strm << _tao_aggregate.type.in ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ValueDef::FullValueDescription &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_abstract)) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_custom)) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.operations) &&
-    (strm >> _tao_aggregate.attributes) &&
-    (strm >> _tao_aggregate.members) &&
-    (strm >> _tao_aggregate.initializers) &&
-    (strm >> _tao_aggregate.supported_interfaces) &&
-    (strm >> _tao_aggregate.abstract_base_values) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_truncatable)) &&
-    (strm >> _tao_aggregate.base_value.out ()) &&
-    (strm >> _tao_aggregate.type.out ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ValueDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ValueDescription &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_abstract)) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_custom)) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.supported_interface.in ()) &&
-    (strm << _tao_aggregate.abstract_base_values) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_truncatable)) &&
-    (strm << _tao_aggregate.base_value.in ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ValueDescription &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_abstract)) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_custom)) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.supported_interface.out ()) &&
-    (strm >> _tao_aggregate.abstract_base_values) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_truncatable)) &&
-    (strm >> _tao_aggregate.base_value.out ())
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueBoxDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueBoxDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueBoxDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueBoxDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ValueBoxDef::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 4c50530ee67..73e01cdf404 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -84,8 +84,6 @@ TAO_GIOP_Invocation::TAO_GIOP_Invocation (TAO_Stub *stub,
 
 TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void)
 {
-  if (this->transport_ != 0)
-    this->transport_->idle_after_reply ();
 }
 
 // The public API involves creating an invocation, starting it, filling
@@ -152,7 +150,7 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
         timeout->relative_expiry (ACE_TRY_ENV);
       ACE_CHECK;
       TimeBase::TimeT seconds = t / 10000000u;
-      TimeBase::TimeT microseconds = (t % 10000000u) / 10;
+      TimeBase::TimeT microseconds = t % 10000000u;
       this->max_wait_time_value_.set (ACE_U64_TO_U32(seconds),
                                       ACE_U64_TO_U32(microseconds));
       this->max_wait_time_ = &this->max_wait_time_value_;
@@ -393,6 +391,12 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
 
 // ****************************************************************
 
+TAO_GIOP_Twoway_Invocation::~TAO_GIOP_Twoway_Invocation (void)
+{
+  if (this->transport_ != 0)              
+    this->transport_->idle ();
+}
+
 void
 TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -638,7 +642,8 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
     }
 
   int reply_error =
-    this->transport_->wait_for_reply (this->max_wait_time_);
+    this->transport_->wait_for_reply (this->max_wait_time_,
+                                      this->rd_.reply_received ());
 
   // Do the wait loop till we receive the reply for this invocation.
   // while (reply_error != -1 &&
@@ -767,6 +772,12 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
 
 // ****************************************************************
 
+TAO_GIOP_Oneway_Invocation::~TAO_GIOP_Oneway_Invocation (void)
+{
+  if (this->transport_ != 0)              
+    this->transport_->idle ();
+}
+
 void
 TAO_GIOP_Oneway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -785,6 +796,12 @@ TAO_GIOP_Oneway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
 
 // ****************************************************************
 
+TAO_GIOP_Locate_Request_Invocation::~TAO_GIOP_Locate_Request_Invocation (void)
+{
+  if (this->transport_ != 0)              
+    this->transport_->idle ();
+}
+
 // Send request, block until any reply comes back.
 void
 TAO_GIOP_Locate_Request_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
@@ -860,7 +877,8 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
   // Wait for the reply.
 
   int reply_error =
-    this->transport_->wait_for_reply (this->max_wait_time_);
+    this->transport_->wait_for_reply (this->max_wait_time_,
+                                      this->rd_.reply_received ());
 
   //   // Do the wait loop, till we receive the reply for this invocation.
   //   while (reply_error != -1 &&
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 5ea132a7bd4..47648c22431 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -30,11 +30,6 @@
 #define TAO_INVOCATION_H
 
 #include "tao/CDR.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/ORB_Core.h"
 #include "tao/GIOP.h"
 #include "tao/Any.h"
@@ -76,8 +71,11 @@ public:
                        TAO_ORB_Core* orb_core);
   // Constructor.
 
-  ~TAO_GIOP_Invocation (void);
-  // Destructor.
+  virtual ~TAO_GIOP_Invocation (void);
+  // This destructor is virtual so that the derived synchronous
+  // invocation classes can call <idle> method on the <Transport>, if
+  // they want to. All the synchronous invocations <idle> the
+  // Transport, but asynchronous invocations do not do that.
 
   void put_param (CORBA::TypeCode_ptr tc,
                   void *value,
@@ -177,6 +175,9 @@ public:
                               TAO_ORB_Core* orb_core);
   // Constructor.
 
+  ~TAO_GIOP_Twoway_Invocation (void);
+  // Destructor.
+
   void start (CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -235,6 +236,9 @@ public:
                               TAO_ORB_Core* orb_core);
   // Constructor.
 
+  ~TAO_GIOP_Oneway_Invocation (void);
+  // Destructor.
+
   void start (CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -258,6 +262,9 @@ public:
                                       TAO_ORB_Core* orb_core);
   // Constructor.
 
+  ~TAO_GIOP_Locate_Request_Invocation (void);
+  // Destructor.
+
   void start (CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index a464c4e0b9b..cdd4bb0e3f2 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -21,11 +21,6 @@
 #define TAO_MPROFILE_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Pluggable.h"
 
 typedef CORBA::ULong TAO_PHandle;
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index e115fcc5d7f..20f9efc8efe 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -271,7 +271,7 @@ endif # fakesvcconf
 ifeq ($(LYNXTARGET),ppc)
 #### POA.cpp raises internal compiler error with LynxOS 3.0.0 g++, but
 #### only when optimization is enabled.  Disable it . . .
-.obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp
+$(VDIR).obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp
 	@echo NOTE: compiling POA.cpp with -O instead of -O2, see Makefile.
 	$(subst $(OCFLAGS) ,-O ,$(COMPILE.cc)) -o $@ $<
 endif # LYNXTARGET == ppc
@@ -305,6 +305,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -526,12 +528,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i
+ $(ACE_ROOT)/ace/Timeprobe.h
 .obj/Key_Adapters.o .obj/Key_Adapters.so .shobj/Key_Adapters.o .shobj/Key_Adapters.so: Key_Adapters.cpp \
  $(TAO_ROOT)/tao/Key_Adapters.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -540,6 +537,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -671,11 +670,12 @@ realclean:
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i
-.obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
+.obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -911,6 +911,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1144,6 +1146,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1345,6 +1349,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1513,6 +1519,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1659,6 +1667,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1748,14 +1758,6 @@ realclean:
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/Operation_Table.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -1783,6 +1785,9 @@ realclean:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
@@ -1894,6 +1899,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2037,6 +2044,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2241,6 +2250,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2440,6 +2451,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2640,6 +2653,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2780,6 +2795,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3025,6 +3042,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3294,6 +3313,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3494,11 +3515,6 @@ realclean:
  $(TAO_ROOT)/tao/IIOP_Profile.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/MessagingC.h \
@@ -3544,6 +3560,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3791,6 +3809,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4037,6 +4057,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4209,11 +4231,6 @@ realclean:
  $(TAO_ROOT)/tao/IIOP_Connect.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Environment.h \
@@ -4277,6 +4294,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4531,6 +4550,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4808,6 +4829,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4996,11 +5019,6 @@ realclean:
  $(TAO_ROOT)/tao/UIOP_Profile.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/MessagingC.h \
@@ -5066,6 +5084,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5322,6 +5342,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5575,6 +5597,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5753,6 +5777,8 @@ realclean:
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/UIOP_Connect.i \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Environment.h \
@@ -5807,18 +5833,13 @@ realclean:
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
 .obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp \
  $(TAO_ROOT)/tao/IORC.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6077,6 +6098,8 @@ realclean:
  $(TAO_ROOT)/tao/IORC.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6169,8 +6192,7 @@ realclean:
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- IORS.i
+ $(TAO_ROOT)/tao/Servant_Base.i IORS.i
 .obj/IORManipulation.o .obj/IORManipulation.so .shobj/IORManipulation.o .shobj/IORManipulation.so: IORManipulation.cpp \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/Object.h \
@@ -6180,6 +6202,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6440,6 +6464,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6639,6 +6665,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6834,6 +6862,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7058,6 +7088,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7201,6 +7233,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7341,6 +7375,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7543,6 +7579,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7706,6 +7744,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7869,6 +7909,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7960,6 +8002,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8101,6 +8145,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8241,6 +8287,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8372,6 +8420,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8437,6 +8487,8 @@ realclean:
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8531,11 +8583,6 @@ realclean:
  $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
@@ -8574,8 +8621,7 @@ realclean:
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i
-.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp \
- $(TAO_ROOT)/tao/Any.h \
+.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -8583,6 +8629,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8780,6 +8828,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8938,6 +8988,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9085,6 +9137,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9161,6 +9215,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9234,6 +9290,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9427,6 +9485,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9488,19 +9548,37 @@ realclean:
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -9517,87 +9595,41 @@ realclean:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
  $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.h \
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -9641,6 +9673,9 @@ realclean:
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
@@ -9655,14 +9690,15 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp \
- $(TAO_ROOT)/tao/ORB.h \
+.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9935,6 +9971,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10005,6 +10043,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10206,6 +10246,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10352,6 +10394,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10552,6 +10596,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10637,8 +10683,7 @@ realclean:
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- DomainC.i \
+ $(TAO_ROOT)/tao/Any.i DomainC.i \
  $(TAO_ROOT)/tao/Operation_Table.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -10702,6 +10747,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10771,9 +10818,8 @@ realclean:
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- TimeBaseC.i TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp \
- TimeBaseS.i
+ $(TAO_ROOT)/tao/Any.i TimeBaseC.i \
+ TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i
 .obj/TimeBaseS.o .obj/TimeBaseS.so .shobj/TimeBaseS.o .shobj/TimeBaseS.so: TimeBaseS.cpp TimeBaseS.h TimeBaseC.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
@@ -10783,6 +10829,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10852,8 +10900,8 @@ realclean:
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i
+ $(TAO_ROOT)/tao/Any.i TimeBaseC.i \
+ TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i
 .obj/Principal.o .obj/Principal.so .shobj/Principal.o .shobj/Principal.so: Principal.cpp \
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -10862,6 +10910,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10949,6 +10999,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11028,6 +11080,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11222,12 +11276,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i
+ $(ACE_ROOT)/ace/Timeprobe.h
 .obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -11236,6 +11285,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11326,6 +11377,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11525,18 +11578,15 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i
+ $(ACE_ROOT)/ace/Timeprobe.h
 .obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp \
  $(TAO_ROOT)/tao/Typecode.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11632,6 +11682,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11827,6 +11879,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11893,6 +11947,8 @@ realclean:
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12031,6 +12087,8 @@ realclean:
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12042,15 +12100,12 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -12074,6 +12129,11 @@ realclean:
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
@@ -12083,16 +12143,6 @@ realclean:
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
@@ -12223,6 +12273,9 @@ realclean:
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -12238,6 +12291,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12311,6 +12366,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12379,6 +12436,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12464,6 +12523,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12545,14 +12606,6 @@ realclean:
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/GIOP_Server_Request.h \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -12662,6 +12715,9 @@ realclean:
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -12702,6 +12758,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12898,12 +12956,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i
+ $(ACE_ROOT)/ace/Timeprobe.h
 .obj/Invocation.o .obj/Invocation.so .shobj/Invocation.o .shobj/Invocation.so: Invocation.cpp \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/CDR.h \
@@ -12913,6 +12966,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13109,11 +13164,6 @@ realclean:
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.i \
- $(ACE_ROOT)/ace/Timeprobe_T.h \
- $(ACE_ROOT)/ace/Timeprobe_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Connector_Registry.h
@@ -13127,6 +13177,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13323,6 +13375,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13567,6 +13621,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13662,6 +13718,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13848,7 +13906,7 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h
 .obj/Server_Strategy_Factory.o .obj/Server_Strategy_Factory.so .shobj/Server_Strategy_Factory.o .shobj/Server_Strategy_Factory.so: Server_Strategy_Factory.cpp \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -13857,6 +13915,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13929,6 +13989,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -14079,6 +14141,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -14225,6 +14289,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -14312,178 +14378,16 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/ObjectIDList.i
-.obj/TAO.o .obj/TAO.so .shobj/TAO.o .shobj/TAO.so: TAO.cpp \
- $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/tao/debug.h
+.obj/TAO.o .obj/TAO.so .shobj/TAO.o .shobj/TAO.so: TAO.cpp $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -14616,6 +14520,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -14812,6 +14718,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -14946,6 +14854,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15142,6 +15052,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15232,6 +15144,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15309,8 +15223,8 @@ realclean:
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/IOPC.i \
- IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i
+ $(TAO_ROOT)/tao/IOPC.i IOPS_T.h \
+ IOPS_T.i IOPS_T.cpp IOPS.i
 .obj/PollableC.o .obj/PollableC.so .shobj/PollableC.o .shobj/PollableC.so: PollableC.cpp \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -15319,6 +15233,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15388,6 +15304,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15456,6 +15374,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15533,8 +15453,7 @@ realclean:
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
- CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Any.h \
+ CONV_FRAMEC.i $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.i
@@ -15546,6 +15465,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15635,6 +15556,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15724,6 +15647,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15858,6 +15783,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16026,6 +15953,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16113,6 +16042,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16247,6 +16178,8 @@ realclean:
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16506,6 +16439,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16706,6 +16641,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16868,6 +16805,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17062,6 +17001,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17072,9 +17013,8 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- TimeBaseS.h TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
+ $(ACE_ROOT)/ace/Log_Record.i TimeBaseS.h \
+ TimeBaseC.h $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -17137,9 +17077,8 @@ realclean:
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i \
- POA_CORBA.h \
+ $(TAO_ROOT)/tao/Any.i TimeBaseC.i \
+ TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i POA_CORBA.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
@@ -17213,6 +17152,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17371,6 +17312,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17509,6 +17452,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17659,6 +17604,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17800,6 +17747,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17941,6 +17890,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18082,6 +18033,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18223,6 +18176,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18366,6 +18321,8 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index 2e86a5da485..2cbaa9cdeb7 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -106,8 +106,6 @@ OBJFILES = \
 	$(OBJDIR)\Wait_Strategy.obj \
 	$(OBJDIR)\WrongTransactionC.obj
 
-RESOURCE = $(OBJDIR)\tao.res
-
 CFLAGS = $(ACE_CFLAGS) $(TAO_BUILD_CFLAGS) $(TAO_CFLAGS)
 
 CPPDIR = .
diff --git a/TAO/tao/Managed_Types.h b/TAO/tao/Managed_Types.h
index 5e94a7a86e1..72fd617f6c5 100644
--- a/TAO/tao/Managed_Types.h
+++ b/TAO/tao/Managed_Types.h
@@ -20,10 +20,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 /****************************************************************/
 
 class TAO_Export TAO_String_Manager
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
index ab4ea402a28..65d45f56889 100644
--- a/TAO/tao/Marshal.h
+++ b/TAO/tao/Marshal.h
@@ -21,11 +21,6 @@
 #define TAO_MARSHAL_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Typecode.h"
 #include "tao/Principal.h"
 #include "tao/Any.h"
diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h
index 3207c8f0da5..3548dbd3a12 100644
--- a/TAO/tao/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging_Policy_i.h
@@ -80,11 +80,6 @@ private:
 
 #if defined (__ACE_INLINE__)
 #include "tao/Messaging_Policy_i.i"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #endif /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
index 4e73cfa7bb1..7887a4c4cde 100644
--- a/TAO/tao/NVList.h
+++ b/TAO/tao/NVList.h
@@ -21,10 +21,6 @@
 
 #include "tao/orbconf.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 #include "ace/Containers_T.h"
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index d45e1e55747..142a3f619c6 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -47,18 +47,14 @@
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
 #if defined (ACE_HAS_EXCEPTIONS)
-# if defined (ACE_MVS)
-#   include /**/ <unexpect.h>
-# else
-#  if defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#   include /**/ <exception>
-#   if !defined (ACE_WIN32)
+# if defined (ACE_HAS_STANDARD_CPP_LIBRARY)
+#  include /**/ <exception>
+#  if !defined (ACE_WIN32)
 using std::set_unexpected;
-#   endif /* !ACE_WIN32 */
-#  else
-#   include /**/ <exception.h>
-#  endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
-# endif /* ACE_MVS */
+#  endif /* !ACE_WIN32 */
+# else
+#  include /**/ <exception.h>
+# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
 #endif /* ACE_HAS_EXCEPTIONS */
 
 #if !defined (__ACE_INLINE__)
@@ -147,6 +143,8 @@ CORBA::Exception *CORBA::ORB::InvalidName::_alloc (void)
 CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core)
   : refcount_ (1),
     open_called_ (0),
+    shutdown_lock_ (0),
+    should_shutdown_ (0),
     name_service_ (CORBA_Object::_nil ()),
     schedule_service_ (CORBA_Object::_nil ()),
     event_service_ (CORBA_Object::_nil ()),
@@ -188,6 +186,9 @@ CORBA_ORB::~CORBA_ORB (void)
       TAO_TypeCodes::fini ();
     }
 
+  delete this->shutdown_lock_;
+  this->shutdown_lock_ = 0;
+
 # ifdef TAO_HAS_VALUETYPE
   // delete valuetype_factory_map_;
   // not really, its a singleton
@@ -227,8 +228,37 @@ void
 CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion,
                      CORBA::Environment &ACE_TRY_ENV)
 {
-  this->orb_core ()->shutdown (wait_for_completion,
-                               ACE_TRY_ENV);
+  // Is the <wait_for_completion> semantics for this thread correct?
+  TAO_POA::check_for_valid_wait_for_completions (wait_for_completion,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  // If the ORB::shutdown operation is called, it makes a call on
+  // deactivate with a TRUE etherealize_objects parameter for each POA
+  // manager known in the process; the wait_for_completion parameter
+  // to deactivate will be the same as the similarly named parameter
+  // of ORB::shutdown.
+  this->orb_core_->object_adapter ()->deactivate (wait_for_completion,
+                                                  ACE_TRY_ENV);
+  ACE_CHECK;
+
+  // Set the shutdown flag
+  this->should_shutdown (1);
+
+  // Grab the thread manager
+  ACE_Thread_Manager *tm = this->orb_core_->thr_mgr ();
+
+  // Try to cancel all the threads in the ORB.
+  tm->cancel_all ();
+
+  // Wake up all waiting threads in the reactor.
+  this->orb_core_->reactor ()->wakeup_all_threads ();
+
+  // If <wait_for_completion> is set, wait for all threads to exit.
+  if (wait_for_completion != 0)
+    tm->wait ();
+
+  return;
 }
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
@@ -853,7 +883,6 @@ CORBA_ORB::resolve_initial_references (const char *name,
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYCURRENT) == 0)
     return this->resolve_policy_current (ACE_TRY_ENV);
-
   else if (ACE_OS::strcmp (name, TAO_OBJID_IORMANIPULATION) == 0)
     return this->resolve_ior_manipulation (ACE_TRY_ENV);
 
@@ -881,33 +910,52 @@ CORBA_ORB::resolve_initial_references (const char *name,
       // Check if a DefaultInitRef was specified.
       if (ACE_OS::strlen (default_init_ref) != 0)
         {
-          ACE_CString list_of_profiles (default_init_ref);
+          // @@ This parsing code should be merged with or use the
+          //    parsing code used during MProfile creation in the
+          //    TAO_Connector base class.
+          //            -Ossama
+
+          ACE_CString list_of_profiles;
+
+          // Used by the strtok_r.
+          char *lasts = 0;
+
+          // Append the given object ID to all the end-points of
+          // Default Init Ref.
+          for (char *str = ACE_OS::strtok_r (default_init_ref,
+                                             ",",
+                                             &lasts);
+               str != 0 ;
+               str = ACE_OS::strtok_r (0,
+                                       ",",
+                                       &lasts))
+            {
+              list_of_profiles += ACE_CString (str);
 
-          // Clean up.
-          delete [] default_init_ref;
+              // Make sure that default initial reference doesn't
+              //    end with the object key delimiter character.
+
+              const char object_key_delimiter =
+                this->orb_core_->connector_registry ()->object_key_delimiter (str);
 
-          // Obtain the appropriate object key delimiter for the
-          // specified protocol.
-          const char object_key_delimiter =
-            this->orb_core_->connector_registry ()->object_key_delimiter (
-                                                  list_of_profiles.c_str ());
+              if (list_of_profiles[list_of_profiles.length() - 1] !=
+                  object_key_delimiter)
+                list_of_profiles += ACE_CString (object_key_delimiter);
+              list_of_profiles += object_id;
+              list_of_profiles += ACE_CString (",");
+            }
 
-          // Make sure that the default initial reference doesn't end
-          // with the object key delimiter character.
-          if (list_of_profiles[list_of_profiles.length() - 1] !=
-              object_key_delimiter)
-            list_of_profiles += ACE_CString (object_key_delimiter);
+          // Clean up.
+          delete [] default_init_ref;
 
-          list_of_profiles += object_id;
+          // Replace the last extra comma with a null.
+          list_of_profiles[list_of_profiles.length () - 1] = '\0';
 
           return this->string_to_object (list_of_profiles.c_str (),
                                          ACE_TRY_ENV);
         }
-      else
-        {
-          // Clean up.
-          delete [] default_init_ref;
-        }
+
+      delete [] default_init_ref;
     }
 
   // Did not find it in the InitRef table, or in the DefaultInitRef
@@ -923,17 +971,17 @@ CORBA_ORB::resolve_initial_references (const char *name,
     return this->resolve_implrepo_service (timeout, ACE_TRY_ENV);
 
   else
-    ACE_THROW_RETURN (CORBA::ORB::InvalidName (), CORBA::Object::_nil ());
+    ACE_THROW_RETURN (CORBA::ORB::InvalidName (), 0);
 
 }
 
+// Unimplemented at this time.
 CORBA_ORB_ObjectIdList_ptr
 CORBA_ORB::list_initial_services (CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_IOR_LookupTable *table =
-    this->orb_core_->orb_params ()->ior_lookup_table ();
-
-  return table->list_initial_services (ACE_TRY_ENV);
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+                                         CORBA::COMPLETED_NO),
+                    0);
 }
 
 TAO_Stub *
@@ -973,18 +1021,13 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
 CORBA::Object_ptr
 CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
                           const char *type_id,
-                          TAO_ServantBase *servant,
-                          CORBA::Boolean collocated,
                           CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_Stub *data = this->create_stub_object (key, type_id, ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Create the CORBA level proxy
-  CORBA_Object *new_obj =
-    this->orb_core_->optimize_collocation_objects () ?
-    new CORBA_Object (data, servant, collocated) :
-    new CORBA_Object (data, 0, 0);
+  CORBA_Object *new_obj = new CORBA_Object (data);
 
   // Clean up in case of errors.
   if (CORBA::is_nil (new_obj))
@@ -993,7 +1036,6 @@ CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
       ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::Object::_nil ());
     }
 
-  data->servant_orb (CORBA::ORB::_duplicate (this));
   return new_obj;
 }
 
@@ -1311,7 +1353,7 @@ CORBA::ORB_init (int &argc,
 
   // The ORB was initialized already, just return that one!
   if (oc != 0)
-    return CORBA::ORB::_duplicate (oc->orb ());
+    return oc->orb ();
 
   // @@ As part of the ORB re-architecture this will the point where
   //    we locate the right ORB (from a table) and use that one
@@ -1578,6 +1620,8 @@ CORBA::Object_ptr
 CORBA_ORB::url_ior_string_to_object (const char* str,
                                      CORBA::Environment& ACE_TRY_ENV)
 {
+  CORBA::Object_ptr obj = CORBA::Object::_nil ();
+
   TAO_MProfile mprofile;
   // It is safe to declare this on the stack since the contents of
   // mprofile get copied.  No memory is allocated for profile storage
@@ -1619,8 +1663,6 @@ CORBA_ORB::url_ior_string_to_object (const char* str,
   if (servant_location != TAO_SERVANT_NOT_FOUND)
     collocated = 1;
 
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
   // Create the CORBA level proxy.  This will increase the ref_count
   // on data by one
   ACE_NEW_THROW_EX (obj,
@@ -1651,37 +1693,48 @@ TAO_SERVANT_LOCATION
 CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj,
                                     TAO_ServantBase *&servant)
 {
-  if (sobj == 0)
+  if (sobj == 0 || !this->_optimize_collocation_objects ())
     return TAO_SERVANT_NOT_FOUND;
 
   // @@ What about forwarding.  Which this approach we are never forwarded
   //    when we use collocation!
+
   const TAO_MProfile &mprofile = sobj->get_base_profiles ();
 
-  {
-    // @@ Ossama: maybe we need another lock for the table, to
-    //    reduce contention on the Static_Object_Lock below, if so
-    //    then we need to use that lock in the ORB_init() function.
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                              *ACE_Static_Object_Lock::instance (), TAO_SERVANT_NOT_FOUND));
-
-    TAO_ORB_Table *table = TAO_ORB_Table::instance ();
-    TAO_ORB_Table::Iterator end = table->end ();
-    for (TAO_ORB_Table::Iterator i = table->begin ();
-         i != end;
-         ++i)
-      {
-        TAO_SERVANT_LOCATION servant_location =
-          this->_find_collocated_servant (sobj,
-                                          (*i).int_id_,
-                                          servant,
-                                          mprofile);
-        if (servant_location != TAO_SERVANT_NOT_FOUND)
-          return servant_location;
-      }
-  }
-  // If we don't find one by this point, we return 0.
-  return TAO_SERVANT_NOT_FOUND;
+  if (this->orb_core_->use_global_collocation ())
+    {
+      // @@ Ossama: maybe we need another lock for the table, to
+      //    reduce contention on the Static_Object_Lock below, if so
+      //    then we need to use that lock in the ORB_init() function.
+
+      ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
+                                *ACE_Static_Object_Lock::instance (), TAO_SERVANT_NOT_FOUND));
+
+      TAO_ORB_Table *table = TAO_ORB_Table::instance ();
+      TAO_ORB_Table::Iterator end = table->end ();
+      for (TAO_ORB_Table::Iterator i = table->begin ();
+           i != end;
+           ++i)
+        {
+          TAO_SERVANT_LOCATION servant_location =
+            this->_find_collocated_servant (sobj,
+                                            (*i).int_id_,
+                                            servant,
+                                            mprofile);
+          if (servant_location != TAO_SERVANT_NOT_FOUND)
+            return servant_location;
+        }
+
+      // If we don't find one by this point, we return 0.
+      return TAO_SERVANT_NOT_FOUND;
+    }
+  else
+    {
+      return this->_find_collocated_servant (sobj,
+                                             this->orb_core_,
+                                             servant,
+                                             mprofile);
+    }
 }
 
 TAO_SERVANT_LOCATION
@@ -1690,12 +1743,6 @@ CORBA_ORB::_find_collocated_servant (TAO_Stub *sobj,
                                      TAO_ServantBase *&servant,
                                      const TAO_MProfile &mprofile)
 {
-  if (!orb_core->optimize_collocation_objects ())
-    return TAO_SERVANT_NOT_FOUND;
-
-  if (!orb_core->use_global_collocation () && orb_core != this->orb_core_)
-    return TAO_SERVANT_NOT_FOUND;
-
   if (!orb_core->is_collocated (mprofile))
     return TAO_SERVANT_NOT_FOUND;
 
@@ -1755,7 +1802,7 @@ CORBA_ORB::_tao_add_to_IOR_table (const ACE_CString &object_id,
   CORBA::String_var string =
     this->object_to_string (obj);
 
-  if (string.in () == 0 || string[0u] == '\0')
+  if (string.in () == 0 || string.in ()[0] == '\0')
     return -1;
 
   ACE_CString ior (string.in ());
@@ -1774,32 +1821,17 @@ int
 CORBA_ORB::_tao_find_in_IOR_table (const ACE_CString &object_id,
                                    CORBA::Object_ptr &obj)
 {
-  // @@ This debugging output should *NOT* be used since the
-  //    object key string is not null terminated, nor can it
-  //    be null terminated without copying.  No copying should
-  //    be done since performance is somewhat important here.
-  //    So, just remove the debugging output entirely.
-  //
-  //   if (TAO_debug_level > 0)
-  //     ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t): lookup service ID <%s>\n",
-  //                 object_id.c_str ()));
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t): lookup service ID <%s>\n",
+                object_id.c_str ()));
 
   ACE_CString ior;
 
   if (this->lookup_table_.find_ior (object_id, ior) != 0)
-    {
-      // @@ This debugging output should *NOT* be used since the
-      //    object key string is not null terminated, nor can it
-      //    be null terminated without copying.  No copying should
-      //    be done since performance is somewhat important here.
-      //    So, just remove the debugging output entirely.
-      //
-      //       ACE_ERROR_RETURN ((LM_ERROR,
-      //                          "TAO (%P|%t) cannot find IOR for <%s>\n",
-      //                          object_id.c_str ()),
-      //                         -1);
-      return -1;
-    }
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "TAO (%P|%t) cannot find IOR for <%s>\n",
+                       object_id.c_str ()),
+                      -1);
 
   obj = this->string_to_object (ior.c_str ());
 
@@ -1920,6 +1952,7 @@ template class TAO_Unbounded_Sequence<CORBA::Octet>;
 
 template class ACE_Dynamic_Service<TAO_Server_Strategy_Factory>;
 template class ACE_Dynamic_Service<TAO_Client_Strategy_Factory>;
+template class ACE_Guard<TAO_Cached_Connector_Lock>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -1929,5 +1962,6 @@ template class ACE_Dynamic_Service<TAO_Client_Strategy_Factory>;
 
 #pragma instantiate ACE_Dynamic_Service<TAO_Server_Strategy_Factory>
 #pragma instantiate ACE_Dynamic_Service<TAO_Client_Strategy_Factory>
+#pragma instantiate ACE_Guard<TAO_Cached_Connector_Lock>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 03a06ff34d0..52ca6484f3a 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -21,11 +21,6 @@
 #define TAO_ORB_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Exception.h"
 #include "tao/IOR_LookupTable.h"
 #include "tao/Services.h"
@@ -516,10 +511,9 @@ public:
   // will remains compliant with the CORBA
   // <resolve_initial_references> specification.
 
-  CORBA_ORB_ObjectIdList_ptr list_initial_services (
-              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Returns a sequence of ObjectIds that lists which objects have
-  // references available via the initial references mechanism.
+  // Unimplemented function - throws CORBA::NO_IMPLEMENT.
+  CORBA_ORB_ObjectIdList_ptr list_initial_services (CORBA_Environment &ACE_TRY_ENV =
+                                                    TAO_default_environment ());
 
 #if defined(TAO_HAS_CORBA_MESSAGING)
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
@@ -562,8 +556,6 @@ public:
 
   CORBA_Object_ptr key_to_object (const TAO_ObjectKey &key,
                                   const char *type_id,
-                                  TAO_ServantBase *servant = 0,
-                                  CORBA::Boolean collocated = 1,
                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
   // Convert key into an object reference.  Return Object_ptr as out
   // parameter.  Errors will come through the environment.
@@ -576,10 +568,6 @@ public:
   // null type ID.  Providing a null object key will result in an
   // INV_OBJREF exception.
   //
-  // <servant> and <collocated> are used to created collocated object
-  // references.  All object references created by this function should
-  // be collocated object.
-  //
   // Clients which invoke operations using one of these references
   // when the server is not active (or after the last reference to the
   // POA is released) will normally see an OBJECT_NOT_EXIST exception
@@ -608,6 +596,12 @@ public:
   virtual CORBA::ULong _incr_refcnt (void);
   virtual CORBA::ULong _decr_refcnt (void);
 
+  void should_shutdown (int value);
+  // Set the shutdown flag to <value>.
+
+  int should_shutdown (void);
+  // Get the shutdown flag value
+
   void _use_omg_ior_format (CORBA::Boolean ior);
   // Set the IOR flag.
   CORBA::Boolean _use_omg_ior_format (void);
@@ -709,6 +703,13 @@ private:
   ACE_SYNCH_MUTEX open_lock_;
   // Mutual exclusion for calling open.
 
+  ACE_Lock *shutdown_lock_;
+  // Pointer to our shutdown lock.
+
+  int should_shutdown_;
+  // Flag which denotes that the ORB should shut down and <run> should
+  // return.
+
   CORBA_Object_ptr name_service_;
   // If this is non-_nil(), then this is the object reference to our
   // configured Naming Context.
diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
index 70b65e523b2..0b5baf8ecde 100644
--- a/TAO/tao/ORB.i
+++ b/TAO/tao/ORB.i
@@ -247,6 +247,20 @@ CORBA_WString_out::ptr (void)
 //  ORB specific
 // ---------------------------------------------------------------------------
 
+ACE_INLINE void
+CORBA_ORB::should_shutdown (int value)
+{
+  ACE_GUARD (ACE_Lock, monitor, *this->shutdown_lock_);
+  this->should_shutdown_ = value;
+}
+
+ACE_INLINE int
+CORBA_ORB::should_shutdown (void)
+{
+  ACE_GUARD_RETURN (ACE_Lock, monitor, *this->shutdown_lock_, -1);
+  return this->should_shutdown_;
+}
+
 ACE_INLINE CORBA::ULong
 CORBA_ORB::_incr_refcnt (void)
 {
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index e7c0e194762..b4bf8c0c078 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -49,7 +49,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     acceptor_registry_ (0),
     protocol_factories_ (0),
     root_poa_ (0),
-    orb_params_ (),
+    orb_params_ (0),
     orbid_ (ACE_OS::strdup (orbid?orbid:"")),
     resource_factory_ (0),
     resource_factory_from_service_config_ (0),
@@ -74,8 +74,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     from_unicode_ (0),
     to_unicode_ (0),
     use_tss_resources_ (0),
-    leader_follower_ (this),
-    has_shutdown_ (0)
+    leader_follower_ (this)
 {
   ACE_NEW (this->poa_current_,
            TAO_POA_Current);
@@ -84,13 +83,16 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
   this->tm_.wait_on_exit (0);
 
 #if defined(ACE_MVS)
-  ACE_NEW (this->from_iso8859_, ACE_IBM1047_ISO8859);
+  ACE_NEW (this->from_iso8859_, ACE_ISO8859_IBM1047);
   ACE_NEW (this->to_iso8859_,   ACE_IBM1047_ISO8859);
 #endif /* ACE_MVS */
 }
 
 TAO_ORB_Core::~TAO_ORB_Core (void)
 {
+  // Allocated in init()
+  delete this->orb_params_;
+
   ACE_OS::free (this->orbid_);
 
   delete this->poa_current_;
@@ -152,6 +154,13 @@ TAO_ORB_Core::init (int &argc, char *argv[])
     argv0 = argv[0];
   svc_config_argv[svc_config_argc++] = CORBA::string_dup (argv0);
 
+  // Initialize the container for the ORB parameters.
+  // orb_params_ must be initialized before the command line parsing loop
+  // since some of the parsing code expects it to have been already
+  // initialized.
+  if (this->orb_params_ == 0)
+    ACE_NEW_RETURN (this->orb_params_, TAO_ORB_Parameters, 0);
+
   // @@ This should be an IIOP default, more generally each
   //    loaded protocol should have it's own default defined by the
   //    implemention.  This is currently defined to be a zero, fredk
@@ -233,24 +242,6 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   // -1 is unknown, default to what the resource factory sets.
   // @@ This is just for backwards compatibility.
 
-#if defined (DEBUG)
-  // Make it a little easier to debug programs using this code.
-  {
-    TAO_debug_level = ACE_Env_Value<u_int> ("TAO_ORB_DEBUG", 0);
-
-    char *value = ACE_OS::getenv ("TAO_ORB_DEBUG");
-
-    if (value != 0)
-      {
-        TAO_debug_level = ACE_OS::atoi (value);
-        if (TAO_debug_level <= 0)
-          TAO_debug_level = 1;
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_debug_level == %d", TAO_debug_level));
-      }
-  }
-#endif  /* DEBUG */
-
   while (arg_shifter.is_anything_left ())
     {
       char *current_arg = arg_shifter.get_current ();
@@ -548,21 +539,11 @@ TAO_ORB_Core::init (int &argc, char *argv[])
         // objects.  Valid arguments are: "yes" and "no".  Default is
         // yes.
         {
-          int yes_implies_global = 0;
           arg_shifter.consume_arg ();
           if (arg_shifter.is_parameter_next ())
             {
               char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "YES") == 0)
-                {
-                  yes_implies_global = 1;
-                  ACE_DEBUG ((LM_DEBUG,
-                              "Warning: using '-ORBCollocation YES' is obsolete "
-                              "and implies '-ORBCollocation global'"
-                              "  Please use '-ORBCollocation global' instead.\n"));
-                }
-
-              if (yes_implies_global ||
+              if (ACE_OS::strcasecmp (opt, "YES") == 0 ||
                   ACE_OS::strcasecmp (opt, "global") == 0)
                 {
                   this->opt_for_collocation_ = 1;
@@ -799,6 +780,24 @@ TAO_ORB_Core::init (int &argc, char *argv[])
         arg_shifter.ignore_arg ();
     }
 
+#if defined (DEBUG)
+  // Make it a little easier to debug programs using this code.
+  {
+    TAO_debug_level = ACE_Env_Value<u_int> ("TAO_ORB_DEBUG", 0);
+
+    char *value = ACE_OS::getenv ("TAO_ORB_DEBUG");
+
+    if (value != 0)
+      {
+        TAO_debug_level = ACE_OS::atoi (value);
+        if (TAO_debug_level <= 0)
+          TAO_debug_level = 1;
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_debug_level == %d", TAO_debug_level));
+      }
+  }
+#endif  /* DEBUG */
+
 #if defined (SIGPIPE) && !defined (ACE_LACKS_UNIX_SIGNALS)
   // There's really no way to deal with this in a portable manner, so
   // we just have to suck it up and get preprocessor conditional and
@@ -877,6 +876,9 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   // being done at this level.
   this->orb_->_use_omg_ior_format (use_ior);
 
+  // Set the <shutdown_lock_> for the ORB.
+  this->orb_->shutdown_lock_ = ssf->create_event_loop_lock ();
+
   // @@ Michael: I don't know if this is the best spot,
   // we might have to discuss that.
   //this->leader_follower_lock_ptr_ =  this->client_factory ()
@@ -1186,40 +1188,25 @@ TAO_ORB_Core::inherit_from_parent_thread (TAO_ORB_Core_TSS_Resources *tss_resour
   // each ORB spawned thread must use the resources of the spawning
   // thread...
 
-  if (tss_resources)
+  if (tss_resources->reactor_ != 0)
     {
-      if (tss_resources->reactor_ != 0)
+      // We'll use the spawning thread's reactor.
+      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
+      if (tss->reactor_ != 0 && TAO_debug_level > 0)
         {
-          // We'll use the spawning thread's reactor.
-          TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-          if (tss->reactor_ != 0 && TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) non nil reactor on thread startup!\n"));
-
-              if (tss == 0)
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%P|%t) %p\n",
-                                   "TAO_ORB_Core::inherit_from_parent_thread"
-                                   " (); no more TSS keys"),
-                                  -1);
-
-              if (tss->owns_resources_ != 0 && !tss->inherited_reactor_)
-                delete tss->reactor_;
-            }
-          tss->reactor_ = tss_resources->reactor_;
-          tss->inherited_reactor_ = 1;
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - non nil reactor on thread startup!\n"));
+          if (tss->owns_resources_ != 0 && !tss->inherited_reactor_)
+            delete tss->reactor_;
         }
+      tss->reactor_ = tss_resources->reactor_;
+      tss->inherited_reactor_ = 1;
+    }
 
-      // this->connection_cache (tss_resources->connection_cache_);
-      // Inherit connection cache?
+  // this->connection_cache (tss_resources->connection_cache_);
+  // Inherit connection cache?
 
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
+  return 0;
 }
 
 PortableServer::POA_ptr
@@ -1316,6 +1303,26 @@ TAO_ORB_Core::object_adapter_i (void)
   return this->object_adapter_;
 }
 
+ACE_SYNCH_CONDITION* 
+TAO_ORB_Core::leader_follower_condition_variable (void)
+{
+  // Always using TSS.
+
+  // Get tss key.
+  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
+
+  if (tss->leader_follower_condition_variable_ == 0)
+    {
+      // Create a new one and return.
+      ACE_NEW_RETURN (tss->leader_follower_condition_variable_,
+                      ACE_SYNCH_CONDITION (this->leader_follower ().lock ()),
+                      0);
+      tss->owns_resources_ = 1;
+    }
+  
+  return tss->leader_follower_condition_variable_;
+}
+
 int
 TAO_ORB_Core::is_collocated (const TAO_MProfile& mprofile)
 {
@@ -1369,14 +1376,8 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int break_on_timeouts)
   int result = 1;
   // 1 to detect that nothing went wrong
 
-  // Loop handling client requests until the ORB is shutdown.
-
-  // @@ We could use the leader-follower lock to check for the state
-  //    of this variable or use the lock <create_event_loop_lock> in
-  //    the server strategy factory.
-  //    We don't need to do this because we use the Reactor
-  //    mechanisms to shutdown in a thread-safe way.
-  while (this->has_shutdown () == 0)
+  // Loop "forever" handling client requests.
+  while (this->orb ()->should_shutdown () == 0)
     {
       if (TAO_debug_level >= 3)
         ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - blocking on handle events\n"));
@@ -1420,64 +1421,6 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int break_on_timeouts)
   return result;
 }
 
-void
-TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_POA::check_for_valid_wait_for_completions (wait_for_completion,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // If the ORB::shutdown operation is called, it makes a call on
-  // deactivate with a TRUE etherealize_objects parameter for each POA
-  // manager known in the process; the wait_for_completion parameter
-  // to deactivate will be the same as the similarly named parameter
-  // of ORB::shutdown.
-  this->object_adapter ()->deactivate (wait_for_completion,
-                                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Set the shutdown flag
-  {
-    TAO_Leader_Follower &leader_follower =
-      this->leader_follower ();
-
-    ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX,
-                        ace_mon,
-                        leader_follower.lock (),
-                        CORBA::INTERNAL ());
-    ACE_CHECK;
-    this->has_shutdown_ = 1;
-
-    // Wakeup all the threads waiting blocked in the event loop, this
-    // does not guarantee that they will all go away, but reduces the
-    // load on the POA....
-    this->reactor ()->wakeup_all_threads ();
-
-    // If there are some client threads running we have to wait until
-    // they finish, when the last one does it will shutdown the
-    // reactor for us.  Meanwhile no new requests will be accepted
-    // because the POA will not process them.
-
-    if (!leader_follower.has_clients ())
-      {
-        // Wake up all waiting threads in the reactor.
-        this->reactor ()->end_reactor_event_loop ();
-      }
-  }                        
-  
-  // Grab the thread manager
-  ACE_Thread_Manager *tm = this->thr_mgr ();
-
-  // Try to cancel all the threads in the ORB.
-  tm->cancel_all ();
-
-  // If <wait_for_completion> is set, wait for all threads to exit.
-  if (wait_for_completion != 0)
-    tm->wait ();
-}
-
 // ****************************************************************
 
 ACE_SYNCH_CONDITION*
@@ -1489,16 +1432,16 @@ TAO_Leader_Follower::get_next_follower (void)
   if (iterator.first () == 0)
     // means set is empty
     return 0;
-
-  if (TAO_debug_level > 0)
+  
+  if (TAO_debug_level >= 4)
     ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - next follower is %x\n",
                 *iterator));
-
+  
   ACE_SYNCH_CONDITION *cond = *iterator;
 
   // We *must* remove it when we signal it so the same condition is
   // not signalled for both wake up as a follower and as the next
-  // leader.
+  // leader. 
   // The follower may not be there if the reply is received while the
   // consumer is not yet waiting for it (i.e. it send the request but
   // has not blocked to receive the reply yet)
@@ -1515,12 +1458,6 @@ TAO_ORB_Core::input_cdr_dblock_allocator (void)
   if (this->use_tss_resources_)
     {
       TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-      if (tss == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p\n",
-                           "TAO_ORB_Core::input_cdr_dblock_allocator (); "
-                             "no more TSS keys"),
-                          0);
 
       if (tss->input_cdr_dblock_allocator_ == 0)
         {
@@ -1550,12 +1487,6 @@ TAO_ORB_Core::input_cdr_buffer_allocator (void)
   if (this->use_tss_resources_)
     {
       TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-      if (tss == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p\n",
-                           "TAO_ORB_Core::input_cdr_buffer_allocator (); "
-                             "no more TSS keys"),
-                          0);
 
       if (tss->input_cdr_buffer_allocator_ == 0)
         {
@@ -1587,34 +1518,28 @@ TAO_ORB_Core::output_cdr_dblock_allocator (void)
 #endif /* 0 */
     {
       TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-      if (tss == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p\n",
-                           "TAO_ORB_Core::output_cdr_dblock_allocator (); "
-                             "no more TSS keys"),
-                          0);
 
-      if (tss->output_cdr_dblock_allocator_ == 0)
+      if (tss->output_cdr_buffer_allocator_ == 0)
         {
-          tss->output_cdr_dblock_allocator_ = this->resource_factory ()->output_cdr_dblock_allocator ();
+          tss->output_cdr_buffer_allocator_ = this->resource_factory ()->output_cdr_buffer_allocator ();
           tss->owns_resources_ = 1;
         }
-      return tss->output_cdr_dblock_allocator_;
+      return tss->output_cdr_buffer_allocator_;
     }
 
 #if 0
-  if (this->orb_resources_.output_cdr_dblock_allocator_ == 0)
+  if (this->orb_resources_.output_cdr_buffer_allocator_ == 0)
     {
       // Double checked locking
       ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->orb_resources_.output_cdr_dblock_allocator_ == 0)
+      if (this->orb_resources_.output_cdr_buffer_allocator_ == 0)
         {
-          this->orb_resources_.output_cdr_dblock_allocator_ =
-            this->resource_factory ()->output_cdr_dblock_allocator ();
+          this->orb_resources_.output_cdr_buffer_allocator_ =
+            this->resource_factory ()->output_cdr_buffer_allocator ();
           this->orb_resources_.owns_resources_ = 1;
         }
     }
-  return this->orb_resources_.output_cdr_dblock_allocator_;
+  return this->orb_resources_.output_cdr_buffer_allocator_;
 #endif /* 0 */
 }
 
@@ -1626,12 +1551,6 @@ TAO_ORB_Core::output_cdr_buffer_allocator (void)
 #endif /* 0 */
     {
       TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-      if (tss == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p\n",
-                           "TAO_ORB_Core::input_cdr_buffer_allocator (); "
-                             "no more TSS keys"),
-                          0);
 
       if (tss->output_cdr_buffer_allocator_ == 0)
         {
@@ -1711,12 +1630,6 @@ TAO_ORB_Core::reactor (void)
     {
       TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
 
-      if (tss == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p\n",
-                           "TAO_ORB_Core::reactor (); no more TSS keys"),
-                          0);
-
       if (tss->reactor_ == 0)
         {
           tss->reactor_ = this->resource_factory ()->get_reactor ();
@@ -1780,7 +1693,8 @@ TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
      input_cdr_buffer_allocator_ (0),
      connection_cache_ (0),
      is_server_thread_ (0),
-     is_leader_thread_ (0)
+     is_leader_thread_ (0),
+     leader_follower_condition_variable_ (0)
 {
 }
 
@@ -1815,6 +1729,9 @@ TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void)
 
   // unimplemented delete this->connection_cache_;
   this->connection_cache_ = 0;
+
+  delete this->leader_follower_condition_variable_;
+  this->leader_follower_condition_variable_ = 0;
 }
 
 // ****************************************************************
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 87f6d107355..80b018eee6e 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -18,11 +18,6 @@
 #define TAO_ORB_CORE_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Environment.h"
 #include "tao/Policy_Manager.h"
 #include "tao/Resource_Factory.h"
@@ -101,6 +96,9 @@ public:
 
   int is_leader_thread_;
   // Is this thread a leader for this ORB?
+
+  ACE_SYNCH_CONDITION* leader_follower_condition_variable_;
+  // Condition variable for the leader follower model.
 };
 
 // ****************************************************************
@@ -169,9 +167,6 @@ public:
   ACE_Reverse_Lock<ACE_SYNCH_MUTEX> &reverse_lock (void);
   // Accessors
 
-  int has_clients (void) const;
-  // Check if there are any client threads running
-
 private:
   TAO_ORB_Core_TSS_Resources *get_tss_resources (void) const;
   // Shortcut to obtain the TSS resources of the orb core.
@@ -194,10 +189,6 @@ private:
   // There could be many leaders in the thread pool (i.e. calling
   // ORB::run), and the same leader could show up multiple times as it
   // receives nested upcalls and sends more requests.
-
-  int clients_;
-  // Count the number of active clients, this is useful to know when
-  // to deactivate the reactor
 };
 
 // ****************************************************************
@@ -416,17 +407,14 @@ public:
   // Obtain the TSS resources of this orb.
 
   TAO_Leader_Follower &leader_follower (void);
-  // Get access to the leader_follower class
+  // Get access to the leader_follower class.
 
   int run (ACE_Time_Value *tv, int break_on_timeouts);
-  // Run the event loop
-
-  void shutdown (CORBA::Boolean wait_for_completion,
-                 CORBA::Environment &ACE_TRY_ENV);
-  // End the event loop
+  // Run the event loop.
 
-  int has_shutdown (void);
-  // Get the shutdown flag value
+  ACE_SYNCH_CONDITION* leader_follower_condition_variable (void);
+  // Condition variable used in the Leader Follower Wait Strategy, on
+  // which the follower thread blocks. 
 
 protected:
   int set_iiop_endpoint (int dotted_decimal_addresses,
@@ -482,7 +470,7 @@ protected:
   PortableServer::POA_var root_poa_reference_;
   // Cached POA reference
 
-  TAO_ORB_Parameters orb_params_;
+  TAO_ORB_Parameters *orb_params_;
   // Parameters used by the ORB.
 
   char* orbid_;
@@ -574,10 +562,6 @@ protected:
 
   TAO_Leader_Follower leader_follower_;
   // Information about the leader follower model
-
-  int has_shutdown_;
-  // Flag which denotes that the ORB should shut down and <run> should
-  // return.
 };
 
 // ****************************************************************
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 7c1f183616d..150c55df3e9 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -61,10 +61,11 @@ TAO_ORB_Core::get_collocation_strategy (void) const
   return this->collocation_strategy_;
 }
 
-ACE_INLINE TAO_ORB_Parameters *
+ACE_INLINE
+TAO_ORB_Parameters *
 TAO_ORB_Core::orb_params(void)
 {
-  return &(this->orb_params_);
+  return this->orb_params_;
 }
 
 #define TAO_OC_RETRIEVE(member) \
@@ -155,20 +156,13 @@ TAO_ORB_Core::leader_follower (void)
   return this->leader_follower_;
 }
 
-ACE_INLINE int
-TAO_ORB_Core::has_shutdown (void)
-{
-  return this->has_shutdown_;
-}
-
 // ****************************************************************
 
 ACE_INLINE
 TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core)
   : orb_core_ (orb_core),
     reverse_lock_ (lock_),
-    leaders_ (0),
-    clients_ (0)
+    leaders_ (0)
 {
 }
 
@@ -213,16 +207,6 @@ TAO_Leader_Follower::set_client_thread (void)
     {
       --this->leaders_;
     }
-
-  if (this->clients_ == 0
-      && this->orb_core_->has_shutdown ())
-    {
-      // The ORB has shutdown and we are the first client after
-      // that. This means that the reactor is disabled, we must
-      // re-enable it if we want to receive any replys...
-      this->orb_core_->reactor ()->reset_reactor_event_loop ();
-    }
-  this->clients_++;
 }
 
 ACE_INLINE void
@@ -234,14 +218,6 @@ TAO_Leader_Follower::reset_client_thread (void)
     {
       ++this->leaders_;
     }
-  this->clients_--;
-  if (this->clients_ == 0 && this->orb_core_->has_shutdown ())
-    {
-      // The ORB has shutdown and we are the last client thread, we
-      // must stop the reactor to ensure that any server threads go
-      // away.
-      this->orb_core_->reactor ()->end_reactor_event_loop ();
-    }
 }
 
 ACE_INLINE void
@@ -317,12 +293,6 @@ TAO_Leader_Follower::reverse_lock (void)
   return this->reverse_lock_;
 }
 
-ACE_INLINE int
-TAO_Leader_Follower::has_clients (void) const
-{
-  return this->clients_;
-}
-
 // ****************************************************************
 
 ACE_INLINE TAO_ORB_Table *
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 13ffd4454ed..d182f37deb9 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -6,7 +6,6 @@
 // ORB:         CORBA_Object operations
 
 #include "tao/Object.h"
-#include "tao/Object_Adapter.h"
 #include "tao/Stub.h"
 #include "tao/Servant_Base.h"
 #include "tao/Request.h"
@@ -51,24 +50,9 @@ CORBA_Object::_is_a (const CORBA::Char *type_id,
                      CORBA::Environment &ACE_TRY_ENV)
 {
   // If the object is collocated then try locally....
-  if (this->is_collocated_)
-    {
-      // Which collocation strategy should we use?
-      if (this->protocol_proxy_->servant_orb_var ()->orb_core ()->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
-        {
-          TAO_Object_Adapter::Servant_Upcall servant_upcall
-            (*this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ());
-          servant_upcall.prepare_for_upcall (this->_object_key (),
-                                             "_is_a",
-                                             ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-          return servant_upcall.servant ()->_is_a (type_id, ACE_TRY_ENV);
-        }
+  if (this->is_collocated_ && this->servant_ != 0)
+    return this->servant_->_is_a (type_id, ACE_TRY_ENV);
 
-      // Direct collocation strategy is used.
-      if (this->servant_ != 0)
-        return this->servant_->_is_a (type_id, ACE_TRY_ENV);
-    }
   // NOTE: if istub->type_id is nonzero and we have local knowledge of
   // it, we can answer this question without a costly remote call.
   //
@@ -85,9 +69,8 @@ CORBA_Object::_is_a (const CORBA::Char *type_id,
   //
   // XXX if type_id is that of CORBA_Object, "yes, we comply" :-)
 
-  if (this->_stubobj ()->type_id.in () != 0
-      && ACE_OS::strcmp (type_id,
-                         this->_stubobj ()->type_id.in ()) == 0)
+  if ( ACE_static_cast(const char *, this->_stubobj ()->type_id) != 0
+      && ACE_OS::strcmp ((char *) type_id, (char *) this->_stubobj ()->type_id) == 0)
     return 1;
 
   CORBA::Boolean _tao_retval = 0;
@@ -223,24 +206,8 @@ CORBA::Boolean
 CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV)
 {
   // If the object is collocated then try locally....
-  if (this->is_collocated_)
-    {
-      // Which collocation strategy should we use?
-      if (this->protocol_proxy_->servant_orb_var ()->orb_core ()->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
-        {
-          TAO_Object_Adapter::Servant_Upcall servant_upcall
-            (*this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ());
-          servant_upcall.prepare_for_upcall (this->_object_key (),
-                                             "_non_existent",
-                                             ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-          return servant_upcall.servant ()->_non_existent (ACE_TRY_ENV);
-        }
-
-      // Direct collocation strategy is used.
-      if (this->servant_ != 0)
-        return this->servant_->_non_existent (ACE_TRY_ENV);
-    }
+  if (this->is_collocated_ && this->servant_ != 0)
+    return this->servant_->_non_existent (ACE_TRY_ENV);
 
   CORBA::Boolean _tao_retval = 0;
 
@@ -485,7 +452,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA_Object* x)
     return 0;
 
   // STRING, a type ID hint
-  if ((cdr << stubobj->type_id.in ()) == 0)
+  if ((cdr << stubobj->type_id) == 0)
     return 0;
 
   const TAO_MProfile& mprofile =
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index c4cf48a3299..e187b48c89b 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -27,10 +27,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 class TAO_ServantBase;
 class TAO_Stub;
 
diff --git a/TAO/tao/ObjectIDList.cpp b/TAO/tao/ObjectIDList.cpp
index 4425eb9cac4..a283fcd3fed 100644
--- a/TAO/tao/ObjectIDList.cpp
+++ b/TAO/tao/ObjectIDList.cpp
@@ -98,40 +98,6 @@ void operator<<= (
   ACE_ENDTRY;
 }
 
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_ORB_ObjectIdList &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm, CORBA_ORB_ObjectIdList &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
 void operator<<= (CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *_tao_elem) // non copying
 {
   ACE_TRY_NEW_ENV
diff --git a/TAO/tao/ObjectIDList.h b/TAO/tao/ObjectIDList.h
index ca02ea322b4..b5c51249cc6 100644
--- a/TAO/tao/ObjectIDList.h
+++ b/TAO/tao/ObjectIDList.h
@@ -37,7 +37,7 @@
 // ObjectIdList
 // *************************************************************
 
-class TAO_Export CORBA_ORB_ObjectIdList : public
+class  CORBA_ORB_ObjectIdList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
@@ -68,7 +68,7 @@ typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
 // class CORBA::ORB::ObjectIdList_var
 // *************************************************************
 
-class TAO_Export CORBA_ORB_ObjectIdList_var
+class CORBA_ORB_ObjectIdList_var
 {
 public:
   CORBA_ORB_ObjectIdList_var (void); // default constructor
@@ -102,7 +102,7 @@ private:
 #if !defined (_CORBA_ORB_OBJECTIDLIST___OUT_CH_)
 #define _CORBA_ORB_OBJECTIDLIST___OUT_CH_
 
-class TAO_Export CORBA_ORB_ObjectIdList_out
+class CORBA_ORB_ObjectIdList_out
 {
 public:
   CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&);
@@ -125,8 +125,8 @@ private:
 
 #ifndef __ACE_INLINE__
 
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CORBA_ORB_ObjectIdList &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_ORB_ObjectIdList &);
+CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ORB_ObjectIdList &); //
+CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ORB_ObjectIdList &);
 
 #endif /* __ACE_INLINE__ */
 
diff --git a/TAO/tao/ObjectIDList.i b/TAO/tao/ObjectIDList.i
index 29c465f6a6f..a03864bede7 100644
--- a/TAO/tao/ObjectIDList.i
+++ b/TAO/tao/ObjectIDList.i
@@ -197,3 +197,35 @@ CORBA_ORB_ObjectIdList_out::operator[] (CORBA::ULong slot)
 
 
 #endif /* end #if !defined */
+
+ACE_INLINE CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ORB_ObjectIdList &_tao_sequence
+  )
+{
+  if (strm << _tao_sequence.length ())
+  {
+    // encode all elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
+
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ORB_ObjectIdList &_tao_sequence)
+{
+  CORBA::ULong _tao_seq_len;
+  if (strm >> _tao_seq_len)
+  {
+    // set the length of the sequence
+    _tao_sequence.length (_tao_seq_len);
+    // retrieve all the elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp
index 3984e9fc011..2ef029a18ce 100644
--- a/TAO/tao/Object_Adapter.cpp
+++ b/TAO/tao/Object_Adapter.cpp
@@ -352,7 +352,7 @@ TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
                                         const TAO_Temporary_Creation_Time &poa_creation_time,
                                         TAO_POA *&poa,
                                         CORBA::Environment &ACE_TRY_ENV)
-{
+{ 
   int result = 0;
 
   if (root)
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 7b879a62f12..7edabe89708 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -14,11 +14,6 @@
 #define TAO_IDL_OBJECT_KEYC_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Sequence.h"
 
 class TAO_Export TAO_ObjectKey : public TAO_Unbounded_Sequence<CORBA::Octet>
diff --git a/TAO/tao/Operation_Table.h b/TAO/tao/Operation_Table.h
index f2b76ee0d74..9eaa1ba8fda 100644
--- a/TAO/tao/Operation_Table.h
+++ b/TAO/tao/Operation_Table.h
@@ -18,11 +18,6 @@
 #define TAO_OPTABLE_H
 
 #include "ace/Hash_Map_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "ace/Singleton.h"
 #include "ace/Synch.h"
 #include "tao/corbafwd.h"
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
index f5569af9a86..d464bb3de11 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/POA.cpp
@@ -1131,8 +1131,6 @@ TAO_POA::create_reference_i (const char *intf,
   // Ask the ORB to create you a reference
   return this->orb_core_.orb ()->key_to_object (key.in (),
                                                 intf,
-                                                0,
-                                                1,
                                                 ACE_TRY_ENV);
 }
 
@@ -1164,14 +1162,7 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
   // requests on those references will cause the object to be
   // activated if necessary, or the default servant used, depending on
   // the applicable policies.
-  PortableServer::Servant servant = 0;
   PortableServer::ObjectId_var system_id;
-
-  // @@ We need something that can find the system id using appropriate strategy,
-  // at the same time, return the servant if one is available.  Before we have that
-  // function, <create_reference_with_id_i> basically generates broken collocated
-  // object when DIRECT collocation strategy is used.
-
   if (this->active_object_map ().find_system_id_using_user_id (user_id,
                                                                system_id.out ()) != 0)
     {
@@ -1185,8 +1176,6 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
   // Ask the ORB to create you a reference
   return this->orb_core_.orb ()->key_to_object (key.in (),
                                                 intf,
-                                                servant,
-                                                1,
                                                 ACE_TRY_ENV);
 }
 
@@ -1346,8 +1335,6 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant,
   // Ask the ORB to create you a reference
   return this->orb_core_.orb ()->key_to_object (key.in (),
                                                 servant->_interface_repository_id (),
-                                                servant,
-                                                1,
                                                 ACE_TRY_ENV);
 }
 
@@ -1612,8 +1599,6 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id,
       // Ask the ORB to create you a reference
       return this->orb_core_.orb ()->key_to_object (key.in (),
                                                     servant->_interface_repository_id (),
-                                                    servant,
-                                                    1,
                                                     ACE_TRY_ENV);
     }
   else
@@ -2439,14 +2424,14 @@ TAO_POA::encode_sequence_to_string (CORBA::String &str,
   // OR, we could just return this space.  The classic time-space tradeoff,
   // and for now we'll let time win out, which means that we only do the
   // allocation once.
-  u_int len = 3 * seq.length (); /* space for zero termination not needed */;
+  u_int len = 3 * seq.length() + 1 /* for zero termination */;
   str = CORBA::string_alloc (len);
 
   char *cp = str;
 
   for (u_int i = 0;
-       cp < (cp + len) && i < seq.length();
-       ++i)
+       cp < (cp+len) && i < seq.length();
+       i++)
     {
       u_char byte = seq[i];
       if (isprint (byte) && byte != '\\')
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index 10f1fce53d2..4b2d7b7000c 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -19,11 +19,6 @@
 #define TAO_IDL_POAC_H
 
 #include "tao/PolicyC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/CurrentC.h"
 #include "tao/Exception.h"
 #include "tao/Environment.h"
diff --git a/TAO/tao/POAManager.h b/TAO/tao/POAManager.h
index 4370f37be37..d00e8d542ae 100644
--- a/TAO/tao/POAManager.h
+++ b/TAO/tao/POAManager.h
@@ -21,11 +21,6 @@
 #define TAO_POAMANAGER_H
 
 #include "tao/POAS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 // for POA skeleton.
 
 #include "tao/poa_macros.h"
diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h
index a5213c1b748..b86e7067820 100644
--- a/TAO/tao/POAS.h
+++ b/TAO/tao/POAS.h
@@ -19,11 +19,6 @@
 #define TAO_IDL_POAS_H
 
 #include "tao/POAC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Servant_Base.h"
 #include "tao/POA_CORBA.h"
 
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
index 5218093bbee..ecb5e93b537 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/POA_CORBA.h
@@ -30,11 +30,6 @@
 #define TAO_IDL_POA_CORBA_H
 
 #include "tao/CurrentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/PolicyC.h"
 #include "tao/DynAnyC.h"
 #include "tao/DomainC.h"
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index 973d7dfe61b..5bec9e99c84 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -161,7 +161,7 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
   this->ws_ = orb_core->client_factory ()->create_wait_strategy (this);
 
   // Create TMS now.
-  this->tms_ = orb_core->client_factory ()->create_transport_mux_strategy (orb_core);
+  this->tms_ = orb_core->client_factory ()->create_transport_mux_strategy (this);
 }
 
 TAO_Transport::~TAO_Transport (void)
@@ -215,9 +215,11 @@ TAO_Transport::bind_reply_dispatcher (CORBA::ULong request_id,
 }
 
 int
-TAO_Transport::wait_for_reply (ACE_Time_Value *max_wait_time)
+TAO_Transport::wait_for_reply (ACE_Time_Value *max_wait_time,
+                               int &reply_received)
 {
-  return this->ws_->wait (max_wait_time);
+  return this->ws_->wait (max_wait_time,
+                          reply_received);
 }
 
 // Read and handle the reply. Returns 0 when there is Short Read on
@@ -241,19 +243,25 @@ TAO_Transport::register_handler (void)
 int
 TAO_Transport::idle_after_send (void)
 {
-  return this->tms ()->idle_after_send (this);
+  return this->tms ()->idle_after_send ();
 }  
 
-int
-TAO_Transport::idle_after_reply (void)
-{
-  return this->tms ()->idle_after_reply (this);
-}
+// int
+// TAO_Transport::idle_after_reply (void)
+// {
+//   return this->tms ()->idle_after_reply ();
+// }
 
-int
-TAO_Transport::reply_received (const CORBA::ULong request_id)
+// int
+// TAO_Transport::reply_received (const CORBA::ULong request_id)
+// {
+//   return this->tms ()->reply_received (request_id);
+// }
+
+ACE_SYNCH_CONDITION *
+TAO_Transport::leader_follower_condition_variable (void)
 {
-  return this->tms ()->reply_received (request_id);
+  return this->wait_strategy ()->leader_follower_condition_variable ();
 }
 
 void
@@ -358,17 +366,6 @@ TAO_Connector::make_mprofile (const char *string,
       // Add the length of the colon and the two forward slashes `://'
       // to the IOR string index (i.e. 3)
     }
-
-  const int objkey_index =
-    ior.find (this->object_key_delimiter (), ior_index) + ior_index;
-  // Find the object key
-
-  if (objkey_index == 0 || objkey_index == ACE_CString::npos)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
-      // Failure: No endpoints specified or no object key specified.
-    }
-
   const char endpoint_delimiter = ',';
   // The delimiter used to seperate inidividual addresses.
 
@@ -376,11 +373,9 @@ TAO_Connector::make_mprofile (const char *string,
   // of entries in the MProfile.
 
   CORBA::ULong profile_count = 1;
-  // Number of endpoints in the IOR  (initialized to 1).
+  // Number of endpoints in the IOR  (initialized to 1)
 
-  // Only check for endpoints after the protocol specification and
-  // before the object key.
-  for (int i = ior_index; i < objkey_index; ++i)
+  for (size_t i = 0; i < ior.length (); ++i)
     {
       if (ior[i] == endpoint_delimiter)
         profile_count++;
@@ -408,6 +403,16 @@ TAO_Connector::make_mprofile (const char *string,
   //    `shu/arf'
   //    `1.1@chicken/arf'
 
+  int objkey_index =
+    ior.find (this->object_key_delimiter (), ior_index) + ior_index;
+  // Find the object key
+
+  if (objkey_index == 0 || objkey_index == ACE_CString::npos)
+    {
+      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
+      // Failure: No endpoints specified or no object key specified.
+    }
+
   int begin = 0;
   int end = ior_index - 1;
   // Initialize the end of the endpoint index
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
index ff9798da3fc..543db14630e 100644
--- a/TAO/tao/Pluggable.h
+++ b/TAO/tao/Pluggable.h
@@ -21,11 +21,6 @@
 #define TAO_PLUGGABLE_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Sequence.h"
 #include "tao/Typecode.h"
 
@@ -172,7 +167,8 @@ public:
                              TAO_Reply_Dispatcher *rd);
   // Bind the reply dispatcher with the TMS object.
 
-  virtual int wait_for_reply (ACE_Time_Value *max_wait_time);
+  virtual int wait_for_reply (ACE_Time_Value *max_wait_time,
+                              int &reply_received);
   // Wait for the reply depending on the strategy.
 
   virtual int handle_client_input (int block = 0,
@@ -189,20 +185,25 @@ public:
 
   // = Setting the Transport object in Idle state. Theese methods are
   //   routed the TMS object. The TMS starategies implement the
-  //   methods accordingly.
-
+  //   methods accordingly. 
+  
   virtual int idle_after_send (void);
   // Request has been just sent, but the reply is not received. Idle
   // the transport now.
-
-  virtual int idle_after_reply (void);
+  
+  // virtual int idle_after_reply (void);
   // Request is sent and the reply is received. Idle the transport
-  // now.
+  // now. 
 
-  virtual int reply_received (const CORBA::ULong request_id);
+  // virtual int reply_received (const CORBA::ULong request_id);
   // Check with the TMS whether the reply has been receieved for the
   // request with <request_id>.
 
+  virtual ACE_SYNCH_CONDITION *leader_follower_condition_variable (void);
+  // Return the TSS leader follower condition variable used in the
+  // Wait Strategy. Muxed Leader Follower implementation returns a
+  // valid condition variable, others return 0.
+
 protected:
   CORBA::ULong tag_;
   // IOP protocol tag.
@@ -456,9 +457,6 @@ public:
   virtual char object_key_delimiter (void) const = 0;
   // Return the object key delimiter to use or expect.
 
-  virtual int purge_connections (void) = 0;
-  // Purge "old" connections.
-
 protected:
   virtual void make_profile (const char *endpoint,
                              TAO_Profile *&,
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 52122bd6f7d..b41282d2744 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -194,7 +194,7 @@ CORBA_Policy_ptr CORBA_Policy::_narrow (
 
 CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
@@ -205,14 +205,11 @@ CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow (
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Policy:1.0");
   if (servant == 0)
-    {
 #if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-      ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::Policy::_nil ());
+    ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::Policy::_nil ());
 #else
-      ACE_UNUSED_ARG (ACE_TRY_ENV);
-      return new CORBA_Policy(stub);
+    return new CORBA_Policy(stub);
 #endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    }
   return new POA_CORBA::_tao_collocated_Policy(
       ACE_reinterpret_cast(POA_CORBA::Policy_ptr, servant),
       stub
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 7905b1f819e..9aae513c10a 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -12,11 +12,6 @@
 #define TAO_IDL_POLICYC_H
 
 #include "tao/CurrentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/CDR.h"
 #include "tao/Sequence.h"
 
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index 0a27a5f3bd2..3dc24e91601 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -34,7 +34,7 @@ ACE_RCSID(tao, PollableC, "$Id$")
 
 CORBA_Pollable_ptr CORBA_Pollable::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &env
+    CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
@@ -196,7 +196,7 @@ const char* CORBA_Pollable::_interface_repository_id (void) const
 
 CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &env
+    CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
@@ -256,7 +256,7 @@ const char* CORBA::DIIPollable::_interface_repository_id (void) const
 
 CORBA_PollableSet_ptr CORBA_PollableSet::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &env
+    CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
index af0cfb5c066..43eeb47518d 100644
--- a/TAO/tao/Principal.h
+++ b/TAO/tao/Principal.h
@@ -21,11 +21,6 @@
 #define TAO_PRINCIPAL_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Sequence.h"
 
 class TAO_Export CORBA_Principal
diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h
index 29afa4a1c2e..414d001ba3f 100644
--- a/TAO/tao/Protocol_Factory.h
+++ b/TAO/tao/Protocol_Factory.h
@@ -50,12 +50,6 @@ public:
   virtual TAO_Connector *make_connector  (void);
   // Create a connector
 
-  virtual int requires_explicit_endpoint (void) const = 0;
-  // Some protocols should not create a default endpoint unless the
-  // user specifies a -ORBendpoint option. For example, local IPC
-  // (aka UNIX domain sockets) is unable to remove the rendesvouz
-  // point if the server crashes.  For those protocols is better to
-  // create the endpoint only if the user requests one.
 };
 
 #endif /* TAO_PROTOCOL_FACTORY_H */
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index 54de0dc3963..3e17c854ace 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -25,11 +25,12 @@ TAO_Reply_Dispatcher::message_state (void) const
   return 0;
 }
 
-// int
-// TAO_Reply_Dispatcher::reply_received (void) const
-// {
-//   return reply_received_;
-// }
+int
+TAO_Reply_Dispatcher::leader_follower_condition_variable (TAO_Transport *)
+{
+  // no-op.
+  return 0;
+}
 
 // *********************************************************************
 
@@ -38,7 +39,10 @@ TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core)
   : message_state_ (0),
     reply_cdr_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
                 TAO_ENCAP_BYTE_ORDER,
-                orb_core)
+                orb_core),
+    reply_received_ (0),
+    leader_follower_condition_variable_ (0),
+    orb_core_ (orb_core)
 {
 }
 
@@ -54,7 +58,7 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
                                             TAO_GIOP_ServiceContextList &reply_ctx,
                                             TAO_GIOP_Message_State *message_state)
 {
-  // this->reply_received_ = 1;
+  this->reply_received_ = 1;
 
   this->reply_status_ = reply_status;
   this->version_ = version;
@@ -69,6 +73,26 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
 
   // Steal the buffer so that no copying is done.
   this->reply_cdr_.steal_from (message_state->cdr);
+
+  // If condition variable is present, then we are doing leader
+  // follower model. Do all the nessary things.
+  if (this->leader_follower_condition_variable_ != 0)
+    {
+      TAO_Leader_Follower& leader_follower =
+        this->orb_core_->leader_follower ();
+
+      // We *must* remove it when we signal it so the same condition
+      // is not signalled for both wake up as a follower and as the
+      // next leader.
+      // The follower may not be there if the reply is received while
+      // the consumer is not yet waiting for it (i.e. it send the
+      // request but has not blocked to receive the reply yet).
+      // Ignore errors.
+      (void) leader_follower.remove_follower (this->leader_follower_condition_variable_);
+
+      (void) this->leader_follower_condition_variable_->signal ();
+    }
+
   return 1;
 }
 
@@ -84,6 +108,19 @@ TAO_Synch_Reply_Dispatcher::reply_cdr (void)
   return this->reply_cdr_;
 }
 
+int &
+TAO_Synch_Reply_Dispatcher::reply_received (void)
+{
+  return reply_received_;
+}
+
+int
+TAO_Synch_Reply_Dispatcher::leader_follower_condition_variable (TAO_Transport *transport)
+{
+  this->leader_follower_condition_variable_ =
+    transport->leader_follower_condition_variable ();
+  return 0;
+}
 
 // *********************************************************************
 #if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
@@ -126,12 +163,21 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
                   "(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n"));
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  // Call the Reply Handler's skeleton.
-  reply_handler_skel_ (message_state_->cdr,
-                       reply_handler_,
-                       ACE_TRY_ENV);
+  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ();
+  ACE_TRY
+    {
+      // Call the Reply Handler's skeleton.
+      reply_handler_skel_ (message_state_->cdr,
+                           reply_handler_,
+                           ACE_TRY_ENV);
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level >= 4)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                             "Exception during reply handler");
+    }
+  ACE_ENDTRY;
 
   // This was dynamically allocated. Now the job is done. Commit
   // suicide here.
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index 5066ef0845f..8a754dc6eb9 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -21,11 +21,6 @@
 #define TAO_REPLY_DISPATCHER_H
 
 #include "tao/GIOP.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/MessagingC.h"
 
 // Forward Declarations.
@@ -56,12 +51,10 @@ public:
   virtual TAO_GIOP_Message_State *message_state (void) const;
   // Get the Message State into which the reply has been read.
 
-  // virtual int reply_received (void) const;
-  // Return the reply received flag.
-
-  // protected:
-  // int reply_received_;
-  // Reply received flag.
+  virtual int leader_follower_condition_variable (TAO_Transport *);
+  // Obtain the condition variable used in the Leader Follower Wait
+  // Strategy. This is valid only for the synchronous reply dispatcher
+  // and only when the Leader Follower wait strategy is used.
 };
 
 // *********************************************************************
@@ -106,6 +99,16 @@ public:
   virtual TAO_InputCDR &reply_cdr (void);
   // Return the reply CDR.
 
+  virtual int &reply_received (void);
+  // Return the reference to the reply received flag. This will not
+  // make sense in the Asynch Reply Dispatcher case, since the
+  // reply will be dispatched as soon as it is available and the
+  // dispatcher will go away immediately after that. 
+
+  virtual int leader_follower_condition_variable (TAO_Transport *);
+  // Obtain the condition variable used in the Leader Follower Wait
+  // Strategy.
+
 private:
   CORBA::ULong reply_status_;
   // Reply or LocateReply status.
@@ -118,11 +121,21 @@ private:
 
   TAO_GIOP_Message_State *message_state_;
   // CDR stream for reading the input.
-  // @@ Carlos : message_state should go away. All we need is the reply
-  //    cdr. Is that rite? (Alex).
+  // @@ Carlos : message_state should go away. All we need is the
+  //    reply cdr. Is that rite? (Alex).
 
   TAO_InputCDR reply_cdr_;
   // CDR where the reply message is placed.
+
+  int reply_received_;
+  // Flag that indicates the reply  has been received.
+
+  ACE_SYNCH_CONDITION *leader_follower_condition_variable_;
+  // Condition variable used by the leader to notify the follower
+  // about the availability of the response.
+
+  TAO_ORB_Core *orb_core_;
+  // Cache the ORB Core pointer.
 };
 
 // *********************************************************************
diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h
index ddf66b63447..6faed78b810 100644
--- a/TAO/tao/Request.h
+++ b/TAO/tao/Request.h
@@ -24,10 +24,6 @@
 
 #include "tao/orbconf.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 #include "tao/corbafwd.h"
diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp
index 976596fa629..e893945069e 100644
--- a/TAO/tao/Resource_Factory.cpp
+++ b/TAO/tao/Resource_Factory.cpp
@@ -3,7 +3,7 @@
 #include "tao/Resource_Factory.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/ORB_Core.h"
-#include "tao/Client_Strategy_Factory.h"
+#include "tao/Server_Strategy_Factory.h"
 
 ACE_RCSID(tao, Resource_Factory, "$Id$")
 
@@ -11,7 +11,7 @@ ACE_RCSID(tao, Resource_Factory, "$Id$")
 
 TAO_Cached_Connector_Lock::TAO_Cached_Connector_Lock (TAO_ORB_Core *orb_core)
 {
-  this->lock_ = orb_core->client_factory ()->create_cached_connector_lock ();
+  this->lock_ = orb_core->server_factory ()->create_cached_connector_lock ();
 }
 
 TAO_Cached_Connector_Lock::~TAO_Cached_Connector_Lock (void)
@@ -121,18 +121,6 @@ TAO_Resource_Factory::init_protocol_factories (void)
   return -1;
 }
 
-TAO_Resource_Factory::Caching_Strategy
-TAO_Resource_Factory::connection_caching_strategy_type (void) const
-{
-  return TAO_Resource_Factory::NOOP;
-}
-
-double
-TAO_Resource_Factory::purge_percentage (void) const
-{
-  return 0;
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Dynamic_Service<TAO_Resource_Factory>;
@@ -140,10 +128,6 @@ template class ACE_Node<TAO_Protocol_Item*>;
 template class ACE_Unbounded_Set<TAO_Protocol_Item*>;
 template class ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*>;
 
-template class ACE_Guard<TAO_Cached_Connector_Lock>;
-template class ACE_Reverse_Lock<TAO_Cached_Connector_Lock>;
-template class ACE_Guard<ACE_Reverse_Lock<TAO_Cached_Connector_Lock> >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Dynamic_Service<TAO_Resource_Factory>
@@ -151,8 +135,4 @@ template class ACE_Guard<ACE_Reverse_Lock<TAO_Cached_Connector_Lock> >;
 #pragma instantiate ACE_Unbounded_Set<TAO_Protocol_Item*>
 #pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*>
 
-#pragma instantiate ACE_Guard<TAO_Cached_Connector_Lock>
-#pragma instantiate ACE_Reverse_Lock<TAO_Cached_Connector_Lock>
-#pragma instantiate ACE_Guard<ACE_Reverse_Lock<TAO_Cached_Connector_Lock> >
-
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index c2133008e9a..6280b6efad9 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -93,22 +93,6 @@ class TAO_Export TAO_Resource_Factory : public ACE_Service_Object
   //   resources.
   //
 public:
-
-  enum Caching_Strategy
-  {
-    // Least Recently Used
-    LRU,
-
-    // Least Frequently Used
-    LFU,
-
-    // First In First Out
-    FIFO,
-
-    // Dont use any strategy.
-    NOOP
-  };
-
   // = Initialization and termination methods.
   TAO_Resource_Factory (void);
   virtual ~TAO_Resource_Factory (void);
@@ -153,14 +137,6 @@ public:
   // from the service configurator.  It is assumed
   // that only one thread will call this method at ORB initialization.
   // NON-THREAD-SAFE
-
-  virtual Caching_Strategy connection_caching_strategy_type (void) const;
-  // This accesses the connection caching strategy we use for managing
-  // purging of unused entries from the connection cache on demnad.
-
-  virtual double purge_percentage (void) const;
-  // This denotes the amount of entries to remove from the connection
-  // cache.
 };
 
 #endif /* TAO_RESOURCE_FACTORY_H */
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index 53fe9b00187..bc6bfbe5f59 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -19,11 +19,6 @@
 #define TAO_SEQUENCE_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Managed_Types.h"
 
 class CORBA_Object;
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index 94df1ddcb6a..bc9467edd42 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -17,8 +17,6 @@
 #ifndef TAO_SEQUENCE_T_H
 #define TAO_SEQUENCE_T_H
 
-#include "tao/Sequence.h"
-
 template <class T>
 class TAO_Unbounded_Sequence : public TAO_Unbounded_Base_Sequence
 {
@@ -778,11 +776,6 @@ public:
 
 #if defined (__ACE_INLINE__)
 #include "tao/Sequence_T.i"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h
index 66647cfa318..f64528cbaa6 100644
--- a/TAO/tao/Servant_Base.h
+++ b/TAO/tao/Servant_Base.h
@@ -18,11 +18,6 @@
 #define TAO_SERVANT_BASE_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/POAC.h"
 
 class TAO_Operation_Table;
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
index 3c4bcd6a122..c33daf72639 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -22,11 +22,6 @@
 #define TAO_SERVER_REQUEST_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Object_KeyC.h"
 #include "tao/GIOP.h"
 #include "tao/Object.h"
diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp
index 4a523e27bff..000391f45fd 100644
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ b/TAO/tao/Server_Strategy_Factory.cpp
@@ -49,6 +49,12 @@ TAO_Server_Strategy_Factory::create_event_loop_lock (void)
   return 0;
 }
 
+ACE_Lock *
+TAO_Server_Strategy_Factory::create_cached_connector_lock (void)
+{
+  return 0;
+}
+
 const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &
 TAO_Server_Strategy_Factory::active_object_map_creation_parameters (void) const
 {
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
index ec21a847d35..2e6b1a44bcf 100644
--- a/TAO/tao/Server_Strategy_Factory.h
+++ b/TAO/tao/Server_Strategy_Factory.h
@@ -18,11 +18,6 @@
 #define TAO_SERVER_STRATEGY_FACTORY_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "ace/Service_Object.h"
 
 class TAO_Active_Object_Map_Impl;
@@ -110,6 +105,9 @@ public:
   virtual ACE_Lock *create_event_loop_lock (void);
   // Creates and returns a lock for the event loop.
 
+  virtual ACE_Lock *create_cached_connector_lock (void);
+  // Create the lock to be used by the cached connector.
+
   virtual const Active_Object_Map_Creation_Parameters &active_object_map_creation_parameters (void) const;
   // Return the active object map creation parameters.
 
diff --git a/TAO/tao/Services.h b/TAO/tao/Services.h
index 9245677a3a3..990b8caa775 100644
--- a/TAO/tao/Services.h
+++ b/TAO/tao/Services.h
@@ -20,10 +20,6 @@
 
 #include "tao/Sequence.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if defined(_MSC_VER)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 339b5847181..ce121c97536 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -124,6 +124,7 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles)
   // make sure we start at the beginning of mprofiles
   this->forward_profiles_->rewind ();
 }
+
 // Quick'n'dirty hash of objref data, for partitioning objrefs into
 // sets.
 //
@@ -928,7 +929,6 @@ TAO_Stub::validate_connection (
   return 0;
 }
 
-
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 428b7ab75d5..34879c39402 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -32,11 +32,6 @@
 #define TAO_STUB_H
 
 #include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/MProfile.h"
 #include "tao/ORB.h"
 
diff --git a/TAO/tao/TAO.cpp b/TAO/tao/TAO.cpp
index 7c5b7bfcd31..69e3db43d38 100644
--- a/TAO/tao/TAO.cpp
+++ b/TAO/tao/TAO.cpp
@@ -58,7 +58,7 @@ TAO_ORB_Manager::init (int &argc,
     {
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
+        this->orb_->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -87,9 +87,9 @@ TAO_ORB_Manager::init (int &argc,
 
 int
 TAO_ORB_Manager::init_child_poa (int& argc,
-                                 char **argv,
-                                 const char *poa_name,
-                                 CORBA_Environment &ACE_TRY_ENV)
+				 char **argv,
+				 const char *poa_name,
+				 CORBA_Environment &ACE_TRY_ENV)
 {
   return this->init_child_poa (argc,
                                argv,
@@ -100,10 +100,10 @@ TAO_ORB_Manager::init_child_poa (int& argc,
 
 int
 TAO_ORB_Manager::init_child_poa (int& argc,
-                                 char **argv,
-                                 const char *poa_name,
+				 char **argv,
+				 const char *poa_name,
                                  const char *orb_name,
-                                 CORBA_Environment &ACE_TRY_ENV)
+				 CORBA_Environment &ACE_TRY_ENV)
 {
   int init_result;
 
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 0c3b29ec0af..5b3e53dbb8c 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

 

-CFG=TAO DLL - Win32 MFC Debug

+CFG=TAO DLL - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,7 +14,7 @@ CFG=TAO DLL - Win32 MFC Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "TAO.mak" CFG="TAO DLL - Win32 MFC Debug"

+!MESSAGE NMAKE /f "TAO.mak" CFG="TAO DLL - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -22,8 +22,6 @@ CFG=TAO DLL - Win32 MFC Debug
 !MESSAGE "TAO DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "TAO DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE "TAO DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

@@ -107,7 +105,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD nologo MT Gt0 W3 GX O2 I "../../" /c

+# ADD BASE CPP /Gt0 nologo MT Gt0 W3 GX O2 I "../../" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "../../" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

@@ -137,7 +135,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "../../" /c

+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy I "../../" /I"../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd /c

 # ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../../" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MDd /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

@@ -152,72 +150,6 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"..\..\bin\TAOd.dll" /libpath:"..\..\ace"

 # ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"..\..\bin\TAOd.dll" /libpath:"..\..\ace"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "TAO_DLL___Win32_MFC_Debug"

-# PROP BASE Intermediate_Dir "TAO_DLL___Win32_MFC_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\MFC_Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../../" /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../../" /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c

-# SUBTRACT CPP /YX

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\bin\TAOd.dll" /libpath:"..\..\ace"

-# ADD LINK32 acemfcd.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\bin\TAOmfcd.dll" /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "TAO_DLL___Win32_MFC_Release"

-# PROP BASE Intermediate_Dir "TAO_DLL___Win32_MFC_Release"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\MFC_Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c

-# SUBTRACT CPP /YX

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\bin\TAO.dll" /libpath:"..\..\ace"

-# SUBTRACT BASE LINK32 /incremental:yes

-# ADD LINK32 acemfc.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\bin\TAOmfc.dll" /libpath:"..\..\ace"

-# SUBTRACT LINK32 /incremental:yes

-

 !ENDIF 

 

 # Begin Target

@@ -226,8 +158,6 @@ LINK32=link.exe
 # Name "TAO DLL - Win32 Debug"

 # Name "TAO DLL - Win32 Alpha Release"

 # Name "TAO DLL - Win32 Alpha Debug"

-# Name "TAO DLL - Win32 MFC Debug"

-# Name "TAO DLL - Win32 MFC Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -243,10 +173,6 @@ SOURCE=.\Acceptor_Registry.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -262,10 +188,6 @@ SOURCE=.\Active_Object_Map.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -281,10 +203,6 @@ SOURCE=.\Any.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -300,10 +218,6 @@ SOURCE=.\append.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -319,10 +233,6 @@ SOURCE=.\Asynch_Invocation.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -338,10 +248,6 @@ SOURCE=.\CDR.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -357,10 +263,6 @@ SOURCE=.\CDR_Interpreter.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -376,10 +278,6 @@ SOURCE=.\Client_Strategy_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -395,10 +293,6 @@ SOURCE=.\Connector_Registry.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -414,10 +308,6 @@ SOURCE=.\Context.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -433,10 +323,6 @@ SOURCE=.\CONV_FRAMEC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -452,10 +338,6 @@ SOURCE=.\CONV_FRAMES.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -471,10 +353,6 @@ SOURCE=.\corbafwd.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -490,10 +368,6 @@ SOURCE=.\CurrentC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -509,10 +383,6 @@ SOURCE=.\CurrentS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -528,10 +398,6 @@ SOURCE=.\debug.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -547,10 +413,6 @@ SOURCE=.\decode.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -566,10 +428,6 @@ SOURCE=.\deep_free.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -585,10 +443,6 @@ SOURCE=.\default_client.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -604,10 +458,6 @@ SOURCE=.\default_resource.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -623,10 +473,6 @@ SOURCE=.\default_server.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -642,10 +488,6 @@ SOURCE=.\DomainC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -661,10 +503,6 @@ SOURCE=.\DomainS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -680,10 +518,6 @@ SOURCE=.\DynAny_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -699,10 +533,6 @@ SOURCE=.\DynAnyC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -718,10 +548,6 @@ SOURCE=.\DynAnyS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -737,10 +563,6 @@ SOURCE=.\DynArray_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -756,10 +578,6 @@ SOURCE=.\DynEnum_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -775,10 +593,6 @@ SOURCE=.\DynSequence_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -794,10 +608,6 @@ SOURCE=.\DynStruct_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -813,10 +623,6 @@ SOURCE=.\DynUnion_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -832,10 +638,6 @@ SOURCE=.\encode.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -851,10 +653,6 @@ SOURCE=.\Environment.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -870,10 +668,6 @@ SOURCE=.\Exception.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -889,10 +683,6 @@ SOURCE=.\Forwarding_Servant.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -908,10 +698,6 @@ SOURCE=.\GIOP.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -927,10 +713,6 @@ SOURCE=.\GIOP_Server_Request.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -946,10 +728,6 @@ SOURCE=.\IIOP_Acceptor.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -965,10 +743,6 @@ SOURCE=.\IIOP_Connect.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -984,10 +758,6 @@ SOURCE=.\IIOP_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1003,10 +773,6 @@ SOURCE=.\IIOP_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1022,10 +788,6 @@ SOURCE=.\IIOP_Profile.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1041,10 +803,6 @@ SOURCE=.\IIOP_Transport.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1060,10 +818,6 @@ SOURCE=.\InconsistentTypeCodeC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1079,10 +833,6 @@ SOURCE=.\Invocation.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1098,10 +848,6 @@ SOURCE=.\IOPC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1117,10 +863,6 @@ SOURCE=.\IOPS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1136,10 +878,6 @@ SOURCE=.\IOR_LookupTable.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1155,10 +893,6 @@ SOURCE=.\IORC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1174,10 +908,6 @@ SOURCE=.\IORManipulation.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1193,10 +923,6 @@ SOURCE=.\IORS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1212,10 +938,6 @@ SOURCE=.\Key_Adapters.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1231,10 +953,6 @@ SOURCE=.\Managed_Types.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1250,10 +968,6 @@ SOURCE=.\Marshal.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1269,10 +983,6 @@ SOURCE=.\Messaging_Policy_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1288,10 +998,6 @@ SOURCE=.\MessagingC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1307,10 +1013,6 @@ SOURCE=.\MessagingS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1326,10 +1028,6 @@ SOURCE=.\MProfile.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1345,10 +1043,6 @@ SOURCE=.\NVList.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1364,10 +1058,6 @@ SOURCE=.\Object.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1383,10 +1073,6 @@ SOURCE=.\Object_Adapter.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1402,10 +1088,6 @@ SOURCE=.\Object_KeyC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1421,10 +1103,6 @@ SOURCE=.\ObjectIDList.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1440,10 +1118,6 @@ SOURCE=.\Operation_Table.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1459,10 +1133,6 @@ SOURCE=.\ORB.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1478,10 +1148,6 @@ SOURCE=.\ORB_Core.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1497,10 +1163,6 @@ SOURCE=.\params.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1516,10 +1178,6 @@ SOURCE=.\Pluggable.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1535,10 +1193,6 @@ SOURCE=.\POA.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1554,10 +1208,6 @@ SOURCE=.\POAC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1573,10 +1223,6 @@ SOURCE=.\POAManager.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1592,10 +1238,6 @@ SOURCE=.\POAS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1611,10 +1253,6 @@ SOURCE=.\Policy_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1630,10 +1268,6 @@ SOURCE=.\PolicyC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1649,10 +1283,6 @@ SOURCE=.\PolicyS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1668,10 +1298,6 @@ SOURCE=.\PollableC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1687,10 +1313,6 @@ SOURCE=.\PollableS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1706,10 +1328,6 @@ SOURCE=.\Principal.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1725,10 +1343,6 @@ SOURCE=.\Protocol_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1744,10 +1358,6 @@ SOURCE=.\Reply_Dispatcher.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1763,10 +1373,6 @@ SOURCE=.\Request.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1782,10 +1388,6 @@ SOURCE=.\Resource_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1801,10 +1403,6 @@ SOURCE=.\Sequence.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1820,10 +1418,6 @@ SOURCE=.\Servant_Base.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1839,10 +1433,6 @@ SOURCE=.\Server_Request.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1858,10 +1448,6 @@ SOURCE=.\Server_Strategy_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1877,10 +1463,6 @@ SOURCE=.\Services.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1896,10 +1478,6 @@ SOURCE=.\skip.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1915,10 +1493,6 @@ SOURCE=.\Stub.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1934,10 +1508,6 @@ SOURCE=.\Tagged_Components.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1953,10 +1523,6 @@ SOURCE=.\TAO.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1972,10 +1538,6 @@ SOURCE=.\TAO_Internal.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -1991,10 +1553,6 @@ SOURCE=.\TimeBaseC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2010,10 +1568,6 @@ SOURCE=.\TimeBaseS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2029,10 +1583,6 @@ SOURCE=.\Transport_Mux_Strategy.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2048,10 +1598,6 @@ SOURCE=.\Typecode.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2067,124 +1613,6 @@ SOURCE=.\Typecode_Constants.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Acceptor.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connect.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connector.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Factory.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Transport.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2200,10 +1628,6 @@ SOURCE=.\Union.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2219,10 +1643,6 @@ SOURCE=.\ValueBase.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2238,10 +1658,6 @@ SOURCE=.\ValueFactory.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2257,10 +1673,6 @@ SOURCE=.\ValueFactory_Map.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2276,10 +1688,6 @@ SOURCE=.\Wait_Strategy.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2295,10 +1703,6 @@ SOURCE=.\WrongTransactionC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

 !ENDIF 

 

 # End Source File

@@ -2688,30 +2092,6 @@ SOURCE=.\typecode.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\UIOP_Acceptor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Transport.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ValueBase.h

 # End Source File

 # Begin Source File

@@ -2940,14 +2320,6 @@ SOURCE=.\typecode.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\UIOP_Connect.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\ValueBase.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h
index de7782f00ab..86f56a2de42 100644
--- a/TAO/tao/TAO.h
+++ b/TAO/tao/TAO.h
@@ -21,11 +21,6 @@
 #define TAO_H
 
 #include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/POAC.h"
 #include "tao/ORB.h"
 
diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h
index 672df0ec940..c6a68ad9377 100644
--- a/TAO/tao/TAO_Internal.h
+++ b/TAO/tao/TAO_Internal.h
@@ -22,10 +22,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 class TAO_Export TAO_Internal
   // = TITLE
   //    This class encapsulates some private behaviors and global data
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 1298298042c..68ddd4c3992 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -22,9 +22,11 @@ CFG=TAO LIB - Win32 Debug
 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

 CPP=cl.exe

+RSC=rc.exe

 

 !IF  "$(CFG)" == "TAO LIB - Win32 Release"

 

@@ -38,12 +40,11 @@ CPP=cl.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Release"

 # PROP Target_Dir ""

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

 # SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -63,11 +64,10 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Debug"

 # PROP Target_Dir ""

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../" /I "../" /D TAO_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /YX /FD /c

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -474,30 +474,6 @@ SOURCE=.\Typecode_Constants.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\UIOP_Acceptor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connect.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connector.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Transport.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Union.cpp

 # End Source File

 # Begin Source File

@@ -906,30 +882,6 @@ SOURCE=.\typecode.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\UIOP_Acceptor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Transport.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ValueBase.h

 # End Source File

 # Begin Source File

@@ -1158,14 +1110,6 @@ SOURCE=.\typecode.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\UIOP_Connect.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\ValueBase.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp
index e18ed8ecadc..143b15becc0 100644
--- a/TAO/tao/Transport_Mux_Strategy.cpp
+++ b/TAO/tao/Transport_Mux_Strategy.cpp
@@ -5,7 +5,8 @@
 #include "tao/debug.h"
 #include "tao/Pluggable.h"
 
-TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (void)
+TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (TAO_Transport *transport)
+  : transport_ (transport)
 {
 }
 
@@ -13,13 +14,24 @@ TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy (void)
 {
 }
 
+
+int
+TAO_Transport_Mux_Strategy::bind_dispatcher (CORBA::ULong,
+                                             TAO_Reply_Dispatcher *rd)
+{
+  // Help the Reply dispatcher to obtain leader follower condition
+  // variable.
+  return rd->leader_follower_condition_variable (this->transport_);
+}
+
 // *********************************************************************
 
-TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_ORB_Core *orb_core)
-  : request_id_generator_ (0),
+TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport)
+  : TAO_Transport_Mux_Strategy (transport),
+    request_id_generator_ (0),
     request_id_ (0),
     rd_ (0),
-    message_state_ (orb_core)
+    message_state_ (transport->orb_core ())
 {
 }
 
@@ -47,14 +59,13 @@ TAO_Exclusive_TMS::bind_dispatcher (CORBA::ULong request_id,
   // @@ Carlos: This method marks the <start> of an invocation. This
   //    should be the correct place to <reset> the message state. Do I
   //    make sense? (Alex).
-  // @@ Alex: the state must be reset, but the contents are always
-  //    clean because: 
-  //    1) it starts clean
-  //    2) it is reset after each reply arrives...
 
   // If there was a previous reply, cleanup its state first.
   if (this->message_state_.message_size != 0)
-    this->message_state_.reset (0);
+    this->message_state_.reset ();
+
+  return TAO_Transport_Mux_Strategy::bind_dispatcher (request_id,
+                                                      rd);
 
   return 0;
 }
@@ -77,17 +88,40 @@ TAO_Exclusive_TMS::dispatch_reply (CORBA::ULong request_id,
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Exclusive_TMS::dispatch_reply - <%d != %d>\n",
                     this->request_id_, request_id));
-      return 0;
+      return -1;
     }
 
   TAO_Reply_Dispatcher *rd = this->rd_;
   this->request_id_ = 0xdeadbeef; // @@ What is a good value???
   this->rd_ = 0;
 
-  return rd->dispatch_reply (reply_status,
-                             version,
-                             reply_ctx,
-                             message_state);
+  // Dispatch the reply.
+  int result = rd->dispatch_reply (reply_status,
+                                   version,
+                                   reply_ctx,
+                                   message_state);
+  
+  // Idle the transport now.
+  // if (this->transport_ != 0)
+  //  this->transport_->idle ();
+  // @@ Carlos : We can do this, in the Muxed Leader Follower
+  //    implementation. In the older implementation, since the state
+  //    variables are in the Transport, and since we are in the
+  //    handle_input right now, we cannot idle the Transport. This
+  //    means that I cannot use  asynchronous requests with Exclusive
+  //    Transport&Old Leader Follower implementation , because I dont
+  //    know when to idle the Transport. 
+  //    So I am moving this <idle> call to the destructors of
+  //    synchronous invocations and for asynchronous invocations
+  //    idle'ing is not at all called after the reply is
+  //    received. 
+  //    We can enable <idle> out here, once we get rid of the old
+  //    Leader Follower implementation. Then we can get rid of the
+  //    destructors in the Invocation classes and they dont have to
+  //    call <idle>. 
+  //    Do I make sense? (Alex).
+
+  return result;
 }
 
 TAO_GIOP_Message_State *
@@ -106,53 +140,54 @@ TAO_Exclusive_TMS::destroy_message_state (TAO_GIOP_Message_State *)
 }
 
 int
-TAO_Exclusive_TMS::idle_after_send (TAO_Transport *)
+TAO_Exclusive_TMS::idle_after_send (void)
 {
   // No op.
   return 0;
 }
-
-int
-TAO_Exclusive_TMS::idle_after_reply (TAO_Transport *transport)
-{
-  if (transport != 0)
-    return transport->idle ();
-
-  return 0;
-}
-
-int
-TAO_Exclusive_TMS::reply_received (const CORBA::ULong request_id)
-{
-  if (this->rd_ == 0)
-    {
-      // Reply should have been dispatched already.
-      return 1;
-    }
-  else if (this->request_id_ == request_id)
-    {
-      // Reply dispatcher is still here.
-      return 0;
-    }
-  else
-    {
-      // Error. Request id is not matching.
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P | %t):TAO_Exclusive_TMS::reply_received:"
-                      "Invalid request_id \n"));
-        }
-      return -1;
-    }
-}
-
+  
+// int
+// TAO_Exclusive_TMS::idle_after_reply (void)
+// {
+//   if (this->transport_ != 0)
+//     return this->transport_->idle ();
+//  
+//   return 0;
+// }
+
+// int
+// TAO_Exclusive_TMS::reply_received (const CORBA::ULong request_id)
+// {
+//   if (this->rd_ == 0)
+//     {
+//       // Reply should have been dispatched already.
+//       return 1;
+//     }
+//   else if (this->request_id_ == request_id)
+//     {
+//       // Reply dispatcher is still here.
+//       return 0;
+//     }
+//   else
+//     {
+//       // Error. Request id is not matching.
+//       
+//       if (TAO_debug_level > 0)
+//         {
+//           ACE_DEBUG ((LM_DEBUG,
+//                       "(%P | %t):TAO_Exclusive_TMS::reply_received:"
+//                       "Invalid request_id \n"));
+//         }
+//       return -1;
+//     }
+// }
+ 
 // *********************************************************************
 
-TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_ORB_Core *orb_core)
-  : request_id_generator_ (0),
-    orb_core_ (orb_core),
+TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport)
+  : TAO_Transport_Mux_Strategy (transport),
+    request_id_generator_ (0),
+    orb_core_ (transport->orb_core ()),
     message_state_ (0)
 {
 }
@@ -178,7 +213,7 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id,
                                 TAO_Reply_Dispatcher *rd)
 {
   int result = this->dispatcher_table_.bind (request_id, rd);
-
+  
   if (result != 0)
     {
       if (TAO_debug_level > 0)
@@ -189,6 +224,10 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id,
 
       return -1;
     }
+
+  return TAO_Transport_Mux_Strategy::bind_dispatcher (request_id,
+                                                      rd);
+
   return 0;
 }
 
@@ -201,15 +240,15 @@ TAO_Muxed_TMS::dispatch_reply (CORBA::ULong request_id,
 {
   // This message state should be the same as the one we have here,
   // which we gave to the Transport to read the message. Just a sanity
-  // check here.
+  // check here. 
   ACE_ASSERT (message_state == this->message_state_);
-
+  
   int result = 0;
   TAO_Reply_Dispatcher *rd = 0;
 
   // Grab the reply dispatcher for this id.
   result = this->dispatcher_table_.unbind (request_id, rd);
-
+  
   if (result != 0)
     {
       if (TAO_debug_level > 0)
@@ -217,11 +256,11 @@ TAO_Muxed_TMS::dispatch_reply (CORBA::ULong request_id,
                     "(%P | %t):TAO_Muxed_TMS::dispatch_reply: "
                     "unbind dispatcher failed: result = %d\n",
                     result));
-
+      
       return -1;
     }
 
-  // @@ Carlos : We could save the <messagee_state> somehow and then
+  // @@ Carlos : We could save the <message_state> somehow and then
   //    signal some other thread to go ahead read the incoming message
   //    if any. Is this what you were telling me before? (Alex).
 
@@ -230,6 +269,9 @@ TAO_Muxed_TMS::dispatch_reply (CORBA::ULong request_id,
                              version,
                              reply_ctx,
                              message_state);
+
+  // No need for idling Transport, it would have got idle'd soon after
+  // sending the request. 
 }
 
 TAO_GIOP_Message_State *
@@ -239,10 +281,11 @@ TAO_Muxed_TMS::get_message_state (void)
     {
       // Create the next message state.
       ACE_NEW_RETURN (this->message_state_,
-                      TAO_GIOP_Message_State (this->orb_core_),
+                      TAO_GIOP_Message_State
+                      (this->transport_->orb_core ()),
                       0);
     }
-
+  
   return this->message_state_;
 }
 
@@ -254,34 +297,34 @@ TAO_Muxed_TMS::destroy_message_state (TAO_GIOP_Message_State *)
 }
 
 int
-TAO_Muxed_TMS::idle_after_send (TAO_Transport *transport)
-{
-  if (transport != 0)
-    return transport->idle ();
-
-  return 0;
-}
-
-int
-TAO_Muxed_TMS::idle_after_reply (TAO_Transport *)
+TAO_Muxed_TMS::idle_after_send (void)
 {
+  if (this->transport_ != 0)
+    return this->transport_->idle ();
+  
   return 0;
 }
-
-int
-TAO_Muxed_TMS::reply_received (const CORBA::ULong request_id)
-{
-  if (this->dispatcher_table_.find (request_id) == -1)
-    {
-      // Reply should have been dispatched already.
-      return 1;
-    }
-  else
-    {
-      // Reply dispatcher is still here.
-      return 0;
-    }
-}
+  
+// int
+// TAO_Muxed_TMS::idle_after_reply (void)
+// {
+//   return 0;
+// }
+
+// int
+// TAO_Muxed_TMS::reply_received (const CORBA::ULong request_id)
+// {
+//   if (this->dispatcher_table_.find (request_id) == -1)
+//     {
+//       // Reply should have been dispatched already.
+//       return 1;
+//     }
+//   else
+//     {
+//       // Reply dispatcher is still here.
+//       return 0;
+//     }
+// }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Hash_Map_Manager_Ex <CORBA::ULong,
@@ -295,8 +338,8 @@ template class ACE_Hash_Map_Entry<CORBA::ULong,
 
 template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong,
                                              TAO_Reply_Dispatcher *,
-                                             ACE_Hash<unsigned int>,
-                                             ACE_Equal_To<unsigned int>,
+                                             ACE_Hash<unsigned int>, 
+                                             ACE_Equal_To<unsigned int>, 
                                              ACE_SYNCH_MUTEX>;
 
 template class ACE_Hash_Map_Iterator_Ex<CORBA::ULong,
@@ -313,15 +356,32 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong,
 template class ACE_Equal_To <CORBA::ULong>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager_Ex <CORBA::ULong, TAO_Reply_Dispatcher *, ACE_Hash <CORBA::ULong>, ACE_Equal_To <CORBA::ULong>, ACE_SYNCH_MUTEX>
-
-#pragma instantiate ACE_Hash_Map_Entry<CORBA::ULong, TAO_Reply_Dispatcher *>
-
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<unsigned int, TAO_Reply_Dispatcher *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_SYNCH_MUTEX>
-
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::ULong, TAO_Reply_Dispatcher*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_SYNCH_MUTEX>
-
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong, TAO_Reply_Dispatcher*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex <CORBA::ULong,
+                                             TAO_Reply_Dispatcher *,
+                                             ACE_Hash <CORBA::ULong>,
+                                             ACE_Equal_To <CORBA::ULong>,
+                                             ACE_SYNCH_MUTEX>
+
+#pragma instantiate ACE_Hash_Map_Entry<CORBA::ULong,
+                                       TAO_Reply_Dispatcher *>
+
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<unsigned int,
+                                                  TAO_Reply_Dispatcher *,
+                                                  ACE_Hash<unsigned int>, 
+                                                  ACE_Equal_To<unsigned int>, 
+                                                  ACE_SYNCH_MUTEX>
+
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::ULong,
+                                             TAO_Reply_Dispatcher*,
+                                             ACE_Hash<CORBA::ULong>,
+                                             ACE_Equal_To<CORBA::ULong>,
+                                             ACE_SYNCH_MUTEX>
+
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong,
+                                                     TAO_Reply_Dispatcher*,
+                                                     ACE_Hash<CORBA::ULong>,
+                                                     ACE_Equal_To<CORBA::ULong>,
+                                                     ACE_SYNCH_MUTEX>
 
 #pragma instantiate ACE_Equal_To <CORBA::ULong>
 
diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h
index 6c13a03e73d..ee06d1b9349 100644
--- a/TAO/tao/Transport_Mux_Strategy.h
+++ b/TAO/tao/Transport_Mux_Strategy.h
@@ -43,7 +43,7 @@ class TAO_Export TAO_Transport_Mux_Strategy
   //
   
 public:
-  TAO_Transport_Mux_Strategy (void);
+  TAO_Transport_Mux_Strategy (TAO_Transport *transport);
   // Base class constructor.
 
   virtual ~TAO_Transport_Mux_Strategy (void);
@@ -57,8 +57,9 @@ public:
   //   pairs.
 
   virtual int bind_dispatcher (CORBA::ULong request_id,
-                               TAO_Reply_Dispatcher *rd) = 0;
-  // Bind the dispatcher with the request id.
+                               TAO_Reply_Dispatcher *rd);
+  // Bind the dispatcher with the request id. Commonalities in the
+  // derived class implementations is kept here.  
   
   virtual int dispatch_reply (CORBA::ULong request_id,
                               CORBA::ULong reply_status,
@@ -77,19 +78,23 @@ public:
 
   virtual void destroy_message_state (TAO_GIOP_Message_State *) = 0;
   // Destroy a CDR stream.
-
-  virtual int idle_after_send (TAO_Transport *) = 0;
+  
+  virtual int idle_after_send (void) = 0;
   // Request has been just sent, but the reply is not received. Idle
   // the transport now.
   
-  virtual int idle_after_reply (TAO_Transport *) = 0;
+  // virtual int idle_after_reply (void) = 0;
   // Request is sent and the reply is received. Idle the transport
   // now. 
 
-  virtual int reply_received (const CORBA::ULong request_id) = 0;
+  //  virtual int reply_received (const CORBA::ULong request_id) = 0;
   // Check whether the reply has been receieved for the request with
   // <request_id>. Return 0 if no, 1 on yes and -1 if the request_id
   // is invalid or there are some errors.
+
+protected:
+  TAO_Transport *transport_;
+  // Cache the transport reference.
 };
 
 // *********************************************************************
@@ -104,7 +109,7 @@ class TAO_Export TAO_Exclusive_TMS : public TAO_Transport_Mux_Strategy
   //
 
 public:
-  TAO_Exclusive_TMS (TAO_ORB_Core *orb_core);
+  TAO_Exclusive_TMS (TAO_Transport *transport);
   // Constructor.
 
   virtual ~TAO_Exclusive_TMS (void);
@@ -132,15 +137,15 @@ public:
   virtual void destroy_message_state (TAO_GIOP_Message_State *);
   // No op in this strategy.
 
-  virtual int idle_after_send (TAO_Transport *transport);
+  virtual int idle_after_send (void);
   // Request has been just sent, but the reply is not received. Idle
   // the transport now.
   
-  virtual int idle_after_reply (TAO_Transport *transport);
+  // virtual int idle_after_reply (void);
   // Request is sent and the reply is received. Idle the transport
   // now. 
-  
-  virtual int reply_received (const CORBA::ULong request_id);
+
+  // virtual int reply_received (const CORBA::ULong request_id);
   // Check whether the reply has been receieved for the request with
   // <request_id>. Return 0 if no, 1 on yes and -1 if the request_id
   // is invalid or there are errors.
@@ -172,7 +177,7 @@ class TAO_Export TAO_Muxed_TMS : public  TAO_Transport_Mux_Strategy
   //
 
 public:
-  TAO_Muxed_TMS (TAO_ORB_Core *orb_core);
+  TAO_Muxed_TMS (TAO_Transport *transport);
   // Constructor.
 
   virtual ~TAO_Muxed_TMS (void);
@@ -200,15 +205,15 @@ public:
   virtual void destroy_message_state (TAO_GIOP_Message_State *);
   // No op in this strategy.
 
-  virtual int idle_after_send (TAO_Transport *transport);
+  virtual int idle_after_send (void);
   // Request has been just sent, but the reply is not received. Idle
   // the transport now.
   
-  virtual int idle_after_reply (TAO_Transport *transport);
+  // virtual int idle_after_reply (void);
   // Request is sent and the reply is received. Idle the transport
   // now. 
 
-  virtual int reply_received (const CORBA::ULong request_id);
+  //  virtual int reply_received (const CORBA::ULong request_id);
   // Check whether the reply has been receieved for the request with
   // <request_id>. Return 0 if no, 1 on yes and -1 if the request_id
   // is invalid or there are errors.
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index 92d596b63ed..50276eaebd8 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -22,10 +22,6 @@
 
 #include "ace/Synch.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Exception.h"
 
 // Forward decl.
diff --git a/TAO/tao/UIOP_Acceptor.cpp b/TAO/tao/UIOP_Acceptor.cpp
index b62478db05c..1b10f6fa294 100644
--- a/TAO/tao/UIOP_Acceptor.cpp
+++ b/TAO/tao/UIOP_Acceptor.cpp
@@ -18,15 +18,14 @@
 //
 // ============================================================================
 
-#include "tao/UIOP_Acceptor.h"
-
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "tao/UIOP_Acceptor.h"
 #include "tao/UIOP_Profile.h"
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
-#include "tao/GIOP.h"
 #include "tao/Server_Strategy_Factory.h"
+#include "tao/GIOP.h"
 #include "tao/debug.h"
 
 ACE_RCSID(tao, UIOP_Acceptor, "$Id$")
@@ -36,20 +35,17 @@ ACE_RCSID(tao, UIOP_Acceptor, "$Id$")
 TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
   : TAO_Acceptor (TAO_IOP_TAG_UNIX_IOP),
     base_acceptor_ (),
-    creation_strategy_ (0),
-    concurrency_strategy_ (0),
-    accept_strategy_ (0),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    orb_core_ (0),
-    unlink_on_close_ (1)
+    orb_core_ (0)
 {
 }
 
 TAO_UIOP_Acceptor::~TAO_UIOP_Acceptor (void)
 {
-  delete this->creation_strategy_;
-  delete this->concurrency_strategy_;
-  delete this->accept_strategy_;
+  // Explicitly call close() to aid in post-error resource clean up.
+  // close() is called to ensure that the rendezvous point is removed
+  // from the filesystem.
+  this->close ();
 }
 
 int
@@ -58,7 +54,7 @@ TAO_UIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
 {
   ACE_UNIX_Addr addr;
 
-  if (this->base_acceptor_.acceptor ().get_local_addr (addr) == -1)
+  if (base_acceptor_.acceptor ().get_local_addr (addr) == -1)
     return 0;
 
   // we only make one
@@ -69,7 +65,7 @@ TAO_UIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
         return -1;
     }
 
-  TAO_UIOP_Profile *pfile = 0;
+  TAO_UIOP_Profile *pfile;
   ACE_NEW_RETURN (pfile,
                   TAO_UIOP_Profile (addr,
                                     object_key,
@@ -118,11 +114,10 @@ TAO_UIOP_Acceptor::close (void)
 {
   ACE_UNIX_Addr addr;
 
-  if (this->base_acceptor_.acceptor ().get_local_addr (addr) == -1)
+  if (base_acceptor_.acceptor ().get_local_addr (addr) == -1)
     return -1;
 
-  if (this->unlink_on_close_)
-    (void) ACE_OS::unlink (addr.get_path_name ());
+  (void) ACE_OS::unlink (addr.get_path_name ());
 
   return this->base_acceptor_.close ();
 }
@@ -157,35 +152,12 @@ TAO_UIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
 {
   this->orb_core_ = orb_core;
 
-  ACE_NEW_RETURN (this->creation_strategy_,
-                  TAO_UIOP_CREATION_STRATEGY (this->orb_core_),
-                  -1);
-
-  ACE_NEW_RETURN (this->concurrency_strategy_,
-                  TAO_UIOP_CONCURRENCY_STRATEGY (this->orb_core_),
-                  -1);
-
-  ACE_NEW_RETURN (this->accept_strategy_,
-                  TAO_UIOP_ACCEPT_STRATEGY (this->orb_core_),
-                  -1);
-
   ACE_UNIX_Addr addr;
 
   this->rendezvous_point (addr, rendezvous);
 
-  if (this->base_acceptor_.open (addr,
-                                 this->orb_core_->reactor (),
-                                 this->creation_strategy_,
-                                 this->accept_strategy_,
-                                 this->concurrency_strategy_) == -1)
-    {
-      // Don't unlink an existing rendezvous point since it may be in
-      // use by another UIOP server/client.
-      if (errno == EADDRINUSE)
-        this->unlink_on_close_ = 0;
-
-      return -1;
-    }
+  if (this->base_acceptor_.open (orb_core, addr) != 0)
+    return -1;
 
   // @@ If Profile creation is slow we may need to cache the
   //    rendezvous point here
@@ -255,26 +227,12 @@ TAO_UIOP_Acceptor::endpoint_count (void)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-template class ACE_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-template class ACE_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>;
-template class ACE_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>;
-template class ACE_Scheduling_Strategy<TAO_UIOP_Server_Connection_Handler>;
-template class TAO_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>;
-template class TAO_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>;
-template class TAO_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
+template class TAO_Acceptor_Impl<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<TAO_UIOP_Server_Connection_Handler>
-#pragma instantiate TAO_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>
-#pragma instantiate TAO_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>
-#pragma instantiate TAO_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
+#pragma instantiate TAO_Acceptor_Impl<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/tao/UIOP_Acceptor.h b/TAO/tao/UIOP_Acceptor.h
index 50ada984c60..1b76ae8bbf1 100644
--- a/TAO/tao/UIOP_Acceptor.h
+++ b/TAO/tao/UIOP_Acceptor.h
@@ -23,10 +23,6 @@
 
 #include "ace/Acceptor.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 # if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
 #include "ace/LSOCK_Acceptor.h"
@@ -79,38 +75,25 @@ public:
   CORBA::ULong endpoint_count (void);
   // return the number of profiles this will generate
 
-  typedef ACE_Strategy_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR> TAO_UIOP_BASE_ACCEPTOR;
-  typedef TAO_Creation_Strategy<TAO_UIOP_Server_Connection_Handler> TAO_UIOP_CREATION_STRATEGY;
-  typedef TAO_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler> TAO_UIOP_CONCURRENCY_STRATEGY;
-  typedef TAO_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR> TAO_UIOP_ACCEPT_STRATEGY;
+  typedef TAO_Acceptor_Impl<TAO_UIOP_Server_Connection_Handler,ACE_LSOCK_ACCEPTOR> TAO_UIOP_BASE_ACCEPTOR;
 
 private:
   int open_i (TAO_ORB_Core *orb_core, const char *rendezvous);
   // Implement the common part of the open*() methods
 
   void rendezvous_point (ACE_UNIX_Addr &, const char *rendezvous);
-  // Set the rendezvous point and verify that it is
+  // Set the rendezvous point and verify that it is 
   // valid (e.g. wasn't truncated because it was too long).
 
 private:
   TAO_UIOP_BASE_ACCEPTOR base_acceptor_;
   // the concrete acceptor, as a pointer to its base class.
 
-  TAO_UIOP_CREATION_STRATEGY *creation_strategy_;
-  TAO_UIOP_CONCURRENCY_STRATEGY *concurrency_strategy_;
-  TAO_UIOP_ACCEPT_STRATEGY *accept_strategy_;
-  // Acceptor strategies.
-
   TAO_GIOP_Version version_;
   // The GIOP version for this endpoint
 
   TAO_ORB_Core *orb_core_;
   // ORB Core.
-
-  int unlink_on_close_;
-  // Flag that determines whether or not the rendezvous point should
-  // be unlinked on close.  This is really only used when an error
-  // occurs.
 };
 
 # endif /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp
index dac245ffe98..07aed2a3895 100644
--- a/TAO/tao/UIOP_Connect.cpp
+++ b/TAO/tao/UIOP_Connect.cpp
@@ -1,16 +1,15 @@
 // $Id$
 
-#include "tao/UIOP_Connect.h"
-
 #if !defined(ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "tao/UIOP_Connect.h"
+#include "tao/Timeprobe.h"
 #include "tao/UIOP_Transport.h"
-#include "tao/GIOP.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/CDR.h"
-#include "tao/Timeprobe.h"
+#include "tao/GIOP.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/UIOP_Connect.i"
@@ -228,11 +227,28 @@ TAO_UIOP_Server_Connection_Handler::handle_input (ACE_HANDLE)
 
   if (result == 0 || result == -1)
     return result;
-
+  
+  // = Take out all the information from the <message_state> and reset
+  //   it so that nested upcall on the same Transport can be handled.
+
+  // Copy message type.
+  CORBA::Octet message_type = this->transport_.message_state_.message_type;
+
+  // Copy version.
+  TAO_GIOP_Version giop_version = this->transport_.message_state_.giop_version;
+  
+  // Steal the input CDR from the message state.
+  TAO_InputCDR input_cdr (this->transport_.message_state_.cdr);
+  
+  // Reset the message state.
+  this->transport_.message_state_.reset ();
+  
   result = TAO_GIOP::process_server_message (this->transport (),
                                              this->orb_core_,
-                                             this->transport_.message_state_.cdr,
-                                             this->transport_.message_state_);
+                                             input_cdr,
+                                             message_type,
+                                             giop_version);
+  
   if (result != -1)
     {
       this->transport_.message_state_.reset ();
diff --git a/TAO/tao/UIOP_Connector.cpp b/TAO/tao/UIOP_Connector.cpp
index e330db166de..6b313c3194c 100644
--- a/TAO/tao/UIOP_Connector.cpp
+++ b/TAO/tao/UIOP_Connector.cpp
@@ -1,10 +1,24 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "tao/UIOP_Connector.h"
+// ============================================================================
+//
+// = LIBRARY
+//     TAO
+//
+// = FILENAME
+//     UIOP_Connector.cpp
+//
+// = DESCRIPTION
+//
+// = AUTHOR
+//     Fred Kuhns <fredk@cs.wustl.edu>
+//     Ossama Othman <othman@cs.wustl.edu>
+// ============================================================================
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "tao/UIOP_Connector.h"
 #include "tao/UIOP_Profile.h"
 #include "tao/GIOP.h"
 #include "tao/debug.h"
@@ -35,18 +49,20 @@ TAO_UIOP_Connect_Creation_Strategy::make_svc_handler (
                           this->orb_core_),
                       -1);
     }
-
   return 0;
 }
 
 // ****************************************************************
 
+typedef ACE_Cached_Connect_Strategy<TAO_UIOP_Client_Connection_Handler,
+                                    ACE_LSOCK_CONNECTOR,
+                                    TAO_Cached_Connector_Lock>
+        TAO_CACHED_CONNECT_STRATEGY;
+
 TAO_UIOP_Connector::TAO_UIOP_Connector (void)
   : TAO_Connector (TAO_IOP_TAG_UNIX_IOP),
     base_connector_ (),
-    orb_core_ (0),
-    cached_connect_strategy_ (0),
-    caching_strategy_ (0)
+    orb_core_ (0)
 {
 }
 
@@ -60,37 +76,32 @@ TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core)
                   TAO_Cached_Connector_Lock (orb_core),
                   -1);
 
-  int result = this->make_caching_strategy ();
-  if (result == -1)
-    return -1;
-
-  this->cached_connect_strategy_ =
-    new CACHED_CONNECT_STRATEGY (*this->caching_strategy_,
-        new TAO_UIOP_Connect_Creation_Strategy (this->orb_core_->thr_mgr (),
-                                                this->orb_core_),
+  TAO_CACHED_CONNECT_STRATEGY* cached_connect_strategy =
+    new TAO_CACHED_CONNECT_STRATEGY (
+        new TAO_UIOP_Connect_Creation_Strategy (
+            orb_core->thr_mgr (),
+            orb_core),
         0,
         0,
         connector_lock,
         1);
 
-  return this->base_connector_.open (this->orb_core_->reactor (),
+  return this->base_connector_.open (orb_core->reactor (),
                                      &this->null_creation_strategy_,
-                                     this->cached_connect_strategy_,
+                                     cached_connect_strategy,
                                      &this->null_activation_strategy_);
 }
 
 int
 TAO_UIOP_Connector::close (void)
 {
-  //
-  // @@ Can we delete the strategies that the connector uses before we
-  // close the connector itself??
-  //
+  TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy =
+    ACE_dynamic_cast (TAO_CACHED_CONNECT_STRATEGY *,
+                      this->base_connector_.connect_strategy ());
 
   // Zap the creation strategy that we created earlier
-  delete this->cached_connect_strategy_->creation_strategy ();
-  delete this->cached_connect_strategy_;
-  delete this->caching_strategy_;
+  delete cached_connect_strategy->creation_strategy ();
+  delete cached_connect_strategy;
 
   this->base_connector_.close ();
   return 0;
@@ -141,7 +152,6 @@ TAO_UIOP_Connector::connect (TAO_Profile *profile,
                       buffer,
                       "errno"));
         }
-
       return -1;
     }
 
@@ -163,6 +173,7 @@ TAO_UIOP_Connector::preconnect (const char *preconnects)
   char *preconnections = ACE_OS::strdup (protocol_removed);
 
   int successes = 0;
+
   if (preconnections)
     {
       ACE_UNIX_Addr dest;
@@ -340,269 +351,109 @@ TAO_UIOP_Connector::object_key_delimiter (void) const
   return TAO_UIOP_Profile::object_key_delimiter;
 }
 
-int
-TAO_UIOP_Connector::purge_connections (void)
-{
-  return this->cached_connect_strategy_->purge_connections ();
-}
-
-#define TAO_HANDLER TAO_UIOP_Client_Connection_Handler
-#define TAO_SVC_TUPLE ACE_Svc_Tuple<TAO_HANDLER>
-#define TAO_ADDR TAO_UIOP_Connector::ADDR
-#define TAO_HASH_KEY TAO_UIOP_Connector::HASH_KEY
-#define TAO_COMPARE_KEYS TAO_UIOP_Connector::COMPARE_KEYS
-#define TAO_ATTRIBUTES TAO_UIOP_Connector::ATTRIBUTES
-#define TAO_CACHED_HANDLER TAO_UIOP_Connector::CACHED_HANDLER
-#define TAO_HASH_MAP TAO_UIOP_Connector::HASH_MAP
-#define TAO_HASH_MAP_ITERATOR TAO_UIOP_Connector::HASH_MAP_ITERATOR
-#define TAO_HASH_MAP_REVERSE_ITERATOR TAO_UIOP_Connector::HASH_MAP_REVERSE_ITERATOR
-#define TAO_CACHING_UTILITY TAO_UIOP_Connector::CACHING_UTILITY
-#define TAO_CACHING_STRATEGY TAO_UIOP_Connector::CACHING_STRATEGY
-#define TAO_CACHED_CONNECT_STRATEGY TAO_UIOP_Connector::CACHED_CONNECT_STRATEGY
-
-typedef ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-        TAO_UIOP_LRU_CACHING_STRATEGY;
-
-#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-typedef TAO_UIOP_LRU_CACHING_STRATEGY
-        TAO_UIOP_CACHING_STRATEGY;
-#else
-typedef ACE_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-        TAO_UIOP_CACHING_STRATEGY;
-typedef ACE_LFU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-        TAO_UIOP_LFU_CACHING_STRATEGY;
-typedef ACE_FIFO_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-        TAO_UIOP_FIFO_CACHING_STRATEGY;
-typedef ACE_Null_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-        TAO_UIOP_NULL_CACHING_STRATEGY;
-typedef ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_LRU_CACHING_STRATEGY>
-        TAO_UIOP_LRU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_LFU_CACHING_STRATEGY>
-        TAO_UIOP_LFU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_FIFO_CACHING_STRATEGY>
-        TAO_UIOP_FIFO_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_NULL_CACHING_STRATEGY>
-        TAO_UIOP_NULL_CACHING_STRATEGY_ADAPTER;
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-int
-TAO_UIOP_Connector::make_caching_strategy (void)
-{
-
-  TAO_Resource_Factory *resource_factory =
-    this->orb_core_->resource_factory ();
-
-#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-  ACE_NEW_RETURN (this->caching_strategy_,
-                  TAO_UIOP_CACHING_STRATEGY,
-                  -1);
-
-#else
-
-  switch (resource_factory->connection_caching_strategy_type ())
-    {
-    case TAO_Resource_Factory::NOOP:
-      ACE_NEW_RETURN (this->caching_strategy_,
-                      TAO_UIOP_NULL_CACHING_STRATEGY_ADAPTER,
-                      -1);
-      break;
-
-    default:
-    case TAO_Resource_Factory::LRU:
-      ACE_NEW_RETURN (this->caching_strategy_,
-                      TAO_UIOP_LRU_CACHING_STRATEGY_ADAPTER,
-                      -1);
-      break;
-
-    case TAO_Resource_Factory::LFU:
-      ACE_NEW_RETURN (this->caching_strategy_,
-                      TAO_UIOP_LFU_CACHING_STRATEGY_ADAPTER,
-                      -1);
-      break;
-
-    case TAO_Resource_Factory::FIFO:
-      ACE_NEW_RETURN (this->caching_strategy_,
-                      TAO_UIOP_FIFO_CACHING_STRATEGY_ADAPTER,
-                      -1);
-      break;
-    }
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-  this->caching_strategy_->purge_percent (resource_factory->purge_percentage ());
-  return 0;
-}
-
-//
-// The TAO_Cached_Connector_Lock template instantiations are in
-// Resource_Factory.cpp.
-//
+#define TAO_UIOP_SVC_TUPLE ACE_Svc_Tuple<TAO_UIOP_Client_Connection_Handler>
+#define UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr>
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Node<ACE_UNIX_Addr>;
 template class ACE_Unbounded_Stack<ACE_UNIX_Addr>;
 template class ACE_Unbounded_Stack_Iterator<ACE_UNIX_Addr>;
 
+template class ACE_Connector<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>;
+template class ACE_Connect_Strategy<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>;
+template class ACE_Cached_Connect_Strategy<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR, TAO_Cached_Connector_Lock>;
+template class ACE_Strategy_Connector<TAO_UIOP_Client_Connection_Handler,
+                               ACE_LSOCK_CONNECTOR>;
+
+template class ACE_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler>;
+template class ACE_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>;
+
+template class ACE_NOOP_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>;
+template class ACE_NOOP_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler>;
+template class ACE_Recycling_Strategy<TAO_UIOP_Client_Connection_Handler>;
+
 template class ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr>;
-template class ACE_NOOP_Creation_Strategy<TAO_HANDLER>;
-template class ACE_Concurrency_Strategy<TAO_HANDLER>;
-template class ACE_Connect_Strategy<TAO_HANDLER, ACE_LSOCK_CONNECTOR>;
-template class ACE_Connector<TAO_HANDLER, ACE_LSOCK_CONNECTOR>;
-template class ACE_Creation_Strategy<TAO_HANDLER>;
-template class ACE_Hash_Map_Entry<TAO_ADDR, TAO_HANDLER *>;
-template class ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr> >;
-template class ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr> >;
-template class ACE_Map_Entry<ACE_HANDLE, TAO_SVC_TUPLE *>;
-template class ACE_Map_Manager<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_NOOP_Concurrency_Strategy<TAO_HANDLER>;
-template class ACE_Recycling_Strategy<TAO_HANDLER>;
-template class ACE_Strategy_Connector<TAO_HANDLER, ACE_LSOCK_CONNECTOR>;
-template class TAO_SVC_TUPLE;
-
-template class ACE_Pair<TAO_HANDLER *, TAO_ATTRIBUTES>;
-template class ACE_Reference_Pair<TAO_ADDR, TAO_HANDLER *>;
-template class ACE_Hash_Map_Entry<TAO_ADDR, TAO_CACHED_HANDLER>;
-
-template class ACE_Hash_Map_Manager<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Manager<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>;
-
-// = Caching_Strategy
-template class ACE_Hash_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
-
-template class ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
-
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-template class ACE_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
-template class ACE_LFU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
-template class ACE_FIFO_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
-template class ACE_Null_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
-
-template class ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_LRU_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_LFU_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_FIFO_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_NULL_CACHING_STRATEGY>;
-
-template class ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_HASH_MAP_ITERATOR, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
-template class ACE_Cache_Map_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
-template class ACE_Cache_Map_Reverse_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
-
-#else
-
-template class ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-template class ACE_Cached_Connect_Strategy_Ex<TAO_HANDLER, ACE_LSOCK_CONNECTOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES, TAO_Cached_Connector_Lock>;
-template class ACE_Cached_Connect_Strategy<TAO_HANDLER, ACE_LSOCK_CONNECTOR, TAO_Cached_Connector_Lock>;
-
-template class ACE_Cleanup_Strategy<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP>;
-template class ACE_Recyclable_Handler_Cleanup_Strategy<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP>;
-template class ACE_Recyclable_Handler_Caching_Utility<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP, TAO_HASH_MAP_ITERATOR, TAO_ATTRIBUTES>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+template class UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR;
+template class TAO_UIOP_SVC_TUPLE;
+template class ACE_Map_Manager<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator_Base<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Reverse_Iterator<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Entry<int, TAO_UIOP_SVC_TUPLE*>;
+
+template class ACE_Hash_Map_Entry<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *>;
+template class ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>;
+template class ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>;
+
+#if defined(ACE_HAS_THREADS)
+template class ACE_Hash_Map_Manager<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
+#endif /* ACE_HAS_THREADS */
+
+template class ACE_Hash_Map_Manager<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
+
+# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Node<ACE_UNIX_Addr>
 #pragma instantiate ACE_Unbounded_Stack<ACE_UNIX_Addr>
 #pragma instantiate ACE_Unbounded_Stack_Iterator<ACE_UNIX_Addr>
 
+#pragma instantiate ACE_Connector<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>
+#pragma instantiate ACE_Connect_Strategy<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>
+#pragma instantiate ACE_Cached_Connect_Strategy<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR, TAO_Cached_Connector_Lock>
+#pragma instantiate ACE_Strategy_Connector<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>
+
+#pragma instantiate ACE_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler>
+#pragma instantiate ACE_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>
+
+#pragma instantiate ACE_NOOP_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>
+#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler>
+
+#pragma instantiate ACE_Recycling_Strategy<TAO_UIOP_Client_Connection_Handler>
+
 #pragma instantiate ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr>
-#pragma instantiate ACE_NOOP_Creation_Strategy<TAO_HANDLER>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_HANDLER>
-#pragma instantiate ACE_Connect_Strategy<TAO_HANDLER, ACE_LSOCK_CONNECTOR>
-#pragma instantiate ACE_Connector<TAO_HANDLER, ACE_LSOCK_CONNECTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_HANDLER>
-#pragma instantiate ACE_Hash_Map_Entry<TAO_ADDR, TAO_HANDLER *>
-#pragma instantiate ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr> >
-#pragma instantiate ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr> >
-#pragma instantiate ACE_Map_Entry<ACE_HANDLE, TAO_SVC_TUPLE *>
-#pragma instantiate ACE_Map_Manager<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, TAO_SVC_TUPLE *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_HANDLER>
-#pragma instantiate ACE_Recycling_Strategy<TAO_HANDLER>
-#pragma instantiate ACE_Strategy_Connector<TAO_HANDLER, ACE_LSOCK_CONNECTOR>
-#pragma instantiate TAO_SVC_TUPLE
-
-#pragma instantiate ACE_Pair<TAO_HANDLER *, TAO_ATTRIBUTES>
-#pragma instantiate ACE_Reference_Pair<TAO_ADDR, TAO_HANDLER *>
-#pragma instantiate ACE_Hash_Map_Entry<TAO_ADDR, TAO_CACHED_HANDLER>
-
-#pragma instantiate ACE_Hash_Map_Manager<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_ADDR, TAO_HANDLER *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Manager<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, ACE_Null_Mutex>
-
-// = Caching_Strategy
-#pragma instantiate ACE_Hash_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY, TAO_COMPARE_KEYS, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
-
-#pragma instantiate ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-#pragma instantiate ACE_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-#pragma instantiate ACE_LFU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-#pragma instantiate ACE_FIFO_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-#pragma instantiate ACE_Null_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
-
-#pragma instantiate ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_LRU_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_LFU_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_FIFO_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_UIOP_NULL_CACHING_STRATEGY>
-
-#pragma instantiate ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_HASH_MAP_ITERATOR, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
-
-#else
-
-#pragma instantiate ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-#pragma instantiate ACE_Cached_Connect_Strategy_Ex<TAO_HANDLER, ACE_LSOCK_CONNECTOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES, TAO_Cached_Connector_Lock>
-#pragma instantiate ACE_Cached_Connect_Strategy<TAO_HANDLER, ACE_LSOCK_CONNECTOR, TAO_Cached_Connector_Lock>
-
-#pragma instantiate ACE_Cleanup_Strategy<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP>
-#pragma instantiate ACE_Recyclable_Handler_Cleanup_Strategy<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP>
-#pragma instantiate ACE_Recyclable_Handler_Caching_Utility<TAO_ADDR, TAO_CACHED_HANDLER, TAO_HASH_MAP, TAO_HASH_MAP_ITERATOR, TAO_ATTRIBUTES>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#pragma instantiate UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR
+#pragma instantiate TAO_UIOP_SVC_TUPLE
+#pragma instantiate ACE_Map_Manager<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Iterator_Base<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Iterator<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Reverse_Iterator<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Entry<int, TAO_UIOP_SVC_TUPLE*>
+
+#pragma instantiate ACE_Hash_Map_Entry<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *>
+#pragma instantiate ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>
+#pragma instantiate ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>
+
+#if defined(ACE_HAS_THREADS)
+#pragma instantiate ACE_Hash_Map_Manager<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
+#endif /* ACE_HAS_THREADS */
+
+#pragma instantiate ACE_Hash_Map_Manager<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
+
+# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Connector.h b/TAO/tao/UIOP_Connector.h
index 5acfec5c909..5036124f74e 100644
--- a/TAO/tao/UIOP_Connector.h
+++ b/TAO/tao/UIOP_Connector.h
@@ -23,26 +23,15 @@
 
 #include "ace/Connector.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 # if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
 #include "ace/LSOCK_Connector.h"
+
 #include "tao/Pluggable.h"
 #include "tao/UIOP_Connect.h"
-#include "tao/Resource_Factory.h"
-
-#if defined(__GNUC__) && __GNUC__ == 2 && __GNUC_MINOR__ < 8
-#define ACE_HAS_BROKEN_EXTENDED_TEMPLATES
-#endif /* __GNUC__ */
-
-#include "ace/Cached_Connect_Strategy_T.h"
 
 typedef ACE_Strategy_Connector<TAO_UIOP_Client_Connection_Handler,
-                               ACE_LSOCK_CONNECTOR>
-        TAO_UIOP_BASE_CONNECTOR;
+                               ACE_LSOCK_CONNECTOR> TAO_UIOP_BASE_CONNECTOR;
 
 // ****************************************************************
 
@@ -98,9 +87,6 @@ public:
 
   virtual char object_key_delimiter (void) const;
 
-  virtual int purge_connections (void);
-  // Purge "old" connections.
-
 protected:
   // = More TAO_Connector methods, please check the documentation on
   //   Pluggable.h
@@ -108,66 +94,7 @@ protected:
                              TAO_Profile *&,
                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
 
-  virtual int make_caching_strategy (void);
-  // According to the option specified, create the appropriate caching
-  // strategy used for purging unused connections from the connection
-  // cache.
-
-public:
-
-  // = Connection Caching Strategy.
-  typedef size_t ATTRIBUTES;
-  typedef ACE_Pair<TAO_UIOP_Client_Connection_Handler *,
-                   ATTRIBUTES>
-          CACHED_HANDLER;
-  typedef ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr>
-          ADDR;
-  typedef ACE_Hash<ADDR> HASH_KEY;
-  typedef ACE_Equal_To<ADDR> COMPARE_KEYS;
-
-  typedef ACE_Hash_Map_Manager_Ex<ADDR,
-                                  CACHED_HANDLER,
-                                  HASH_KEY,
-                                  COMPARE_KEYS,
-                                  ACE_Null_Mutex>
-          HASH_MAP;
-  typedef ACE_Hash_Map_Iterator_Ex<ADDR,
-                                   CACHED_HANDLER,
-                                   HASH_KEY,
-                                   COMPARE_KEYS,
-                                   ACE_Null_Mutex>
-          HASH_MAP_ITERATOR;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<ADDR,
-                                           CACHED_HANDLER,
-                                           HASH_KEY,
-                                           COMPARE_KEYS,
-                                           ACE_Null_Mutex>
-          HASH_MAP_REVERSE_ITERATOR;
-
-  typedef ACE_Recyclable_Handler_Caching_Utility<ADDR,
-                                                 CACHED_HANDLER,
-                                                 HASH_MAP,
-                                                 HASH_MAP_ITERATOR,
-                                                 ATTRIBUTES>
-          CACHING_UTILITY;
-
-#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-  typedef ACE_LRU_Caching_Strategy<ATTRIBUTES,
-                                   CACHING_UTILITY>
-          CACHING_STRATEGY;
-#else
-  typedef ACE_Caching_Strategy<ATTRIBUTES,
-                               CACHING_UTILITY>
-          CACHING_STRATEGY;
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-  typedef ACE_Cached_Connect_Strategy_Ex<TAO_UIOP_Client_Connection_Handler,
-                                         ACE_LSOCK_CONNECTOR,
-                                         CACHING_STRATEGY,
-                                         ATTRIBUTES,
-                                         TAO_Cached_Connector_Lock>
-          CACHED_CONNECT_STRATEGY;
-
+protected:
   typedef ACE_NOOP_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>
         TAO_NULL_CREATION_STRATEGY;
 
@@ -183,13 +110,6 @@ private:
 
   TAO_ORB_Core *orb_core_;
   // ORB Core.
-
-  CACHED_CONNECT_STRATEGY *cached_connect_strategy_;
-  // Cached connect strategy.
-
-  CACHING_STRATEGY *caching_strategy_;
-  // Caching strategy which decides the order of removal of entries
-  // from the connection cache.
 };
 
 # endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Factory.cpp b/TAO/tao/UIOP_Factory.cpp
index c69a3bdba06..6fc028b3016 100644
--- a/TAO/tao/UIOP_Factory.cpp
+++ b/TAO/tao/UIOP_Factory.cpp
@@ -1,10 +1,9 @@
 // -*- C++ -*-
 // $Id$
 
-#include "tao/UIOP_Factory.h"
-
 # if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "tao/UIOP_Factory.h"
 #include "tao/UIOP_Acceptor.h"
 #include "tao/UIOP_Connector.h"
 #include "ace/Dynamic_Service.h"
@@ -67,12 +66,6 @@ TAO_UIOP_Protocol_Factory::make_connector (void)
   return connector;
 }
 
-int
-TAO_UIOP_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 1;
-}
-
 ACE_STATIC_SVC_DEFINE (TAO_UIOP_Protocol_Factory,
                        ASYS_TEXT ("UIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/UIOP_Factory.h b/TAO/tao/UIOP_Factory.h
index e549eeabb43..52bf0f9c7b8 100644
--- a/TAO/tao/UIOP_Factory.h
+++ b/TAO/tao/UIOP_Factory.h
@@ -45,10 +45,12 @@ public:
   virtual const char *prefix (void) const;
   // Returns the prefix used by the protocol.
 
-  // = Check Protocol_Factory.h for a description of these methods.
+  // Factory methods
   virtual TAO_Acceptor  *make_acceptor (void);
+  // Create an acceptor
+
   virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
+  // Create a connector
 
 private:
   int major_;
diff --git a/TAO/tao/UIOP_Profile.cpp b/TAO/tao/UIOP_Profile.cpp
index f69e05729d6..20359182d8b 100644
--- a/TAO/tao/UIOP_Profile.cpp
+++ b/TAO/tao/UIOP_Profile.cpp
@@ -1,10 +1,9 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "tao/UIOP_Profile.h"
-
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "tao/UIOP_Profile.h"
 #include "tao/GIOP.h"
 #include "tao/CDR.h"
 #include "tao/Environment.h"
@@ -150,7 +149,7 @@ TAO_UIOP_Profile::parse_string (const char *string,
   ACE_OS::strncpy (rendezvous.inout (), start, length);
   rendezvous[length] = '\0';
 
-  if (this->object_addr_.set (rendezvous.in ()) != 0)
+  if (this->object_addr_.set (rendezvous.in ()) == 0)
     {
       ACE_THROW_RETURN (CORBA::INV_OBJREF (
         CORBA_SystemException::_tao_minor_code (
@@ -257,7 +256,7 @@ TAO_UIOP_Profile::to_string (CORBA::Environment &)
                   1 /* `@' character */ +
                   ACE_OS::strlen (this->rendezvous_point ()) +
                   1 /* object key separator */ +
-                  ACE_OS::strlen (key.in ()));
+                  ACE_OS::strlen (key));
 
   CORBA::String buf = CORBA::string_alloc (buflen);
 
diff --git a/TAO/tao/UIOP_Profile.h b/TAO/tao/UIOP_Profile.h
index e6df2364d97..b74beb276fc 100644
--- a/TAO/tao/UIOP_Profile.h
+++ b/TAO/tao/UIOP_Profile.h
@@ -23,10 +23,6 @@
 
 #include "tao/Pluggable.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 # if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
 #include "tao/Object_KeyC.h"
diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp
index 7de6447d1ce..63bf29186b5 100644
--- a/TAO/tao/UIOP_Transport.cpp
+++ b/TAO/tao/UIOP_Transport.cpp
@@ -1,10 +1,9 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "tao/UIOP_Transport.h"
-
 # if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "tao/UIOP_Transport.h"
 #include "tao/UIOP_Connect.h"
 #include "tao/UIOP_Profile.h"
 #include "tao/Timeprobe.h"
@@ -210,13 +209,10 @@ TAO_UIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
                                   two_way) == -1)
     return -1;
 
-  if (TAO_GIOP::send_message (this,
-                              stream,
-                              orb_core,
-                              max_wait_time) == -1)
-    return -1;
-
-  return this->idle_after_send ();
+  return TAO_GIOP::send_message (this,
+                                 stream,
+                                 orb_core,
+                                 max_wait_time);
 }
 
 // Return 0, when the reply is not read fully, 1 if it is read fully.
diff --git a/TAO/tao/UIOP_Transport.h b/TAO/tao/UIOP_Transport.h
index bcd9d8f61c1..cab2dd6060a 100644
--- a/TAO/tao/UIOP_Transport.h
+++ b/TAO/tao/UIOP_Transport.h
@@ -22,11 +22,6 @@
 #define TAO_UIOP_TRANSPORT_H
 
 #include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/GIOP.h"
 
 # if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
diff --git a/TAO/tao/Union.h b/TAO/tao/Union.h
index e0dece89f19..8c845f7255c 100644
--- a/TAO/tao/Union.h
+++ b/TAO/tao/Union.h
@@ -20,10 +20,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 class TAO_Export TAO_Base_Union
 {
   // = TITLE
diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h
index 3bb80ab8cf2..69a0e4f0170 100644
--- a/TAO/tao/ValueBase.h
+++ b/TAO/tao/ValueBase.h
@@ -18,11 +18,6 @@
 #define TAO_VALUEBASE_H
 
 #include "ace/OS.h"           /* for ptr_arith_t */
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/corbafwd.h"
 
 #ifdef TAO_HAS_VALUETYPE
diff --git a/TAO/tao/ValueFactory.h b/TAO/tao/ValueFactory.h
index 802ef7547a6..9b0557f2611 100644
--- a/TAO/tao/ValueFactory.h
+++ b/TAO/tao/ValueFactory.h
@@ -19,10 +19,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #ifdef TAO_HAS_VALUETYPE
 
 
diff --git a/TAO/tao/ValueFactory_Map.cpp b/TAO/tao/ValueFactory_Map.cpp
index 347d6bde062..c56a85c8dc2 100644
--- a/TAO/tao/ValueFactory_Map.cpp
+++ b/TAO/tao/ValueFactory_Map.cpp
@@ -61,11 +61,9 @@ TAO_ValueFactory_Map::rebind (const char *repo_id,
 //   --- but must be recursive
   const char *prev_repo_id;
   CORBA_ValueFactory_ptr prev_factory;
-  int ret = 0;
-  ret = this->map_.rebind (CORBA::string_dup (repo_id),
-                           factory,
-                           prev_repo_id, 
-                           prev_factory);
+  int ret = this->map_.rebind (CORBA::string_dup (repo_id),
+                                 factory,
+                                 prev_repo_id, prev_factory);
   if (ret > -1)   // ok, no error
     {
       factory->_add_ref ();    // The map owns one reference.
@@ -84,9 +82,7 @@ TAO_ValueFactory_Map::unbind (const char *repo_id,
 {
   // ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr> *prev_entry;
   FACTORY_MAP_MANAGER::ENTRY *prev_entry;
-  int ret = 0;
-  ret = this->map_.find (repo_id, 
-                         prev_entry);
+  int ret = this->map_.find (repo_id, prev_entry);
   if (ret == 0)    // there was a matching factory
     {
       // set factory to the previous factory,
@@ -106,9 +102,7 @@ int
 TAO_ValueFactory_Map::find (const char *repo_id,
                             CORBA_ValueFactory_ptr &factory)
 {
-  int ret = 0;
-  ret = this->map_.find (repo_id, 
-                         factory);
+  int ret = this->map_.find (repo_id, factory);
   // %! this must be guarded to be atomic  !!!!!!!!!!!!!!!!!!
   if (ret > -1)
     {
diff --git a/TAO/tao/ValueFactory_Map.h b/TAO/tao/ValueFactory_Map.h
index eae56a8c02c..95952dab090 100644
--- a/TAO/tao/ValueFactory_Map.h
+++ b/TAO/tao/ValueFactory_Map.h
@@ -18,11 +18,6 @@
 #define TAO_VALUEFACTORY_MAP_H
 
 #include "ace/Hash_Map_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "ace/Singleton.h"
 #include "ace/Synch.h"
 #include "tao/corbafwd.h"
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 185da3be42f..fa3a2844e93 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -3,5 +3,5 @@
 
 #define TAO_MAJOR_VERSION 0
 #define TAO_MINOR_VERSION 4
-#define TAO_BETA_VERSION 3
-#define TAO_VERSION "0.4.3"
+#define TAO_BETA_VERSION 0
+#define TAO_VERSION "0.4"
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index 49c696aca07..d29b111743b 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -20,7 +20,13 @@ TAO_Wait_Strategy::~TAO_Wait_Strategy (void)
 
 int
 TAO_Wait_Strategy::sending_request (TAO_ORB_Core * /* orb_core */,
-                                    int /* two_way */)
+                                    int            /* two_way */)
+{
+  return 0;
+}
+
+ACE_SYNCH_CONDITION *
+TAO_Wait_Strategy::leader_follower_condition_variable (void)
 {
   return 0;
 }
@@ -29,8 +35,8 @@ TAO_Wait_Strategy::sending_request (TAO_ORB_Core * /* orb_core */,
 
 // Constructor.
 TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport)
-  : TAO_Wait_Strategy (transport),
-    reply_received_ (0)
+  : TAO_Wait_Strategy (transport)
+    // reply_received_ (0)
 {
 }
 
@@ -40,7 +46,8 @@ TAO_Wait_On_Reactor::~TAO_Wait_On_Reactor (void)
 }
 
 int
-TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time)
+TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time,
+                           int &reply_received)
 {
   // Reactor does not change inside the loop.
   ACE_Reactor* reactor =
@@ -48,25 +55,21 @@ TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time)
 
   // Do the event loop, till we fully receive a reply.
 
-  int result = 1; // Optimize the first iteration [no access to errno]
-  this->reply_received_ = 0;
-  while (this->reply_received_ == 0
-         && (result > 0
-             || (result == 0
-                 && max_wait_time != 0
-                 && *max_wait_time != ACE_Time_Value::zero)))
+  int result = 1; // So the first iteration works...
+  // this->reply_received_ = 0;
+  while (reply_received  == 0 && result > 0)
     {
       result = reactor->handle_events (max_wait_time);
     }
 
-  if (result == -1 || this->reply_received_ == -1)
+  if (result == -1 || reply_received == -1)
     return -1;
 
-  // Return an error if there was a problem receiving the reply...
+  // Return an error if there was a problem receiving the reply.
   if (max_wait_time != 0)
     {
-      if (this->reply_received_ != 1
-          && *max_wait_time == ACE_Time_Value::zero)
+      if (reply_received != 1 &&
+          *max_wait_time == ACE_Time_Value::zero)
         {
           result = -1;
           errno = ETIME;
@@ -75,7 +78,7 @@ TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time)
   else
     {
       result = 0;
-      if (this->reply_received_ == -1)
+      if (reply_received == -1)
         result = -1;
     }
 
@@ -89,14 +92,14 @@ TAO_Wait_On_Reactor::handle_input (void)
 
   if (result == 1)
     {
-      this->reply_received_ = 1;
+      // this->reply_received_ = 1;
       result = 0;
     }
 
-  if (result == -1)
-    this->reply_received_ = -1;
+  // if (result == -1)
+  //  reply_received = -1;
 
-  return result;
+ return result;
 }
 
 // Register the handler with the Reactor.
@@ -110,7 +113,27 @@ TAO_Wait_On_Reactor::register_handler (void)
 
 // Constructor.
 TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower (TAO_Transport *transport)
-  : TAO_Wait_Strategy (transport),
+  : TAO_Wait_Strategy (transport)
+{
+}
+
+// Destructor.
+TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower (void)
+{
+}
+
+// Register the handler.
+int
+TAO_Wait_On_Leader_Follower::register_handler (void)
+{
+  return this->transport_->register_handler ();
+}
+
+// *********************************************************************
+
+// Constructor.
+TAO_Exclusive_Wait_On_Leader_Follower::TAO_Exclusive_Wait_On_Leader_Follower (TAO_Transport *transport)
+  : TAO_Wait_On_Leader_Follower (transport),
     calling_thread_ (ACE_OS::NULL_thread),
     cond_response_available_ (0),
     expecting_response_ (0),
@@ -119,7 +142,7 @@ TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower (TAO_Transport *transpo
 }
 
 // Destructor.
-TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower (void)
+TAO_Exclusive_Wait_On_Leader_Follower::~TAO_Exclusive_Wait_On_Leader_Follower (void)
 {
   delete this->cond_response_available_;
   this->cond_response_available_ = 0;
@@ -130,7 +153,7 @@ TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower (void)
 //    with the <Transport> object and <two_way> flag wont make sense
 //    at this level since this is common for AMI also. (Alex).
 int
-TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
+TAO_Exclusive_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
                                               int two_way)
 {
   {
@@ -146,9 +169,9 @@ TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
     // remember in which thread the client connection handler was running
     this->calling_thread_ = ACE_Thread::self ();
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - sending request for <%x>\n",
-                  this->transport_));
+    //if (TAO_debug_level > 0)
+    //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - sending request for <%x>\n",
+    //this->transport_));
   }
 
   // Register the handler.
@@ -175,7 +198,8 @@ TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
 }
 
 int
-TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
+TAO_Exclusive_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time,
+                                             int &)
 {
   // Cache the ORB core, it won't change and is used multiple times
   // below:
@@ -214,9 +238,9 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
 
       // Add ourselves to the list, do it only once because we can
       // wake up multiple times from the CV loop. And only do it if
-      // the reply has not been received (it could have arrived while
+      // the reply has not been received (it could have arrived while  
       // we were preparing to receive it).
-
+      
       if (!this->reply_received_
           && leader_follower.leader_available ())
         {
@@ -227,8 +251,8 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
                         cond));
         }
 
-      while (!this->reply_received_
-             && leader_follower.leader_available ())
+      while (!this->reply_received_ &&
+             leader_follower.leader_available ())
         {
           if (max_wait_time == 0)
             {
@@ -246,13 +270,14 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
         }
 
       countdown.update ();
+
 #if 0
       // Cannot remove the follower here, we *must* remove it when we
       // signal it so the same condition is not signalled for both
       // wake up as a follower and as the next leader.
       if (leader_follower.remove_follower (cond) == -1)
         ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) TAO_Wait_On_Leader_Follower::wait - "
+                    "TAO (%P|%t) TAO_Exclusive_Wait_On_Leader_Follower::wait - "
                     "remove_follower failed for <%x>\n", cond));
 #endif /* 0 */
 
@@ -298,7 +323,7 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
   // This might increase the refcount of the leader.
   leader_follower.set_leader_thread ();
 
-  int result = 1; // Optmize the first iteration [no access to errno]
+  int result = 1;
 
   {
     ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_SYNCH_MUTEX>, rev_mon,
@@ -313,11 +338,7 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
     //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - wait (leader) on <%x>\n",
     //this->transport_));
 
-    while (this->reply_received_ == 0
-           && (result > 0
-               || (result == 0
-                   && max_wait_time != 0
-                   && *max_wait_time != ACE_Time_Value::zero)))
+    while (result > 0 && this->reply_received_ == 0)
       result = orb_core->reactor ()->handle_events (max_wait_time);
 
     //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - done (leader) on <%x>\n",
@@ -336,13 +357,13 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
 
   if (leader_follower.elect_new_leader () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO:%N:%l:(%P|%t):TAO_Wait_On_Leader_Follower::send_request: "
+                       "TAO:%N:%l:(%P|%t):TAO_Exclusive_Wait_On_Leader_Follower::send_request: "
                        "Failed to unset the leader and wake up a new follower.\n"),
                       -1);
 
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO:%N:%l:(%P|%t):TAO_Wait_On_Leader_Follower::wait: "
+                       "TAO:%N:%l:(%P|%t):TAO_Exclusive_Wait_On_Leader_Follower::wait: "
                        "handle_events failed.\n"),
                       -1);
 
@@ -375,7 +396,7 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
 
 // Handle the input. Return -1 on error, 0 on success.
 int
-TAO_Wait_On_Leader_Follower::handle_input (void)
+TAO_Exclusive_Wait_On_Leader_Follower::handle_input (void)
 {
   TAO_ORB_Core* orb_core =
     this->transport_->orb_core ();
@@ -434,15 +455,8 @@ TAO_Wait_On_Leader_Follower::handle_input (void)
   return result;
 }
 
-// Register the handler.
-int
-TAO_Wait_On_Leader_Follower::register_handler (void)
-{
-  return this->transport_->register_handler ();
-}
-
 ACE_SYNCH_CONDITION *
-TAO_Wait_On_Leader_Follower::cond_response_available (void)
+TAO_Exclusive_Wait_On_Leader_Follower::cond_response_available (void)
 {
   // @@ TODO This condition variable should per-ORB-per-thread, not
   // per-connection, it is a waste to have more than one of this in
@@ -459,7 +473,7 @@ TAO_Wait_On_Leader_Follower::cond_response_available (void)
 }
 
 void
-TAO_Wait_On_Leader_Follower::wake_up (void)
+TAO_Exclusive_Wait_On_Leader_Follower::wake_up (void)
 {
   if (ACE_OS::thr_equal (this->calling_thread_, ACE_Thread::self ()))
     {
@@ -484,10 +498,10 @@ TAO_Wait_On_Leader_Follower::wake_up (void)
 
   TAO_Leader_Follower& leader_follower =
     this->transport_->orb_core ()->leader_follower ();
-
+  
   // We *must* remove it when we signal it so the same condition is
   // not signalled for both wake up as a follower and as the next
-  // leader.
+  // leader. 
   // The follower may not be there if the reply is received while the
   // consumer is not yet waiting for it (i.e. it send the request but
   // has not blocked to receive the reply yet)
@@ -500,6 +514,289 @@ TAO_Wait_On_Leader_Follower::wake_up (void)
 // *********************************************************************
 
 // Constructor.
+TAO_Muxed_Wait_On_Leader_Follower::TAO_Muxed_Wait_On_Leader_Follower (TAO_Transport *transport)
+  : TAO_Wait_On_Leader_Follower (transport)
+{
+}
+
+// Destructor.
+TAO_Muxed_Wait_On_Leader_Follower::~TAO_Muxed_Wait_On_Leader_Follower (void)
+{
+}
+
+int
+TAO_Muxed_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
+                                                    int two_way)
+{
+  // Register the handler. 
+  // @@ We could probably move this somewhere else, and remove this
+  //    function totally. (Alex).
+  this->transport_->register_handler ();
+
+  // Send the request.
+  int result =
+    this->TAO_Wait_Strategy::sending_request (orb_core,
+                                              two_way);
+  
+  return 0;
+}
+
+int
+TAO_Muxed_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time,
+                                         int &reply_received)
+{
+  // Cache the ORB core, it won't change and is used multiple times
+  // below:
+  TAO_ORB_Core* orb_core =
+    this->transport_->orb_core ();
+
+  TAO_Leader_Follower& leader_follower =
+    orb_core->leader_follower ();
+
+  // Obtain the lock.
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon,
+                    leader_follower.lock (), -1);
+
+  leader_follower.set_client_thread ();
+
+  ACE_Countdown_Time countdown (max_wait_time);
+
+  // Check if there is a leader, but the leader is not us
+  if (leader_follower.leader_available ()
+      && !leader_follower.is_leader_thread ())
+    {
+      // = Wait as a follower.
+
+      // Grab the condtion variable.
+      ACE_SYNCH_CONDITION* cond =
+        orb_core->leader_follower_condition_variable ();
+
+      if (TAO_debug_level >= 5)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO (%P|%t) - wait (follower) on Transport <%x>, cond <%x>\n",
+                    this->transport_,
+                    cond));
+
+      // Add ourselves to the list, do it only once because we can
+      // wake up multiple times from the CV loop. And only do it if
+      // the reply has not been received (it could have arrived while
+      // we were preparing to receive it).
+
+      if (!reply_received
+          && leader_follower.leader_available ())
+        {
+          if (leader_follower.add_follower (cond) == -1)
+            ACE_ERROR ((LM_ERROR,
+                        "TAO (%P|%t) TAO_Muxed_Wait_On_Leader_Follower::wait - "
+                        "add_follower failed for <%x>\n",
+                        cond));
+        }
+
+
+      while (!reply_received &&
+             leader_follower.leader_available ())
+        {
+          if (max_wait_time == 0)
+            {
+              if (cond == 0 || cond->wait () == -1)
+                {
+                  if (TAO_debug_level >= 5)
+                    ACE_DEBUG ((LM_DEBUG,
+                                "TAO (%P|%t) - wait (follower) on <%x> "
+                                "cond == 0 || cond->wait () == -1 : cond = %d\n",
+                                this->transport_, (cond == 0) ? 0 : cond));
+                  return -1;
+                }
+            }
+          else
+            {
+              countdown.update ();
+              ACE_Time_Value tv = ACE_OS::gettimeofday ();
+              tv += *max_wait_time;
+              if (cond == 0 || cond->wait (&tv) == -1)
+                {
+                  if (TAO_debug_level >= 5)
+                    ACE_DEBUG ((LM_DEBUG,
+                                "TAO (%P|%t) - wait (follower) on <%x> "
+                                "cond == 0 || cond->wait (tv) == -1\n",
+                                this->transport_));
+                  return -1;
+                }
+            }
+        }
+
+      countdown.update ();
+
+#if 0
+      // Cannot remove the follower here, we *must* remove it when we
+      // signal it so the same condition is not signalled for both
+      // wake up as a follower and as the next leader.
+      if (leader_follower.remove_follower (cond) == -1)
+        ACE_ERROR ((LM_ERROR,
+                    "TAO (%P|%t) TAO_Muxed_Wait_On_Leader_Follower::wait - "
+                    "remove_follower failed for <%x>\n", cond));
+#endif /* 0 */
+
+      if (TAO_debug_level >= 5)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO (%P|%t) - done (follower) on <%x>, reply_received %d\n",
+                    this->transport_, reply_received));
+      
+      // Now somebody woke us up to become a leader or to handle
+      // our input. We are already removed from the follower queue.
+      
+      if (reply_received == 1)
+        return 0;
+      
+      // FALLTHROUGH
+      // We only get here if we woke up but the reply is not complete
+      // yet, time to assume the leader role....
+      // i.e. ACE_ASSERT (this->reply_received_ == 0);
+    }
+  
+  // = Leader Code.
+
+  // The only way to reach this point is if we must become the leader,
+  // because there is no leader or we have to update to a leader or we
+  // are doing nested upcalls in this case we do increase the refcount
+  // on the leader in TAO_ORB_Core.
+
+  // This might increase the refcount of the leader.
+  leader_follower.set_leader_thread ();
+
+  int result = 1;
+
+  {
+    ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_SYNCH_MUTEX>, rev_mon,
+                      leader_follower.reverse_lock (), -1);
+
+    // @@ Do we need to do this?
+    // Become owner of the reactor.
+    orb_core->reactor ()->owner (ACE_Thread::self ());
+
+    // Run the reactor event loop.
+
+    if (TAO_debug_level >= 5)
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - wait (leader):to enter reactor event loop on <%x>\n",
+                  this->transport_));
+
+    while (result > 0 && reply_received == 0)
+      result = orb_core->reactor ()->handle_events (max_wait_time);
+
+    if (TAO_debug_level >= 5)
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - wait : (leader) : done with reactor event loop on <%x>\n",
+                  this->transport_));
+  }
+
+  // Wake up the next leader, we cannot do that in handle_input,
+  // because the woken up thread would try to get into
+  // handle_events, which is at the time in handle_input still
+  // occupied. But do it before checking the error in <result>, even
+  // if there is an error in our input we should continue running the
+  // loop in another thread.
+
+  leader_follower.reset_leader_thread ();
+  leader_follower.reset_client_thread ();
+
+  if (leader_follower.elect_new_leader () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "TAO:%N:%l:(%P|%t):TAO_Muxed_Wait_On_Leader_Follower::send_request: "
+                       "Failed to unset the leader and wake up a new follower.\n"),
+                      -1);
+
+  if (result == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "TAO:%N:%l:(%P|%t):TAO_Muxed_Wait_On_Leader_Follower::wait: "
+                       "handle_events failed.\n"),
+                      -1);
+
+  // Return an error if there was a problem receiving the reply...
+  if (max_wait_time != 0)
+    {
+      if (reply_received != 1
+          && *max_wait_time == ACE_Time_Value::zero)
+        {
+          result = -1;
+          errno = ETIME;
+        }
+    }
+  else
+    {
+      result = 0;
+      if (reply_received == -1)
+        {
+          result = -1;
+        }
+    }
+
+  return result;
+}
+
+// Handle the input. Return -1 on error, 0 on success.
+int
+TAO_Muxed_Wait_On_Leader_Follower::handle_input (void)
+{
+  // Cache the ORB core, it won't change and is used multiple times
+  // below:
+  TAO_ORB_Core* orb_core =
+    this->transport_->orb_core ();
+
+  // Obtain the lock.
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon,
+                    orb_core->leader_follower ().lock (),
+                    -1);
+
+  if (TAO_debug_level >= 5)
+    ACE_DEBUG ((LM_DEBUG,
+                "TAO (%P|%t) - reading reply on <%x>\n",
+                this->transport_));
+  
+  // Receive any data that is available, without blocking...
+  int result = this->transport_->handle_client_input (0);
+
+  // Data was read, but there the reply has not been completely
+  // received...
+  if (result == 0)
+    return 0;
+
+  if (result == -1)
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO (%P|%t) - Wait_On_LF::handle_input, "
+                    "handle_client_input == -1\n"));
+      // this->reply_received_ = -1;
+    }
+
+  if (result == 1)
+    {
+      // Change the result value to something that the Reactor can
+      // understand
+      result = 0;
+      
+      // reply_received_ = 1;
+      // This would have been done by the dispatch already. 
+    }
+
+  // Wake up any threads waiting for this message, either because the
+  // message failed or because we really received it.
+  // this->wake_up ();
+  // <wake_up> will be done in the <dispatch_reply>
+
+  return result;
+}
+
+ACE_SYNCH_CONDITION *
+TAO_Muxed_Wait_On_Leader_Follower::leader_follower_condition_variable (void)
+{
+  return this->transport_->orb_core ()->leader_follower_condition_variable ();
+}
+
+// *********************************************************************
+
+// Constructor.
 TAO_Wait_On_Read::TAO_Wait_On_Read (TAO_Transport *transport)
   : TAO_Wait_Strategy (transport)
 {
@@ -512,7 +809,8 @@ TAO_Wait_On_Read::~TAO_Wait_On_Read (void)
 
 // Wait on the read operation.
 int
-TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time)
+TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time,
+                        int &)
 {
   int reply_complete = 0;
   while (reply_complete != 1)
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index 0cc8ea91ade..12a690c82db 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -22,10 +22,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 class TAO_ORB_Core;
 class TAO_Transport;
 class TAO_Transport_Mux_Strategy;
@@ -52,8 +48,10 @@ public:
   // variables because the reply may arrive *before* the user calls
   // wait.
 
-  virtual int wait (ACE_Time_Value *max_wait_time) = 0;
-  // Base class virtual method.
+  virtual int wait (ACE_Time_Value *max_wait_time,
+                    int &reply_received) = 0;
+  // Base class virtual method. Wait till the <reply_received> flag is
+  // true or the time expires.
 
   virtual int handle_input (void) = 0;
   // Handle the input.
@@ -62,6 +60,11 @@ public:
   // Register the handler with the Reactor if it makes sense for the
   // strategy.
 
+  virtual ACE_SYNCH_CONDITION *leader_follower_condition_variable (void);
+  // Return the TSS leader follower condition variable used in the
+  // Wait Strategy. Muxed Leader Follower implementation returns a
+  // valid condition variable, others return 0.
+
 protected:
   TAO_Transport *transport_;
   // Transport object.
@@ -69,7 +72,9 @@ protected:
 
 // @@ Alex: we should consider moving these classes to separate files,
 //    that can minimize the footprint of systems that use only one of
-//    the strategies....
+//    the strategies....(coryan).
+
+// *********************************************************************
 
 class TAO_Export TAO_Wait_On_Reactor : public TAO_Wait_Strategy
 {
@@ -90,16 +95,19 @@ public:
 
   // = Documented in TAO_Wait_Strategy.
 
-  virtual int wait (ACE_Time_Value *max_wait_time);
+  virtual int wait (ACE_Time_Value *max_wait_time,
+                    int &reply_received);
   virtual int handle_input (void);
   virtual int register_handler (void);
 
 private:
-  int reply_received_;
+  // int reply_received_;
   // This flag indicates if a *complete* reply has been received. Used
   // to exit the event loop.
 };
 
+// *********************************************************************
+
 class TAO_Export TAO_Wait_On_Leader_Follower : public TAO_Wait_Strategy
 {
   // = TITLE
@@ -117,14 +125,53 @@ public:
 
   virtual ~TAO_Wait_On_Leader_Follower (void);
   // Destructor.
+  
+  // = Documented in TAO_Wait_Strategy.
+
+  // virtual int sending_request (TAO_ORB_Core *orb_core,
+  //                              int two_way);
+  
+  // virtual int wait (ACE_Time_Value *max_wait_time,
+  //                   int &reply_received);
 
+  // virtual int handle_input (void);
+  
+  virtual int register_handler (void);
+};
+
+// *********************************************************************
+
+class TAO_Export TAO_Exclusive_Wait_On_Leader_Follower : public TAO_Wait_On_Leader_Follower
+{
+  // = TITLE
+  //
+  //    Wait according to the Leader-Follower model. Leader does the
+  //    event loop of the Reactor and the Followers wait on the
+  //    condition variable.
+  //
+  // = DESCRIPTION
+  //    
+  //     This is strategy is to work with the Exclusive Transport Mux
+  //     Strategy. This was the original implementation of Leader
+  //     Follower before Muxed Transport was introduced. Here the
+  //     state variables such as Condition Variable etc are kept in
+  //     the <Wait Strategy> which is a per Transport object.
+
+public:
+  TAO_Exclusive_Wait_On_Leader_Follower (TAO_Transport *transport);
+  // Constructor.
+
+  virtual ~TAO_Exclusive_Wait_On_Leader_Follower (void);
+  // Destructor.
+  
   // = Documented in TAO_Wait_Strategy.
 
   virtual int sending_request (TAO_ORB_Core *orb_core,
                                int two_way);
-  virtual int wait (ACE_Time_Value *max_wait_time);
+  virtual int wait (ACE_Time_Value *max_wait_time,
+                    int &reply_received);
   virtual int handle_input (void);
-  virtual int register_handler (void);
+  // virtual int register_handler (void);
 
 protected:
   ACE_SYNCH_CONDITION* cond_response_available (void);
@@ -151,6 +198,50 @@ protected:
   // or the reactor event loop.
 };
 
+// *********************************************************************
+
+class TAO_Export TAO_Muxed_Wait_On_Leader_Follower : public TAO_Wait_On_Leader_Follower
+{
+  // = TITLE
+  //
+  //    Wait according to the Leader-Follower model. Leader does the
+  //    event loop of the Reactor and the Followers wait on the
+  //    condition variable.
+  //
+  // = DESCRIPTION
+  //
+  //    This impelementation is to work with the Muxed Transport
+  //    Mechanism. Here the state variables such as <Condition
+  //    Variable> etc cannot be kept in the Wait Strategy, since the
+  //    Wait Strategy is per Transport object and here the Transport
+  //    is Muxed and hence there are multiple threads running in the
+  //    same Transport context. 
+
+public:
+  TAO_Muxed_Wait_On_Leader_Follower (TAO_Transport *transport);
+  // Constructor.
+
+  virtual ~TAO_Muxed_Wait_On_Leader_Follower (void);
+  // Destructor.
+  
+  // = Documented in TAO_Wait_Strategy.
+  
+  virtual int sending_request (TAO_ORB_Core *orb_core,
+                               int two_way);
+
+  virtual int wait (ACE_Time_Value *max_wait_time,
+                    int &reply_received);
+
+  virtual int handle_input (void);
+
+  // virtual int register_handler (void);
+
+  virtual ACE_SYNCH_CONDITION *leader_follower_condition_variable (void);
+  // TSS Leader follower condition variable.
+};
+
+// *********************************************************************
+
 class TAO_Export TAO_Wait_On_Read :  public TAO_Wait_Strategy
 {
   // = TITLE
@@ -166,7 +257,10 @@ public:
   virtual ~TAO_Wait_On_Read (void);
   // Destructor.
 
-  virtual int wait (ACE_Time_Value *max_wait_time);
+  // = Documented in TAO_Wait_Strategy.
+
+  virtual int wait (ACE_Time_Value *max_wait_time,
+                    int &reply_received);
   virtual int handle_input (void);
   virtual int register_handler (void);
 };
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 43378fc5704..75568c5c64a 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -83,12 +83,6 @@
 #include "tao/DomainC.h"
 #include "tao/WrongTransactionC.h"
 
-#ifdef TAO_HAS_INTERFACE_REPOSITORY
-// Interface repository
-#include "tao/InterfaceC.h"
-
-#endif /*TAO_HAS_INTERFACE_REPOSITORY */
-
 #if !defined (ACE_NESTED_CLASS)
 #if defined (ACE_WIN32)
 #define ACE_NESTED_CLASS(SCOPE,CLASS) CLASS
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 2b4a3121037..10f55545c36 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -337,275 +337,6 @@ class CORBA_ORB_ObjectIdList_var;
 class CORBA_ORB_ObjectIdList_out;
 typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
 
-// Forward declarations for INTERFACE REPO..Bala
-#ifdef TAO_HAS_INTERFACE_REPOSTORY
-
-class CORBA_IRObject;
-class CORBA_IRObject_var;
-class CORBA_IRObject_out;
-typedef CORBA_IRObject *CORBA_IRObject_ptr;
-
-class CORBA_Contained;
-class CORBA_Contained_out;
-class CORBA_Contained_var;
-typedef CORBA_Contained *CORBA_Contained_ptr;
-
-class CORBA_Repository;
-class CORBA_Repository_var;
-class CORBA_Repository_out;
-typedef CORBA_Repository *CORBA_Repository_ptr;
-
-class CORBA_Container;
-class CORBA_Container_var;
-class CORBA_Container_out;
-typedef CORBA_Container *CORBA_Container_ptr;
-
-class CORBA_ModuleDef;
-class CORBA_ModuleDef_out;
-class CORBA_ModuleDef_var;
-typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
-
-class CORBA_ConstantDef;
-class CORBA_ConstantDef_out;
-class CORBA_ConstantDef_var;
-typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
-
-class CORBA_IDLType;
-class CORBA_IDLType_out;
-class CORBA_IDLType_var;
-typedef CORBA_IDLType *CORBA_IDLType_ptr;
-
-class CORBA_StructDef;
-class CORBA_StructDef_var;
-class CORBA_StructDef_out;
-typedef  CORBA_StructDef *CORBA_StructDef_ptr;
-
-class CORBA_UnionDef;
-class CORBA_UnionDef_var;
-class CORBA_UnionDef_out;
-typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
-
-class CORBA_EnumDef;
-class CORBA_EnumDef_var;
-class CORBA_EnumDef_out;
-typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
-
-class CORBA_AliasDef;
-class CORBA_AliasDef_var;
-class CORBA_AliasDef_out;
-typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
-
-class CORBA_ExceptionDef;
-class CORBA_ExceptionDef_out;
-class CORBA_ExceptionDef_var;
-typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
-
-class CORBA_NativeDef;
-class CORBA_NativeDef_out;
-class CORBA_NativeDef_var;
-typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
-
-class CORBA_InterfaceDefSeq;
-class CORBA_InterfaceDefSeq_out;
-class CORBA_InterfaceDefSeq_var;
-typedef CORBA_InterfaceDefSeq *CORBA_InterfaceDefSeq_ptr;
-
-class CORBA_ValueDef;
-class CORBA_ValueDef_out;
-class CORBA_ValueDef_var;
-typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
-
-class CORBA_ValueDefSeq;
-class CORBA_ValueDefSeq_out;
-class CORBA_ValueDefSeq_var;
-typedef CORBA_ValueDefSeq *CORBA_ValueDefSeq_ptr;
-
-class CORBA_ValueBoxDef;
-class CORBA_ValueBoxDef_out;
-class CORBA_ValueBoxDef_var;
-typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
-
-class CORBA_ContainedSeq;
-class CORBA_ContainedSeq_out;
-class CORBA_ContainedSeq_var;
-typedef CORBA_ContainedSeq *CORBA_ContainedSeq_ptr;
-
-struct CORBA_StructMember;
-class CORBA_StructMember_out;
-class CORBA_StructMember_var;
-typedef CORBA_StructMember *CORBA_StructMember_ptr;
-
-class CORBA_StructMemberSeq;
-class CORBA_StructMemberSeq_out;
-class CORBA_StructMemberSeq_var;
-typedef CORBA_StructMemberSeq *CORBA_StructMemberSeq_ptr;
-
-struct CORBA_Initializer;
-class CORBA_Initializer_out;
-class CORBA_Initializer_var;
-typedef CORBA_Initializer *CORBA_Initializer_ptr;
-
-class CORBA_InitializerSeq;
-class CORBA_InitializerSeq_out;
-class CORBA_InitializerSeq_var;
-typedef CORBA_InitializerSeq *CORBA_InitializerSeq_ptr;
-
-struct CORBA_UnionMember;
-class CORBA_UnionMember_out;
-class CORBA_UnionMember_var;
-typedef CORBA_UnionMember *CORBA_UnionMember_ptr;
-
-class CORBA_UnionMemberSeq;
-class CORBA_UnionMemberSeq_out;
-class CORBA_UnionMemberSeq_var;
-typedef CORBA_UnionMemberSeq *CORBA_UnionMemberSeq_ptr;
-
-class CORBA_PrimitiveDef;
-class CORBA_PrimitiveDef_out;
-class CORBA_PrimitiveDef_var;
-typedef CORBA_PrimitiveDef *CORBA_PrimitiveDef_ptr;
-
-class CORBA_StringDef;
-class CORBA_StringDef_out;
-class CORBA_StringDef_var;
-typedef CORBA_StringDef *CORBA_StringDef_ptr;
-
-class CORBA_SequenceDef;
-class CORBA_SequenceDef_out;
-class CORBA_SequenceDef_var;
-typedef CORBA_SequenceDef *CORBA_SequenceDef_ptr;
-
-class CORBA_ArrayDef;
-class CORBA_ArrayDef_out;
-class CORBA_ArrayDef_var;
-typedef CORBA_ArrayDef *CORBA_ArrayDef_ptr;
-
-class CORBA_WstringDef;
-class CORBA_WstringDef_out;
-class CORBA_WstringDef_var;
-typedef CORBA_WstringDef *CORBA_WstringDef_ptr;
-
-class CORBA_FixedDef;
-class CORBA_FixedDef_out;
-class CORBA_FixedDef_var;
-typedef CORBA_FixedDef *CORBA_FixedDef_ptr;
-
-struct CORBA_ModuleDescription;
-class CORBA_ModuleDescription_out;
-class CORBA_ModuleDescription_var;
-typedef CORBA_ModuleDescription *CORBA_ModuleDescription_ptr;
-
-struct CORBA_ConstantDescription;
-class CORBA_ConstantDescription_out;
-class CORBA_ConstantDescription_var;
-typedef CORBA_ConstantDescription *CORBA_ConstantDescription_ptr;
-
-class CORBA_TypedefDef;
-class CORBA_TypedefDef_out;
-class CORBA_TypedefDef_var;
-typedef CORBA_TypedefDef *CORBA_TypedefDef_ptr;
-
-struct CORBA_TypeDescription;
-class CORBA_TypeDescription_out;
-class CORBA_TypeDescription_var;
-typedef CORBA_TypeDescription *CORBA_TypeDescription_ptr;
-
-struct CORBA_ExceptionDescription;
-class CORBA_ExceptionDescription_out;
-class CORBA_ExceptionDescription_var;
-typedef CORBA_ExceptionDescription *CORBA_ExceptionDescription_ptr;
-
-class CORBA_AttributeDef;
-class CORBA_AttributeDef_out;
-class CORBA_AttributeDef_var;
-typedef CORBA_AttributeDef *CORBA_AttributeDef_ptr;
-
-struct CORBA_AttributeDescription;
-class CORBA_AttributeDescription_out;
-class CORBA_AttributeDescription_var;
-typedef CORBA_AttributeDescription *CORBA_AttributeDescription_ptr;
-
-struct CORBA_ParameterDescription;
-class CORBA_ParameterDescription_out;
-class CORBA_ParameterDescription_var;
-typedef CORBA_ParameterDescription *CORBA_ParameterDescription_ptr;
-
-class CORBA_ParDescriptionSeq;
-class CORBA_ParDescriptionSeq_out;
-class CORBA_ParDescriptionSeq_var;
-typedef CORBA_ParDescriptionSeq *CORBA_ParDescriptionSeq_ptr;
-
-class CORBA_ContextIdSeq;
-class CORBA_ContextIdSeq_out;
-class CORBA_ContextIdSeq_var;
-typedef CORBA_ContextIdSeq *CORBA_ContextIdSeq_ptr;
-
-class CORBA_ExceptionDefSeq;
-class CORBA_ExceptionDefSeq_out;
-class CORBA_ExceptionDefSeq_var;
-typedef CORBA_ExceptionDefSeq *CORBA_ExceptionDefSeq_ptr;
-
-class CORBA_ExcDescriptionSeq;
-class CORBA_ExcDescriptionSeq_out;
-class CORBA_ExcDescriptionSeq_var;
-typedef CORBA_ExcDescriptionSeq *CORBA_ExcDescriptionSeq_ptr;
-
-class CORBA_OperationDef;
-class CORBA_OperationDef_out;
-class CORBA_OperationDef_var;
-typedef CORBA_OperationDef *CORBA_OperationDef_ptr;
-
-class CORBA_OperationDescription;
-class CORBA_OperationDescription_out;
-class CORBA_OperationDescription_var;
-typedef CORBA_OperationDescription *CORBA_OperationDescription_ptr;
-
-class CORBA_RepositoryIdSeq;
-class CORBA_RepositoryIdSeq_out;
-class CORBA_RepositoryIdSeq_var;
-typedef CORBA_RepositoryIdSeq *CORBA_RepositoryIdSeq_ptr;
-
-class CORBA_OpDescriptionSeq;
-class CORBA_OpDescriptionSeq_out;
-class CORBA_OpDescriptionSeq_var;
-typedef CORBA_OpDescriptionSeq *CORBA_OpDescriptionSeq_ptr;
-
-class CORBA_AttrDescriptionSeq;
-class CORBA_AttrDescriptionSeq_out;
-class CORBA_AttrDescriptionSeq_var;
-typedef CORBA_AttrDescriptionSeq *CORBA_AttrDescriptionSeq_ptr;
-
-struct CORBA_InterfaceDescription;
-class CORBA_InterfaceDescription_out;
-class CORBA_InterfaceDescription_var;
-typedef CORBA_InterfaceDescription *CORBA_InterfaceDescription_ptr;
-
-struct CORBA_ValueMember;
-class CORBA_ValueMember_out;
-class CORBA_ValueMember_var;
-typedef CORBA_ValueMember *CORBA_ValueMember_ptr;
-
-class CORBA_ValueMemberSeq;
-class CORBA_ValueMemberSeq_out;
-class CORBA_ValueMemberSeq_var;
-typedef CORBA_ValueMemberSeq *CORBA_ValueMemberSeq_ptr;
-
-class CORBA_ValueMemberDef;
-class CORBA_ValueMemberDef_out;
-class CORBA_ValueMemberDef_var;
-typedef CORBA_ValueMemberDef *CORBA_ValueMemberDef_ptr;
-
-struct CORBA_ValueDescription;
-class CORBA_ValueDescription_out;
-class CORBA_ValueDescription_var;
-typedef CORBA_ValueDescription *CORBA_ValueDescription_ptr;
-
-class CORBA_EnumMemberSeq;
-class CORBA_EnumMemberSeq_out;
-class CORBA_EnumMemberSeq_var;
-typedef CORBA_EnumMemberSeq *CORBA_EnumMemberSeq_ptr;
-#endif /* TAO_HAS_INTERFACE_REPOSITORY*/
-
 // enum values defined in tao/NVList.h, bitwise ORed.
 typedef u_int CORBA_Flags;
 
@@ -798,274 +529,6 @@ TAO_NAMESPACE CORBA
   typedef CORBA_Current_var Current_var;
   typedef CORBA_Current_out Current_out;
 
-#ifdef TAO_HAS_INTERFACE_REPOSITORY
-  // Interface Repository Bala===========
-  typedef CORBA_IRObject IRObject;
-  typedef CORBA_IRObject *IRObject_ptr;
-  typedef CORBA_IRObject_out IRObject_out;
-  typedef CORBA_IRObject_var IRObject_var;
-
-  typedef CORBA_Contained Contained;
-  typedef CORBA_Contained *Contained_ptr;
-  typedef CORBA_Contained_out Contained_out;
-  typedef CORBA_Contained_var Contained_var;
-
-  typedef CORBA_Repository Repository;
-  typedef CORBA_Repository *Repository_ptr;
-  typedef CORBA_Repository_out Repository_out;
-  typedef CORBA_Repository_var Repository_var;
-
-  typedef CORBA_Container Container;
-  typedef CORBA_Container *Container_ptr;
-  typedef CORBA_Container_out Container_out;
-  typedef CORBA_Container_var Container_var;
-
-  typedef CORBA_ModuleDef ModuleDef;
-  typedef CORBA_ModuleDef *ModuleDef_ptr;
-  typedef CORBA_ModuleDef_out ModuleDef_out;
-  typedef CORBA_ModuleDef_var  ModuleDef_var;
-
-  typedef CORBA_ConstantDef ConstantDef;
-  typedef CORBA_ConstantDef *ConstantDef_ptr;
-  typedef CORBA_ConstantDef_out ConstantDef_out;
-  typedef CORBA_ConstantDef_var ConstantDef_var;
-
-  typedef CORBA_IDLType IDLType;
-  typedef CORBA_IDLType *IDLType_ptr;
-  typedef CORBA_IDLType_out IDLType_out;
-  typedef CORBA_IDLType_var IDLType_var;
-
-  typedef CORBA_StructDef StructDef;
-  typedef CORBA_StructDef *StructDef_ptr;
-  typedef CORBA_StructDef_out StructDef_out;
-  typedef CORBA_StructDef_var StructDef_var;
-
-  typedef CORBA_UnionDef  UnionDef;
-  typedef CORBA_UnionDef *UnionDef_ptr;
-  typedef CORBA_UnionDef_out UnionDef_out;
-  typedef CORBA_UnionDef_var UnionDef_var;
-
-  typedef CORBA_EnumDef  EnumDef;
-  typedef CORBA_EnumDef *EnumDef_ptr;
-  typedef CORBA_EnumDef_out EnumDef_out;
-  typedef CORBA_EnumDef_var EnumDef_var;
-
-  typedef CORBA_AliasDef AliasDef;
-  typedef CORBA_AliasDef *AliasDef_ptr;
-  typedef CORBA_AliasDef_out AliasDef_out;
-  typedef CORBA_AliasDef_var AliasDef_var;
-
-  typedef CORBA_ExceptionDef ExceptionDef;
-  typedef CORBA_ExceptionDef *ExceptionDef_ptr;
-  typedef CORBA_ExceptionDef_out ExceptionDef_out;
-  typedef CORBA_ExceptionDef_var ExceptionDef_var;
-
-  typedef CORBA_NativeDef NativeDef;
-  typedef CORBA_NativeDef *NativeDef_ptr;
-  typedef CORBA_NativeDef_out NativeDef_out;
-  typedef CORBA_NativeDef_var NativeDef_var;
-
-  typedef CORBA_InterfaceDefSeq InterfaceDefSeq;
-  typedef CORBA_InterfaceDefSeq *InterfaceDefSeq_ptr;
-  typedef CORBA_InterfaceDefSeq_out InterfaceDefSeq_out;
-  typedef CORBA_InterfaceDefSeq_var InterfaceDefSeq_var;
-
-  typedef CORBA_ValueDef ValueDef;
-  typedef CORBA_ValueDef *ValueDef_ptr;
-  typedef CORBA_ValueDef_out ValueDef_out;
-  typedef CORBA_ValueDef_var ValueDef_var;
-
-  typedef CORBA_ValueDefSeq ValueDefSeq;
-  typedef CORBA_ValueDefSeq *ValueDefSeq_ptr;
-  typedef CORBA_ValueDefSeq_out ValueDefSeq_out;
-  typedef CORBA_ValueDefSeq_var ValueDefSeq_var;
-
-  typedef CORBA_ValueBoxDef ValueBoxDef;
-  typedef CORBA_ValueBoxDef *ValueBoxDef_ptr;
-  typedef CORBA_ValueBoxDef_out ValueBoxDef_out;
-  typedef CORBA_ValueBoxDef_var ValueBoxDef_var;
-
-  typedef CORBA_ContainedSeq ContainedSeq;
-  typedef CORBA_ContainedSeq *ContainedSeq_ptr;
-  typedef CORBA_ContainedSeq_out ContainedSeq_out;
-  typedef CORBA_ContainedSeq_var ContainedSeq_var;
-
-  typedef CORBA_StructMember StructMember;
-  typedef CORBA_StructMember *StructMember_ptr;
-  typedef CORBA_StructMember_out StructMember_out;
-  typedef CORBA_StructMember_var StructMember_var;
-
-  typedef CORBA_StructMemberSeq StructMemberSeq;
-  typedef CORBA_StructMemberSeq *StructMemberSeq_ptr;
-  typedef CORBA_StructMemberSeq_out StructMemberSeq_out;
-  typedef CORBA_StructMemberSeq_var StructMemberSeq_var;
-
-  typedef CORBA_Initializer Initializer;
-  typedef CORBA_Initializer *Initializer_ptr;
-  typedef CORBA_Initializer_out Initializer_out;
-  typedef CORBA_Initializer_var Initializer_var;
-
-  typedef CORBA_InitializerSeq InitializerSeq;
-  typedef CORBA_InitializerSeq *InitializerSeq_ptr;
-  typedef CORBA_InitializerSeq_out InitializerSeq_out;
-  typedef CORBA_InitializerSeq_var InitializerSeq_var;
-
-  typedef CORBA_UnionMember UnionMember;
-  typedef CORBA_UnionMember *UnionMember_ptr;
-  typedef CORBA_UnionMember_out UnionMember_out;
-  typedef CORBA_UnionMember_var UnionMember_var;
-
-  typedef CORBA_UnionMemberSeq UnionMemberSeq;
-  typedef CORBA_UnionMemberSeq *UnionMemberSeq_ptr;
-  typedef CORBA_UnionMemberSeq_out UnionMemberSeq_out;
-  typedef CORBA_UnionMemberSeq_var UnionMemberSeq_var;
-
-  typedef CORBA_PrimitiveDef PrimitiveDef;
-  typedef CORBA_PrimitiveDef *PrimitiveDef_ptr;
-  typedef CORBA_PrimitiveDef_out PrimitiveDef_out;
-  typedef CORBA_PrimitiveDef_var PrimitiveDef_var;
-
-  typedef CORBA_StringDef StringDef;
-  typedef CORBA_StringDef *StringDef_ptr;
-  typedef CORBA_StringDef_out StringDef_out;
-  typedef CORBA_StringDef_var StringDef_var;
-
-  typedef CORBA_SequenceDef SequenceDef;
-  typedef CORBA_SequenceDef *SequenceDef_ptr;
-  typedef CORBA_SequenceDef_out SequenceDef_out;
-  typedef CORBA_SequenceDef_var SequenceDef_var;
-
-  typedef CORBA_ArrayDef ArrayDef;
-  typedef CORBA_ArrayDef *ArrayDef_ptr;
-  typedef CORBA_ArrayDef_out ArrayDef_out;
-  typedef CORBA_ArrayDef_var ArrayDef_var;
-
-  typedef CORBA_WstringDef WstringDef;
-  typedef CORBA_WstringDef *WstringDef_ptr;
-  typedef CORBA_WstringDef_out WstringDef_out;
-  typedef CORBA_WstringDef_var WstringDef_var;
-
-  typedef CORBA_FixedDef FixedDef;
-  typedef CORBA_FixedDef *FixedDef_ptr;
-  typedef CORBA_FixedDef_out FixedDef_out;
-  typedef CORBA_FixedDef_var FixedDef_var;
-
-  typedef CORBA_ModuleDescription ModuleDescription;
-  typedef CORBA_ModuleDescription *ModuleDescription_ptr;
-  typedef CORBA_ModuleDescription_out ModuleDescription_out;
-  typedef CORBA_ModuleDescription_var ModuleDescription_var;
-
-  typedef CORBA_ConstantDescription ConstantDescription;
-  typedef CORBA_ConstantDescription *ConstantDescription_ptr;
-  typedef CORBA_ConstantDescription_out ConstantDescription_out;
-  typedef CORBA_ConstantDescription_var ConstantDescription_var;
-
-  typedef CORBA_TypedefDef TypedefDef;
-  typedef CORBA_TypedefDef *TypedefDef_ptr;
-  typedef CORBA_TypedefDef_out TypedefDef_out;
-  typedef CORBA_TypedefDef_var TypedefDef_var;
-
-  typedef CORBA_TypeDescription TypeDescription;
-  typedef CORBA_TypeDescription *TypeDescription_ptr;
-  typedef CORBA_TypeDescription_out TypeDescription_out;
-  typedef CORBA_TypeDescription_var TypeDescription_var;
-
-  typedef CORBA_ExceptionDescription ExceptionDescription;
-  typedef CORBA_ExceptionDescription *ExceptionDescription_ptr;
-  typedef CORBA_ExceptionDescription_out ExceptionDescription_out;
-  typedef CORBA_ExceptionDescription_var ExceptionDescription_var;
-
-  typedef CORBA_AttributeDef AttributeDef;
-  typedef CORBA_AttributeDef *AttributeDef_ptr;
-  typedef CORBA_AttributeDef_out AttributeDef_out;
-  typedef CORBA_AttributeDef_var AttributeDef_var;
-
-  typedef CORBA_AttributeDescription AttributeDescription;
-  typedef CORBA_AttributeDescription *AttributeDescription_ptr;
-  typedef CORBA_AttributeDescription_out AttributeDescription_out;
-  typedef CORBA_AttributeDescription_var AttributeDescription_var;
-
-  typedef CORBA_ParameterDescription ParameterDescription;
-  typedef CORBA_ParameterDescription *ParameterDescription_ptr;
-  typedef CORBA_ParameterDescription_out ParameterDescription_out;
-  typedef CORBA_ParameterDescription_var ParameterDescription_var;
-
-  typedef CORBA_ParDescriptionSeq ParDescriptionSeq;
-  typedef CORBA_ParDescriptionSeq *ParDescriptionSeq_ptr;
-  typedef CORBA_ParDescriptionSeq_out ParDescriptionSeq_out;
-  typedef CORBA_ParDescriptionSeq_var ParDescriptionSeq_var;
-
-  typedef CORBA_ContextIdSeq ContextIdSeq;
-  typedef CORBA_ContextIdSeq *ContextIdSeq_ptr;
-  typedef CORBA_ContextIdSeq_out ContextIdSeq_out;
-  typedef CORBA_ContextIdSeq_var ContextIdSeq_var;
-
-  typedef CORBA_ExceptionDefSeq ExceptionDefSeq;
-  typedef CORBA_ExceptionDefSeq *ExceptionDefSeq_ptr;
-  typedef CORBA_ExceptionDefSeq_out ExceptionDefSeq_out;
-  typedef CORBA_ExceptionDefSeq_var ExceptionDefSeq_var;
-
-  typedef CORBA_ExcDescriptionSeq ExcDescriptionSeq;
-  typedef CORBA_ExcDescriptionSeq *ExcDescriptionSeq_ptr;
-  typedef CORBA_ExcDescriptionSeq_out ExcDescriptionSeq_out;
-  typedef CORBA_ExcDescriptionSeq_var ExcDescriptionSeq_var;
-
-  typedef CORBA_OperationDef OperationDef;
-  typedef CORBA_OperationDef *OperationDef_ptr;
-  typedef CORBA_OperationDef_out OperationDef_out;
-  typedef CORBA_OperationDef_var OperationDef_var;
-
-  typedef CORBA_OperationDescription OperationDescription;
-  typedef CORBA_OperationDescription *OperationDescription_ptr;
-  typedef CORBA_OperationDescription_out OperationDescription_out;
-  typedef CORBA_OperationDescription_var OperationDescription_var;
-
-  typedef CORBA_RepositoryIdSeq RepositoryIdSeq;
-  typedef CORBA_RepositoryIdSeq *RepositoryIdSeq_ptr;
-  typedef CORBA_RepositoryIdSeq_out RepositoryIdSeq_out;
-  typedef CORBA_RepositoryIdSeq_var RepositoryIdSeq_var;
-
-  typedef CORBA_OpDescriptionSeq OpDescriptionSeq;
-  typedef CORBA_OpDescriptionSeq *OpDescriptionSeq_ptr;
-  typedef CORBA_OpDescriptionSeq_out OpDescriptionSeq_out;
-  typedef CORBA_OpDescriptionSeq_var OpDescriptionSeq_var;
-
-  typedef CORBA_AttrDescriptionSeq AttrDescriptionSeq;
-  typedef CORBA_AttrDescriptionSeq *AttrDescriptionSeq_ptr;
-  typedef CORBA_AttrDescriptionSeq_out AttrDescriptionSeq_out;
-  typedef CORBA_AttrDescriptionSeq_var AttrDescriptionSeq_var;
-
-  typedef CORBA_InterfaceDescription InterfaceDescription;
-  typedef CORBA_InterfaceDescription *InterfaceDescription_ptr;
-  typedef CORBA_InterfaceDescription_out InterfaceDescription_out;
-  typedef CORBA_InterfaceDescription_var InterfaceDescription_var;
-
-  typedef CORBA_ValueMember ValueMember;
-  typedef CORBA_ValueMember *ValueMember_ptr;
-  typedef CORBA_ValueMember_out ValueMember_out;
-  typedef CORBA_ValueMember_var ValueMember_var;
-
-  typedef CORBA_ValueMemberSeq ValueMemberSeq;
-  typedef CORBA_ValueMemberSeq *ValueMemberSeq_ptr;
-  typedef CORBA_ValueMemberSeq_out ValueMemberSeq_out;
-  typedef CORBA_ValueMemberSeq_var ValueMemberSeq_var;
-
-  typedef CORBA_ValueMemberDef ValueMemberDef;
-  typedef CORBA_ValueMemberDef *ValueMemberDef_ptr;
-  typedef CORBA_ValueMemberDef_out ValueMemberDef_out;
-  typedef CORBA_ValueMemberDef_var ValueMemberDef_var;
-
-  typedef CORBA_ValueDescription ValueDescription;
-  typedef CORBA_ValueDescription *ValueDescription_ptr;
-  typedef CORBA_ValueDescription_out ValueDescription_out;
-  typedef CORBA_ValueDescription_var ValueDescription_var;
-
-  typedef CORBA_EnumMemberSeq EnumMemberSeq;
-  typedef CORBA_EnumMemberSeq *EnumMemberSeq_ptr;
-  typedef CORBA_EnumMemberSeq_out EnumMemberSeq_out;
-  typedef CORBA_EnumMemberSeq_var EnumMemberSeq_var;
-#endif /* TAO_HAS_INTERFACE_REPOSITORY */
-
 #ifdef TAO_HAS_VALUETYPE
   typedef CORBA_ValueBase ValueBase;
   typedef CORBA_ValueFactoryBase ValueFactoryBase;
@@ -1183,11 +646,6 @@ TAO_NAMESPACE CORBA
     tk_longdouble         = 25,
     tk_wchar              = 26,
     tk_wstring            = 27,
-    tk_fixed              = 28,
-    tk_value              = 29,
-    tk_value_box          = 30,
-    tk_native             = 31,
-    tk_abstract_interface = 32,
 
     // This symbol is not defined by CORBA 2.0.  It's used to speed up
     // dispatch based on TCKind values, and lets many important ones
@@ -1257,7 +715,15 @@ TAO_NAMESPACE CORBA
   typedef CORBA::String_out ORBid_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ORBid;
 
+  typedef char *Identifier;
+  typedef CORBA::String_var Identifier_var;
+  typedef CORBA::String_out Identifier_out;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
 
+  typedef char *RepositoryId;
+  typedef CORBA::String_var RepositoryId_var;
+  typedef CORBA::String_out RepositoryId_out;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryId;
 
   typedef CORBA::Short PolicyErrorCode;
   typedef CORBA::Short_out PolicyErrorCode_out;
@@ -1419,195 +885,8 @@ TAO_NAMESPACE CORBA
   typedef CORBA_DIIPollable_ptr DIIPollable_ptr;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DIIPollable;
 
-    // ****************************************************************
-  typedef char *RepositoryId;
-  typedef CORBA::String_var RepositoryId_var;
-  typedef CORBA::String_out RepositoryId_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryId;
-
-  typedef char *Identifier;
-  typedef CORBA::String_var Identifier_var;
-  typedef CORBA::String_out Identifier_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
-#ifdef TAO_HAS_INTERFACE_REPOSITORY
-  // ------------------------------Interface REPOS Bala
-
-  // =================== Interface Repository =====================
-  typedef char * ScopedName;
-  typedef CORBA_String_var ScopedName_var;
-  typedef CORBA_String_out ScopedName_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ScopedName;
-
-
-
-
-
-  enum DefinitionKind
-  {
-    dk_none,
-    dk_all,
-    dk_Attribute,
-    dk_Constant,
-    dk_Exception,
-    dk_Interface,
-    dk_Module,
-    dk_Operation,
-    dk_Typedef,
-    dk_Alias,
-    dk_Struct,
-    dk_Union,
-    dk_Enum,
-    dk_Primitive,
-    dk_String,
-    dk_Sequence,
-    dk_Array,
-    dk_Repository,
-    dk_Wstring,
-    dk_Fixed,
-    dk_Value,
-    dk_ValueBox,
-    dk_ValueMember,
-    dk_Native
-  };
-
-  typedef DefinitionKind &DefinitionKind_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DefinitionKind;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IRObject;
-
-  typedef char * VersionSpec;
-  typedef CORBA_String_var VersionSpec_var;
-  typedef CORBA_String_out VersionSpec_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_VersionSpec;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Container;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Contained;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDefSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContainedSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructMember;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructMemberSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Initializer;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InitializerSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionMember;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionMemberSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnumMemberSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IDLType;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Repository;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ModuleDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ModuleDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstantDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstantDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypedefDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypeDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnumDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AliasDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StringDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WstringDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FixedDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SequenceDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ArrayDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParDescriptionSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextIdSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDefSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OpDescriptionSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttrDescriptionSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMember;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMemberSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMemberDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueBoxDef;
-
-  enum PrimitiveKind
-  {
-    pk_null,
-    pk_void,
-    pk_short,
-    pk_long,
-    pk_ushort,
-    pk_ulong,
-    pk_float,
-    pk_double,
-    pk_boolean,
-    pk_char,
-    pk_octet,
-    pk_any,
-    pk_TypeCode,
-    pk_Principal,
-    pk_string,
-    pk_objref,
-    pk_longlong,
-    pk_ulonglong,
-    pk_longdouble,
-    pk_wchar,
-    pk_wstring
-  };
-   typedef PrimitiveKind &PrimitiveKind_out;
-   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveKind;
-
-   enum AttributeMode
-  {
-    ATTR_NORMAL,
-    ATTR_READONLY
-  };
-  typedef AttributeMode &AttributeMode_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeMode;
-
-  enum OperationMode
-  {
-    OP_NORMAL,
-    OP_ONEWAY
-  };
-  typedef OperationMode &OperationMode_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationMode;
-
-  enum ParameterMode
-  {
-    PARAM_IN,
-    PARAM_OUT,
-    PARAM_INOUT
-  };
-  typedef ParameterMode &ParameterMode_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterMode;
-
-  typedef char * ContextIdentifier;
-  typedef CORBA::String_var ContextIdentifier_var;
-  typedef CORBA::String_out ContextIdentifier_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextIdentifier;
-
-  typedef CORBA::Short Visibility;
-  typedef CORBA::Short_out Visibility_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Visibility;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short PRIVATE_MEMBER;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short PUBLIC_MEMBER;
-
-  typedef CORBA::Short ValueModifier;
-  typedef CORBA::Short_out ValueModifier_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueModifier;
+  // ****************************************************************
 
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_NONE;
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_CUSTOM;
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_ABSTRACT;
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_TRUNCATABLE;
-  // ================== Interface Repository =====================
-#endif /*TAO_HAS_INTERFACE_REPOSITORY */
   // There could be a single version of these methods, but g++ 2.7.2
   // gets horribly confused if we used CORBA::default_environment() at
   // this point.
@@ -1721,7 +1000,6 @@ TAO_NAMESPACE CORBA
 #define TAO_EFAULT_MINOR_CODE       0xEU
 #define TAO_EBUSY_MINOR_CODE        0xFU
 #define TAO_EEXIST_MINOR_CODE       0x10U
-#define TAO_EINVAL_MINOR_CODE       0x11U
 // *Don't* use TAO_<errno>_MINOR_CODE greater than 0x7FU!
 
 // These numbers are assigned by the OpenGroup, a database is
diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h
index a090e159fe6..9c4f17217e8 100644
--- a/TAO/tao/debug.h
+++ b/TAO/tao/debug.h
@@ -23,10 +23,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 // These are global to simplify is use by other code, very much in
 // particular by getopt and related argument-parsing code
 //
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
index b3cb907dfc1..0ba247223df 100644
--- a/TAO/tao/deep_free.cpp
+++ b/TAO/tao/deep_free.cpp
@@ -181,18 +181,10 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
       ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP);
     }
 
-  // In case this hasn't been done yet.
-  source = ptr_align_binary (source, 
-                             tc->alignment (ACE_TRY_ENV));
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
   CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
   CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment, align_offset;
-
-  void *start_addr = (void *)source;
+  CORBA::Long size;
 
-  // Number of fields in the struct.
   // compute the number of fields in the struct
   int member_count = tc->member_count (ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
@@ -208,20 +200,6 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
       size = param->size (ACE_TRY_ENV);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
-      alignment = param->alignment (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      align_offset =
-        (ptr_arith_t) ptr_align_binary (source, alignment)
-        - (ptr_arith_t) source
-        + (ptr_arith_t) ptr_align_binary (start_addr, alignment)
-        - (ptr_arith_t) start_addr;
-      // if both the start_addr and data are not aligned as per
-      // the alignment, we do not add the offset
-      source = (const void *) ((ptr_arith_t) source +
-                               ((align_offset == alignment) ?
-                               0 : align_offset));
-
       // Since every exception-throwing function is followed by a break, we'll just
       // check for exception after the switch.
       switch (param->kind_)
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index d9e3afd421a..141e28e7d82 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -12,8 +12,7 @@
 ACE_RCSID(tao, default_client, "$Id$")
 
 TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
-  : profile_lock_type_ (TAO_THREAD_LOCK),
-    cached_connector_lock_type_ (TAO_THREAD_LOCK)
+  : profile_lock_type_ (TAO_THREAD_LOCK)
 {
   // Use single thread client connection handler
 #if defined (TAO_USE_ST_CLIENT_CONNECTION_HANDLER)
@@ -129,23 +128,6 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv)
                 this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS;
             }
         }
-
-      else if (ACE_OS::strcasecmp (argv[curarg],
-                                   "-ORBConnectorLock") == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            {
-              char *name = argv[curarg];
-              
-              if (ACE_OS::strcasecmp (name,
-                                      "thread") == 0)
-                this->cached_connector_lock_type_ = TAO_THREAD_LOCK;
-              else if (ACE_OS::strcasecmp (name,
-                                           "null") == 0)
-                this->cached_connector_lock_type_ = TAO_NULL_LOCK;
-            }
-        }
     }
   return 0;
 }
@@ -175,17 +157,17 @@ TAO_Default_Client_Strategy_Factory::create_profile_lock (void)
 
 // Create the correct client transport muxing strategy.
 TAO_Transport_Mux_Strategy *
-TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (TAO_ORB_Core *orb_core)
+TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (TAO_Transport *transport)
 {
   TAO_Transport_Mux_Strategy *tms = 0;
 
   if (this->transport_mux_strategy_ == TAO_MUXED_TMS)
     ACE_NEW_RETURN (tms,
-                    TAO_Muxed_TMS (orb_core),
+                    TAO_Muxed_TMS (transport),
                     0);
   else
     ACE_NEW_RETURN (tms,
-                    TAO_Exclusive_TMS (orb_core),
+                    TAO_Exclusive_TMS (transport),
                     0);
 
   return tms;
@@ -205,30 +187,22 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transp
                     TAO_Wait_On_Reactor (transport),
                     0);
   else
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_On_Leader_Follower (transport),
-                    0);
-
+    {
+      // = Leader follower model.
+      
+      if (this->transport_mux_strategy_ == TAO_EXCLUSIVE_TMS)
+        ACE_NEW_RETURN (ws,
+                        TAO_Exclusive_Wait_On_Leader_Follower (transport),
+                        0);
+      else
+        ACE_NEW_RETURN (ws,
+                        TAO_Muxed_Wait_On_Leader_Follower (transport),
+                        0);
+    }
+      
   return ws;
 }
 
-ACE_Lock *
-TAO_Default_Client_Strategy_Factory::create_cached_connector_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  if (this->cached_connector_lock_type_ == TAO_NULL_LOCK)
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
-                    0);
-  else
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_MUTEX>,
-                    0);
-
-  return the_lock;
-}
-
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory,
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 17955110798..2322315c605 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -18,11 +18,6 @@
 #define TAO_DEFAULT_CLIENT_H
 
 #include "tao/Client_Strategy_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "ace/Service_Config.h"
 
 class TAO_Export TAO_Default_Client_Strategy_Factory : public TAO_Client_Strategy_Factory
@@ -47,12 +42,16 @@ public:
   int parse_args (int argc, char* argv[]);
   // Parse svc.conf arguments
 
-  // = Check Client_Strategy_Factory.h for the documentation of the
-  //   following methods.
   ACE_Lock* create_profile_lock (void);
-  TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_ORB_Core *orb_core);
+  // create the lock for the forwarding Profile used by
+  // the TAO_GIOP_Invocation::location_forward and the
+  // TAO_GIOP_Invocation::start
+
+  TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport);
+  // Create the correct client request muxing strategy.
+
   TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
-  virtual ACE_Lock *create_cached_connector_lock (void);
+  // Create the correct client wait-for-reply strategy.
 
 private:
   enum Lock_Type
@@ -82,9 +81,6 @@ private:
 
   Wait_Strategy wait_strategy_;
   // The wait-for-reply strategy.
-
-  Lock_Type cached_connector_lock_type_;
-  // Type of lock used by the cached connector.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index b1f9828abff..433ac742f64 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -29,9 +29,7 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
     use_locked_data_blocks_ (1),
     reactor_type_ (TAO_REACTOR_SELECT_MT),
     cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK),
-    protocol_factories_ (),
-    connection_caching_type_ (TAO_CONNECTION_CACHING_STRATEGY),
-    purge_percentage_ (TAO_PURGE_PERCENT)
+    protocol_factories_ ()
 {
 }
 
@@ -181,45 +179,6 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
           }
       }
 
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBConnectionCachingStrategy") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "lru") == 0)
-              this->connection_caching_type_ = TAO_Resource_Factory::LRU;
-            else if (ACE_OS::strcasecmp (name,
-                                         "lfu") == 0)
-              this->connection_caching_type_ = TAO_Resource_Factory::LFU;
-            else if (ACE_OS::strcasecmp (name,
-                                         "fifo") == 0)
-              this->connection_caching_type_ = TAO_Resource_Factory::FIFO;
-            else if (ACE_OS::strcasecmp (name,
-                                         "null") == 0)
-              this->connection_caching_type_ = TAO_Resource_Factory::NOOP;
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO_Default_Factory - unknown argument"
-                          " <%s> for -ORBConnectionCachingStrategy\n", name));
-          }
-      }
-
-   else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBPurgePercentage") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-            this->purge_percentage_ = ACE_OS::atoi (argv[curarg]);
-        else
-           ACE_DEBUG ((LM_DEBUG,
-                       "TAO_Default_Factory - unknown argument"
-                       "for -ORBPurgePercentage\n"));
-      }
-
   return 0;
 }
 
@@ -495,18 +454,6 @@ TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
   return allocator;
 }
 
-TAO_Resource_Factory::Caching_Strategy
-TAO_Default_Resource_Factory::connection_caching_strategy_type (void) const
-{
-  return this->connection_caching_type_;
-}
-
-double
-TAO_Default_Resource_Factory::purge_percentage (void) const
-{
-  return this->purge_percentage_;
-}
-
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory,
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 19e94eb1075..551311386e1 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -91,9 +91,6 @@ public:
   virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
   virtual int init_protocol_factories (void);
 
-  virtual TAO_Resource_Factory::Caching_Strategy connection_caching_strategy_type (void) const;
-  virtual double purge_percentage (void) const;
-
 protected:
   virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
   // Obtain the reactor implementation
@@ -114,14 +111,6 @@ protected:
 
   TAO_ProtocolFactorySet protocol_factories_;
   // list of loaded protocol factories.
-
-  TAO_Resource_Factory::Caching_Strategy connection_caching_type_;
-  // Specifies the typeof caching strategy we should use for
-  // connection management.
-
-  double purge_percentage_;
-  // Specifies the percentage of entries which should get purged on
-  // demand.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index 227199232af..c68d6811f85 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -13,7 +13,8 @@ TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
   : activate_server_connections_ (0),
     thread_flags_ (THR_BOUND),
     poa_lock_type_ (TAO_THREAD_LOCK),
-    event_loop_lock_type_ (TAO_NULL_LOCK)
+    event_loop_lock_type_ (TAO_NULL_LOCK),
+    cached_connector_lock_type_ (TAO_THREAD_LOCK)
 {
 }
 
@@ -70,6 +71,23 @@ TAO_Default_Server_Strategy_Factory::create_event_loop_lock (void)
   return the_lock;
 }
 
+ACE_Lock *
+TAO_Default_Server_Strategy_Factory::create_cached_connector_lock (void)
+{
+  ACE_Lock *the_lock = 0;
+
+  if (this->cached_connector_lock_type_ == TAO_NULL_LOCK)
+    ACE_NEW_RETURN (the_lock,
+                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
+                    0);
+  else
+    ACE_NEW_RETURN (the_lock,
+                    ACE_Lock_Adapter<ACE_SYNCH_MUTEX>,
+                    0);
+
+  return the_lock;
+}
+
 // Evil macros b/c I'm lazy!
 #define TAO_BEGINCHECK  if (0)
 #define TAO_CHECKANDSET(sym) \
@@ -336,16 +354,22 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
               this->event_loop_lock_type_ = TAO_NULL_LOCK;
           }
       }
-
     else if (ACE_OS::strcasecmp (argv[curarg],
                                  "-ORBConnectorLock") == 0)
       {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) WARNING: the "
-                    "-ORBConnectorLock option is in the client "
-                    "strategy factory now\n"));
-      }
+        curarg++;
+        if (curarg < argc)
+          {
+            char *name = argv[curarg];
 
+            if (ACE_OS::strcasecmp (name,
+                                    "thread") == 0)
+              this->cached_connector_lock_type_ = TAO_THREAD_LOCK;
+            else if (ACE_OS::strcasecmp (name,
+                                         "null") == 0)
+              this->cached_connector_lock_type_ = TAO_NULL_LOCK;
+          }
+      }
     else if (ACE_OS::strcasecmp (argv[curarg],
                                  "-ORBThreadFlags") == 0)
       {
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index e0448c30e96..84e6f39b74d 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -18,11 +18,6 @@
 #define TAO_DEFAULT_SERVER_FACTORY_H
 
 #include "tao/Server_Strategy_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "ace/Service_Config.h"
 
 class TAO_Export TAO_Default_Server_Strategy_Factory : public TAO_Server_Strategy_Factory
@@ -57,6 +52,10 @@ public:
   // controlling the event loop (termination). Otherwise a
   // Recursive_Thread_Mutex or Thread_Mutex may be required.
 
+  virtual ACE_Lock *create_cached_connector_lock (void);
+  // Created the cached connector lock based on the command line
+  // options.
+
   int parse_args (int argc, char *argv[]);
   // Parse the arguments, check the documentation in
   // $TAO_ROOT/docs/Options.html for details
@@ -82,6 +81,9 @@ protected:
 
   Lock_Type event_loop_lock_type_;
   // The type of lock to be returned by <create_event_loop_lock()>.
+
+  Lock_Type cached_connector_lock_type_;
+  // Type of lock used by the cached connector.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/factories.h b/TAO/tao/factories.h
index 5e9d5a0001f..496dae62ed2 100644
--- a/TAO/tao/factories.h
+++ b/TAO/tao/factories.h
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    TAO
-//
+// 
 // = FILENAME
 //     factories.h
 //
@@ -15,16 +15,11 @@
 //     $Id$
 // ============================================================================
 
-#ifndef TAO_FACTORIES_H
+#if !defined (TAO_FACTORIES_H)
 #  define TAO_FACTORIES_H
 
 #if 0
 #  include "ace/SOCK_Acceptor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #  include "ace/SOCK_Connector.h"
 #  include "ace/Strategies_T.h"
 #  include "ace/Connector.h"
@@ -64,25 +59,25 @@ class TAO_Client_Factory
   //    strategies used on the client side.
 {
 public:
-  typedef ACE_Strategy_Connector<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR>
+  typedef ACE_Strategy_Connector<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR> 
           CONNECTOR;
-  typedef ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>
+  typedef ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler> 
           NULL_CREATION_STRATEGY;
-  typedef ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler,
+  typedef ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, 
                                       ACE_SOCK_CONNECTOR,
-                                      ACE_SYNCH_RW_MUTEX>
+				      ACE_SYNCH_RW_MUTEX>
           CACHED_CONNECT_STRATEGY;
 
 #if defined (TAO_HAS_CLIENT_CONCURRENCY)
   CONCURRENCY_STRATEGY *concurrency_strategy (void);
 #endif
-
+  
   CONNECTOR *connector (void);
   // Return a pointer to a connector using appropriate strategies.
 
   TAO_Client_Factory (void);
   ~TAO_Client_Factory (void);
-
+  
 private:
 #if defined (TAO_HAS_CLIENT_CONCURRENCY)
   CONCURRENCY_STRATEGY *concurrency_strategy_;
@@ -121,7 +116,7 @@ public:
 
   TAO_Server_Factory (void);
   // constructor
-
+  
 private:
   // = COMMON
   ACE_Thread_Strategy<TAO_OA_Connection_Handler> threaded_strategy_;
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 985f8937b42..1412a9f790a 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -37,6 +37,23 @@
 #define TAO_NULL_LOCK_REACTOR ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
 #endif /* TAO_NULL_LOCK_REACTOR */
 
+// Users should override this stuff if they don't want to use the
+// default ACE Socket wrappers.  This makes it possible to change
+// TAO's transport mechanism wholesale by making a few minor changes
+// to the ACE config.h file.
+#if !defined (TAO_SOCK_STREAM)
+#define TAO_SOCK_STREAM ACE_SOCK_STREAM
+#define TAO_SOCK_Stream ACE_SOCK_Stream
+#endif /* TAO_SOCK_STREAM */
+
+#if !defined (TAO_SOCK_ACCEPTOR)
+#define TAO_SOCK_ACCEPTOR ACE_SOCK_ACCEPTOR
+#endif /* TAO_SOCK_ACCEPTOR */
+
+#if !defined (TAO_SOCK_CONNECTOR)
+#define TAO_SOCK_CONNECTOR ACE_SOCK_CONNECTOR
+#endif /* TAO_SOCK_CONNECTOR */
+
 //#define POA_NO_TIMESTAMP
 //
 // Define this if you don't want POA timestamps in the IOR.  Remember,
@@ -109,7 +126,7 @@
 #define TAO_DEFAULT_TRADING_SERVER_REPLY_PORT 10017
 #endif /* TAO_DEFAULT_TRADING_SERVER_REPLY_PORT */
 
-// The default UDP multicast port number for locating the TAO
+// The default UDP multicast port number for locating the TAO 
 // Implementation Repository Service.
 #if !defined (TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT)
 #define TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT 10018
@@ -148,17 +165,6 @@
 # define TAO_MAXIMUM_NATIVE_TYPE_SIZE 128
 #endif /* TAO_MAXIMUM_NATIVE_TYPE_SIZE */
 
-// This deals with the strategies for connection caching. By default
-// it is the Least Recently Used (LRU) with the default purging
-// percentage of 20%.
-#if !defined (TAO_CONNECTION_CACHING_STRATEGY)
-# define TAO_CONNECTION_CACHING_STRATEGY TAO_Resource_Factory::LRU
-#endif /* TAO_CONNECTION_CACHING_STRATEGY */
-
-#if !defined (TAO_PURGE_PERCENT)
-# define TAO_PURGE_PERCENT 20
-#endif /* TAO_PURGE_PERCENT */
-
 // This deals with platforms that support namespaces vs platforms that
 // don't.  @@ MSVC's namespace implementation is somehow broken.
 // The following macros are required to deal with the most bizarre and insane
@@ -282,8 +288,8 @@
 // responsible for instantiating the templates.
 //
 #if !defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && \
-    (defined (ACE_HAS_TEMPLATE_SPECIALIZATION) || \
-     (defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) && defined (_UNICOS)))
+    ( defined (ACE_HAS_TEMPLATE_SPECIALIZATION) || \
+    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) )
 #define TAO_USE_SEQUENCE_TEMPLATES
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
@@ -300,20 +306,6 @@
 #define TAO_OBJID_POLICYCURRENT    "PolicyCurrent"
 #define TAO_OBJID_IORMANIPULATION  "IORManipulation"
 
-// Comma separated list of the above ObjectIDs.
-// DO NOT include unimplemented services!
-// The CORBA_ORB::list_initial_services () method iterates through
-// this list to determine which initial services are available.
-#define TAO_LIST_OF_INITIAL_SERVICES \
-        TAO_OBJID_NAMESERVICE, \
-        TAO_OBJID_TRADINGSERVICE, \
-        TAO_OBJID_IMPLREPOSERVICE, \
-        TAO_OBJID_ROOTPOA, \
-        TAO_OBJID_POACURRENT, \
-        TAO_OBJID_POLICYMANAGER, \
-        TAO_OBJID_POLICYCURRENT, \
-        TAO_OBJID_IORMANIPULATION
-
 // TAO Naming Service.
 
 // Poa id of the root Naming Context in a Naming server.
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 1ce3bd9f497..6c231fec8be 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -23,7 +23,6 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void)
     implrepo_service_port_ (0),
     init_ref_ (),
     ior_lookup_table_ (0),
-    default_init_ref_ (),
     sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
     sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
     cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF),
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index e4afe07d0ad..04c3c9a69cb 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -19,10 +19,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 // Forward decls.
 
 class TAO_Active_Object_Map_Impl;
@@ -43,7 +39,7 @@ typedef ACE_Unbounded_Set_Iterator<ACE_CString> TAO_EndpointSetIterator;
 // @@ Using an ACE_Unbounded_Queue to contain the preconnects may not
 //    be the best container to use.  However, it will only be used
 //    during client side initialization.  Also, a template
-//    instantiation of ACE_Unbounded_Queue<ACE_CString> already exists
+//    instantiation of ACE_Unbounded_Queue<ACE_CString> already exists 
 //    in ACE so we do not have to worry about increasing TAO's
 //    footprint by using this container.
 typedef ACE_Unbounded_Queue<ACE_CString> TAO_PreconnectSet;
@@ -155,6 +151,21 @@ public:
   void sock_sndbuf_size (int);
   // Set/Get the size to be used for a socket's send buffer.
 
+  int cdr_default_size (void) const;
+  void cdr_default_size (int);
+  // If the user does not specify the size of a CDR stream this is the
+  // size of its internal buffer.
+
+  int cdr_max_exp_size (void) const;
+  void cdr_max_exp_size (int);
+  // CDR streams internal buffers grow exponentially until they reach
+  // this size.
+
+  int cdr_linear_chunk (void) const;
+  void cdr_linear_chunk (int);
+  // After reaching their maximum exponential size limit CDR streams
+  // grow linearly in chunks of this size.
+
   int cdr_memcpy_tradeoff (void) const;
   void cdr_memcpy_tradeoff (int);
   // Octet sequences are marshalled without doing any copies, we
diff --git a/TAO/tao/poa_macros.h b/TAO/tao/poa_macros.h
index 5cd62984c98..b08756fd619 100644
--- a/TAO/tao/poa_macros.h
+++ b/TAO/tao/poa_macros.h
@@ -5,10 +5,6 @@
 
 #include "tao/try_macros.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 // Convenient macro for testing for deadlock, as well as for detecting
 // when mutexes fail.
 #define TAO_POA_GUARD(MUTEX,OBJ,LOCK) \
diff --git a/TAO/tao/singletons.h b/TAO/tao/singletons.h
index 8a3c2c6815e..dd823e6f868 100644
--- a/TAO/tao/singletons.h
+++ b/TAO/tao/singletons.h
@@ -24,11 +24,6 @@
 #define TAO_SINGLETONS_H
 
 #include "ace/Singleton.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "ace/Synch.h"
 #include "tao/Marshal.h"
 
diff --git a/TAO/tao/tao.rc b/TAO/tao/tao.rc
deleted file mode 100644
index 998e9157f92..00000000000
--- a/TAO/tao/tao.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "TAO\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAODLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/try_macros.h b/TAO/tao/try_macros.h
index ea1259d90af..0d32e9d820c 100644
--- a/TAO/tao/try_macros.h
+++ b/TAO/tao/try_macros.h
@@ -10,7 +10,10 @@
 //    try_macros.h
 //
 // = DESCRIPTION
-//     This file has been depricated.
+//   Writing code that is portable between platforms with a without
+//   native C++ exceptions is hard.  The following macros offer some
+//   help on this task, mostly oriented to making the ORB code and the
+//   IDL generated code portable.
 //
 // = AUTHOR
 //     Copyright by Douglas C. Schmidt.
@@ -19,22 +22,12 @@
 //   *                                                               *
 //   *        NOTICE !!!    NOTICE !!!   NOTICE !!!   NOTICE !!!     *
 //   *                                                               *
+//   *                                                               *
 //   *        The macros in this file is deprecated.                 *
 //   *                                                               *
 //   *        Please check out $ACE_ROOT/ace/CORBA_macros.h          *
-//   *        and $ACE_ROOT/docs/exceptions.html for a new           *
-//   *        set of helper macros that replace this file.           *
-//   *                                                               *
-//   *        We strongely encourage you to stop using the           *
-//   *        macros in this file.  You should try to convert        *
-//   *        your program to use the new ACE try macros             *
-//   *        which are simpler to use and easier to remember.       *
-//   *        However, if you still insist on using these old        *
-//   *        macros, you can do this by uncomment the "#define      *
-//   *        TAO_USES_DEPRECATED_TAO_TRY_MACROS" below.             *
-//   *                                                               *
-//   *        Again, we no longer maintain this file and it will     *
-//   *        eventually go away.                                    *
+//   *        for a new set of helper macros that replace            *
+//   *        this file.                                             *
 //   *                                                               *
 //   *****************************************************************
 //
@@ -42,20 +35,22 @@
 
 #ifndef TAO_TRY_MACROS_H
 #define TAO_TRY_MACROS_H
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-//   *****************************************************************
-//   *                                                               *
-//   *      Uncomment the following line to use TAO try macros.      *
-//   *                                                               *
-//   *****************************************************************
-//#define TAO_USES_DEPRECATED_TAO_TRY_MACROS
 
 #include "tao/orbconf.h"
 #include "ace/CORBA_macros.h"
 
+#if defined (TAO_HAS_EXCEPTIONS)
+#define TAO_RAISE(EXCEPTION) throw EXCEPTION
+#else
+#define TAO_RAISE(EXCEPTION)
+#endif /* TAO_HAS_EXCEPTIONS */
+
+// This is used in the implementation of the _raise methods
+
+// Remove the following line when we're not using TAO try macros any
+// more.
+//#define TAO_USES_DEPRECATED_TAO_TRY_MACROS
+
 #if defined (TAO_USES_DEPRECATED_TAO_TRY_MACROS)
 
 // Define a local enviroment variable...
diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h
index 21e8f7d577d..aa053598ef4 100644
--- a/TAO/tao/varout.h
+++ b/TAO/tao/varout.h
@@ -22,10 +22,6 @@
 
 #include "tao/Object.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 template<class T, class T_var> class TAO_Object_Manager;
 
 template <class T, class T_var>
@@ -53,7 +49,7 @@ public:
 
   TAO_Object_Field_T (const T_var &);
   // constructor from a var
-
+ 
   TAO_Object_Field_T (const TAO_Object_Field_T<T,T_var> &);
   // copy constructor
 
diff --git a/TAO/tests/AMI/Makefile b/TAO/tests/AMI/Makefile
index b67ec0253b6..86ac3a83c4b 100644
--- a/TAO/tests/AMI/Makefile
+++ b/TAO/tests/AMI/Makefile
@@ -24,6 +24,10 @@ SIMPLE_CLIENT_OBJS = simple-client.o $(addsuffix .o, $(IDLFILES))
 ORB_CREATION_OBJS = orb_creation.o $(addsuffix .o, $(IDLFILES))
 SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
 
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/tests/AMI/README b/TAO/tests/AMI/README
index 4c1d0b89859..15a83385c47 100644
--- a/TAO/tests/AMI/README
+++ b/TAO/tests/AMI/README
@@ -2,13 +2,33 @@
 
 Description:
 
-	This is a simple test for AMI callback model. Right now the
-IDL compiler does not generate all the code. Therefore, you need to
-copy test-handC.cpp onto testC.cpp.             
-
-        This is still in a development phase. It is not at all
-complete. 
+This is a simple test for AMI callback model.
 
 $ server -o test.ior
 $ client -k file://test.ior -n 4 -i 1000
-$ simple_client -k file://test_ior
+
+simple-client:
+=============
+
+$ simple_client -k file://test_ior [-i <niterations] [-x] [-d] \
+     -ORBSvcConf {simple-client-muxed.conf,
+                  simple-client-exclusive.conf}
+
+-d Enable debug messages.
+-i Number of iterations.
+-k IOR.
+-x Call shutdown method.
+
+Issues <i> number of asynchronous requests. Then it issues a
+synchronous request, which collects the replies.
+
+If you choose Muxed Transport configuration, then the synchronous
+request  will collect all the asynchronous replies also, since the
+replies will arrive in order. 
+
+But in the Exclusive Transport, the synchronous request might now
+collect all the AMI replies. It might return as soon as its reply
+arrives. 
+
+
+
diff --git a/TAO/tests/AMI/client.conf b/TAO/tests/AMI/client.conf
index 5276fe68900..c0794261618 100644
--- a/TAO/tests/AMI/client.conf
+++ b/TAO/tests/AMI/client.conf
@@ -1,2 +1,2 @@
 
-static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler RW"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBclientconnectionhandler ST"
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index 31527aa0e42..75f324dcf67 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -9,16 +9,21 @@ ACE_RCSID(MT_Client, client, "$Id$")
 const char *ior = "file://test.ior";
 int nthreads = 5;
 int niterations = 5;
+int debug = 0;
+int number_of_replies = 0;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:");
+  ACE_Get_Opt get_opts (argc, argv, "dk:n:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
+      case 'd':
+        debug = 1;
+        break;
       case 'k':
         ior = get_opts.optarg;
         break;
@@ -32,6 +37,7 @@ parse_args (int argc, char *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
+                           "-d "
                            "-k <ior> "
                            "-n <nthreads> "
                            "-i <niterations> "
@@ -58,22 +64,43 @@ public:
   virtual int svc (void);
   // The thread entry point.
 
-private:
+  // private:
   Simple_Server_var server_;
   // The server.
 
   int niterations_;
   // The number of iterations on each client thread.
+
+  AMI_Simple_Server_Handler_var the_handler_;
+  // Var for ReplyHandler object.
 };
 
 class Handler : public POA_AMI_Simple_Server_Handler
 {
 public:
   Handler (void) {};
+
+  void get_put_number (CORBA::Long result,
+                       CORBA::Long out_l,
+                       CORBA::Environment&)
+    {
+      if (debug)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P | %t) : Callback method called: result <%d>, out_arg <%d>\n",
+                      result, 
+                      out_l));
+        }
+
+      number_of_replies--;
+    };
  
   ~Handler (void) {};
 };
 
+// ReplyHandler.
+Handler handler;
+
 int
 main (int argc, char *argv[])
 {
@@ -129,9 +156,36 @@ main (int argc, char *argv[])
                            "Cannot activate client threads\n"),
                           1);
 
+      // Main thread collects replies. It needs to collect 
+      // <nthreads*niterations> replies.
+      number_of_replies = nthreads * niterations;
+
+      if (debug)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P|%t) : Entering perform_work loop to receive <%d> replies\n",
+                      number_of_replies));
+        }
+      
+      // ORB loop.
+      while (orb->work_pending () && number_of_replies > 0)
+        {
+          orb->perform_work ();
+        }
+
+      if (debug)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P|%t) : Exited perform_work loop Received <%d> replies\n",
+                      (nthreads*niterations) - number_of_replies));
+        }
+
+
       client.thr_mgr ()->wait ();
 
       ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
+
+      client.server_->shutdown ();
     }
   ACE_CATCHANY
     {
@@ -151,6 +205,7 @@ Client::Client (Simple_Server_ptr server,
   :  server_ (Simple_Server::_duplicate (server)),
      niterations_ (niterations)
 {
+  the_handler_ = handler._this (/* ACE_TRY_ENV */);
 }
 
 int
@@ -168,26 +223,21 @@ Client::svc (void)
       ACE_TRY_CHECK;
 #endif
 
-      Handler handler;
-      AMI_Simple_Server_Handler_var the_handler =
-        handler._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::Long number = 0;
+      CORBA::Long number = 931232;
 
       for (int i = 0; i < this->niterations_; ++i)
         {
-          server_->sendc_get_number (the_handler.in (),
-                                     ACE_TRY_ENV);
+          server_->sendc_get_put_number (the_handler_.in (),
+                                         number,
+                                         ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          if (TAO_debug_level > 0 && i % 100 == 0)
-            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
         }
-
-      number = server_->get_number (ACE_TRY_ENV);
-      
-      ACE_DEBUG ((LM_DEBUG, "(%P | %t) get_number = %d\n", number));
+      if (debug)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P | %t):<%d> Asynchronous methods issued\n",
+                      niterations));
+        }
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/AMI/client.muxed.conf b/TAO/tests/AMI/client.muxed.conf
index e41aabecf7a..9450aa9f905 100644
--- a/TAO/tests/AMI/client.muxed.conf
+++ b/TAO/tests/AMI/client.muxed.conf
@@ -1,2 +1,4 @@
 
-static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBiiopprofilelock null -ORBclientconnectionhandler MT"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBIiopProfilelock null"
+
+
diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl
index 2c6a97e729e..06363f75467 100755
--- a/TAO/tests/AMI/run_test.pl
+++ b/TAO/tests/AMI/run_test.pl
@@ -5,59 +5,61 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-unshift @INC, '../../../bin';
-require ACEutils;
+ # unshift @INC, '../../../bin';
+ # require ACEutils;
+ # 
+ # $client_conf="client.global.conf";
+ # $client_process="client";
+ # $debug_level='5';
+ # $threads='2';
+ # $iterations='1';
+ # 
+ # foreach $i (@ARGV) {
+ #   if ($i eq '-tss') {
+ #     $client_conf = "client.tss.conf";
+ #   } elsif ($i eq '-debug') {
+ #     $debug_level = '1';
+ #   } elsif ($i eq '-creation') {
+ #     $client_process = 'orb_creation';
+ #     $threads='2';
+ #   }
+ # }
+ # 
+ # $iorfile = "server.ior";
+ # $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+ # 			  " -ORBsvcconf server.conf  -ORBdebuglevel $debug_level"
+ # 			  . " -o $iorfile");
+ # 
+ # if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+ #   print STDERR "ERROR: cannot find file <$iorfile>\n";
+ #   $SV->Kill (); $SV->TimedWait (1);
+ #   exit 1;
+ # }
+ # 
+ # $CL = Process::Create ($EXEPREFIX."$client_process$EXE_EXT ",
+ # 			  " -ORBsvcconf $client_conf "
+ # 			  . "-ORBdebuglevel $debug_level"
+ # 			  . " -k file://$iorfile "
+ # 			  . " -n $threads -i $iterations");
+ # 
+ # $client = $CL->TimedWait (60);
+ # if ($client == -1) {
+ #   print STDERR "ERROR: client timedout\n";
+ #   $CL->Kill (); $CL->TimedWait (1);
+ # }
+ # 
+ # $server = $SV->TimedWait (5);
+ # if ($server == -1) {
+ #   print STDERR "ERROR: server timedout\n";
+ #   $SV->Kill (); $SV->TimedWait (1);
+ # }
+ # 
+ # unlink $iorfile;
+ # 
+ # if ($server != 0 || $client != 0) {
+ #   exit 1;
+ # }
+ # 
+ # exit 0;
+ # 
 
-$client_conf="client.global.conf";
-$client_process="client";
-$debug_level='5';
-$threads='2';
-$iterations='1';
-
-foreach $i (@ARGV) {
-  if ($i eq '-tss') {
-    $client_conf = "client.tss.conf";
-  } elsif ($i eq '-debug') {
-    $debug_level = '1';
-  } elsif ($i eq '-creation') {
-    $client_process = 'orb_creation';
-    $threads='2';
-  }
-}
-
-$iorfile = "server.ior";
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
-                       " -ORBsvcconf server.conf  -ORBdebuglevel $debug_level"
-                       . " -o $iorfile");
-
-if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL = Process::Create ($EXEPREFIX."$client_process$EXE_EXT ",
-		       " -ORBsvcconf $client_conf "
-		       . "-ORBdebuglevel $debug_level"
-		       . " -k file://$iorfile "
-		       . " -n $threads -i $iterations");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
-
-unlink $iorfile;
-
-if ($server != 0 || $client != 0) {
-  exit 1;
-}
-
-exit 0;
diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp
index 9a2dfa93eb3..37f3ccf7595 100644
--- a/TAO/tests/AMI/server.cpp
+++ b/TAO/tests/AMI/server.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -66,36 +66,30 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
 
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       
-      CORBA::Long number = 0;
-      
-      number = server->get_number (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "get_number = %d\n", number));
-
       if (orb->run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
+
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
   ACE_CATCHANY
diff --git a/TAO/tests/AMI/simple-client-exclusive.conf b/TAO/tests/AMI/simple-client-exclusive.conf
new file mode 100644
index 00000000000..c78e5018593
--- /dev/null
+++ b/TAO/tests/AMI/simple-client-exclusive.conf
@@ -0,0 +1,2 @@
+
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBiiopprofilelock null -ORBclientconnectionhandler ST"
diff --git a/TAO/tests/AMI/simple-client.conf b/TAO/tests/AMI/simple-client-muxed.conf
index 97bca811c1b..97bca811c1b 100644
--- a/TAO/tests/AMI/simple-client.conf
+++ b/TAO/tests/AMI/simple-client-muxed.conf
diff --git a/TAO/tests/AMI/simple-client.cpp b/TAO/tests/AMI/simple-client.cpp
index 9c821f72d1b..3d9a14b5868 100644
--- a/TAO/tests/AMI/simple-client.cpp
+++ b/TAO/tests/AMI/simple-client.cpp
@@ -8,28 +8,37 @@ ACE_RCSID(MT_Client, client, "$Id$")
 
 const char *ior = "file://test.ior";
 int niterations = 5;
+int shutdown_flag = 0;
+int debug = 0;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:");
+  ACE_Get_Opt get_opts (argc, argv, "dk:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
+      case 'd':
+        debug = 1;
+        break;
       case 'k':
         ior = get_opts.optarg;
         break;
       case 'i':
         niterations = ACE_OS::atoi (get_opts.optarg);
         break;
+      case 'x':
+        shutdown_flag = 1;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
                            "-k <ior> "
                            "-i <niterations> "
+                           "-x "
                            "\n",
                            argv [0]),
                           -1);
@@ -42,8 +51,23 @@ class Handler : public POA_AMI_Simple_Server_Handler
 {
 public:
   Handler (void) {};
- 
+  // Constructor.
+
+  void get_put_number (CORBA::Long result,
+                       CORBA::Long out_l,
+                       CORBA::Environment&)
+    {
+      if (debug)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Callback method called: result <%d>, out_arg <%d>\n",
+                      result, 
+                      out_l));
+        }
+    };
+
   ~Handler (void) {};
+  // Destructor.
 };
 
 int
@@ -91,27 +115,42 @@ main (int argc, char *argv[])
                             1);
         }
 
+      // Instantiate the ReplyHandler and register that with the POA. 
       Handler handler;
       AMI_Simple_Server_Handler_var the_handler =
         handler._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      CORBA::Long number = 0;
       
+      CORBA::Long l = 931247;
+
       for (ssize_t ni = 0; ni < niterations; ni++)
         {
-        
-          server->sendc_get_number (the_handler.in (),
-                                    ACE_TRY_ENV);
+          server->sendc_get_put_number (the_handler.in (),
+                                        l,
+                                        ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
 
-      number = server->get_number (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (debug)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "<%d> Asynchronous methods issued\n",
+                      niterations));
+        }
+      
+      if (debug)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Issuing a synchronous method to collect the AMI replies\n"));
+        }
       
-      ACE_DEBUG ((LM_DEBUG,
-                  "get_number = %d\n",
-                  number));
+      CORBA::Long number = server->get_put_number (l,
+                                                   l,
+                                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (shutdown_flag)
+        server->shutdown ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/AMI/test-handC.cpp b/TAO/tests/AMI/test-handC.cpp
index b0bda5a45b0..41d00eaf173 100644
--- a/TAO/tests/AMI/test-handC.cpp
+++ b/TAO/tests/AMI/test-handC.cpp
@@ -16,50 +16,37 @@
 
 Simple_Server_ptr Simple_Server::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &env
+    CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
     return Simple_Server::_nil ();
-  if (!obj->_is_a ("IDL:Simple_Server:1.0", env))
+  CORBA::Boolean is_a = obj->_is_a ("IDL:Simple_Server:1.0", ACE_TRY_ENV);
+  ACE_CHECK_RETURN (Simple_Server::_nil ());
+  if (is_a == 0)
     return Simple_Server::_nil ();
-  return Simple_Server::_unchecked_narrow (obj, env);
+  return Simple_Server::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
 Simple_Server_ptr Simple_Server::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &
   )
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   if (CORBA::is_nil (obj))
     return Simple_Server::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Object:1.0");
-  if (servant != 0)
+  if (obj->_is_collocated () && _TAO_collocation_Simple_Server_Stub_Factory_function_pointer != 0)
     {
-      Simple_Server_ptr retv = ACE_reinterpret_cast (
-          Simple_Server_ptr,
-          ACE_reinterpret_cast (
-              PortableServer::Servant,
-              servant
-            )
-          ->_create_collocated_objref (
-              "IDL:Simple_Server:1.0",
-              TAO_ORB_Core::ORB_CONTROL,
-              stub
-            )
-        );
+      Simple_Server_ptr retv = _TAO_collocation_Simple_Server_Stub_Factory_function_pointer (obj);
       if (retv != 0)
         return retv;
     }
   return new Simple_Server(stub);
 }
 
-Simple_Server_ptr 
+Simple_Server_ptr
 Simple_Server::_duplicate (Simple_Server_ptr obj)
 {
   if (!CORBA::is_nil (obj))
@@ -67,34 +54,42 @@ Simple_Server::_duplicate (Simple_Server_ptr obj)
   return obj;
 }
 
-CORBA::Long Simple_Server::get_number (
+CORBA::Long Simple_Server::get_put_number (
+    CORBA::Long_out out_l,
+    CORBA::Long in_l,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Long _tao_retval = 0;
 
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "get_number",
+      "get_put_number",
       istub->orb_core ()
     );
-  
+
 
   for (;;)
   {
-    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
     ACE_CHECK_RETURN (_tao_retval);
 
+    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+    if (!(
+                    (_tao_out << in_l)
+      ))
+      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
+
     int _invoke_status =
       _tao_call.invoke (0, 0, ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
@@ -109,42 +104,49 @@ CORBA::Long Simple_Server::get_number (
 
     }
     break;
-    
+
   }
   TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
   if (!(
-        (_tao_in >> _tao_retval)
+        (_tao_in >> _tao_retval) &&
+        (_tao_in >> out_l)
     ))
     ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
 void
-Simple_Server::sendc_get_number (
+Simple_Server::sendc_get_put_number (
     AMI_Simple_Server_Handler_ptr _tao_ami_handler,
+        CORBA::Long in_l,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INV_OBJREF ());
 
-  
+
   TAO_GIOP_Twoway_Asynch_Invocation _tao_call (
       istub,
-      "get_number",
+      "get_put_number",
       istub->orb_core (),
-      &AMI_Simple_Server_Handler::get_number_skel,
+      &AMI_Simple_Server_Handler::get_put_number_skel,
       _tao_ami_handler
     );
-  
+
 
   for (;;)
   {
-    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
     ACE_CHECK;
+    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+    if (!(
+                    (_tao_out << in_l)
+      ))
+      ACE_THROW (CORBA::MARSHAL ());
+
     int _invoke_status =
       _tao_call.invoke (0, 0, ACE_TRY_ENV);
         ACE_CHECK;
@@ -159,19 +161,66 @@ Simple_Server::sendc_get_number (
 
     }
     break;
-    
+
   }
   return;
 }
 
-CORBA::Boolean Simple_Server::_is_a (const CORBA::Char *value, CORBA::Environment &env)
+void Simple_Server::shutdown (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+
+
+
+
+  TAO_Stub *istub = this->_stubobj ();
+  if (istub == 0)
+    ACE_THROW (CORBA::INTERNAL ());
+
+
+  TAO_GIOP_Oneway_Invocation _tao_call (
+      istub,
+      "shutdown",
+      istub->orb_core ()
+    );
+
+
+  for (;;)
+  {
+    _tao_call.start (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    int _invoke_status =
+      _tao_call.invoke (ACE_TRY_ENV);
+        ACE_CHECK;
+
+    if (_invoke_status == TAO_INVOKE_RESTART)
+      continue;
+    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
+      // cannot happen
+    if (_invoke_status != TAO_INVOKE_OK)
+    {
+      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+
+    }
+    break;
+
+  }
+
+}
+
+CORBA::Boolean Simple_Server::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Simple_Server:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, env);
+    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
 const char* Simple_Server::_interface_repository_id (void) const
@@ -202,38 +251,23 @@ AMI_Simple_Server_Handler_ptr AMI_Simple_Server_Handler::_narrow (
 
 AMI_Simple_Server_Handler_ptr AMI_Simple_Server_Handler::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &
   )
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   if (CORBA::is_nil (obj))
     return AMI_Simple_Server_Handler::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Object:1.0");
-  if (servant != 0)
+  if (obj->_is_collocated () && _TAO_collocation_AMI_Simple_Server_Handler_Stub_Factory_function_pointer != 0)
     {
-      AMI_Simple_Server_Handler_ptr retv = ACE_reinterpret_cast (
-          AMI_Simple_Server_Handler_ptr,
-          ACE_reinterpret_cast (
-              PortableServer::Servant,
-              servant
-            )
-          ->_create_collocated_objref (
-              "IDL:AMI_Simple_Server_Handler:1.0",
-              TAO_ORB_Core::ORB_CONTROL,
-              stub
-            )
-        );
+      AMI_Simple_Server_Handler_ptr retv = _TAO_collocation_AMI_Simple_Server_Handler_Stub_Factory_function_pointer (obj);
       if (retv != 0)
         return retv;
     }
   return new AMI_Simple_Server_Handler(stub);
 }
 
-AMI_Simple_Server_Handler_ptr 
+AMI_Simple_Server_Handler_ptr
 AMI_Simple_Server_Handler::_duplicate (AMI_Simple_Server_Handler_ptr obj)
 {
   if (!CORBA::is_nil (obj))
@@ -241,153 +275,296 @@ AMI_Simple_Server_Handler::_duplicate (AMI_Simple_Server_Handler_ptr obj)
   return obj;
 }
 
-void 
-AMI_Simple_Server_Handler::get_number (
-    CORBA::Long _tao_ami_result, 
+void
+AMI_Simple_Server_Handler::get_put_number (
+        CORBA::Long _tao_retval,
+        CORBA::Long out_l,
         CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
+
 {
-    
 
-    TAO_Stub *istub = this->_stubobj ();
-    if (istub == 0)
-      ACE_THROW (CORBA::INTERNAL ());
-    
-        TAO_GIOP_Twoway_Invocation _tao_call (
-        istub,
-        "get_number",
-        istub->orb_core ()
-      );
-    
 
-    for (;;)
+  TAO_Stub *istub = this->_stubobj ();
+  if (istub == 0)
+    ACE_THROW (CORBA::INTERNAL ());
+
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "get_put_number",
+      istub->orb_core ()
+    );
+
+
+  for (;;)
+  {
+    ACE_TRY_ENV.clear ();
+    _tao_call.start (ACE_TRY_ENV);
+    ACE_CHECK;
+    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+    if (!(
+          (_tao_out << _tao_retval) &&
+          (_tao_out << out_l)
+      ))
+      ACE_THROW (CORBA::MARSHAL ());
+    int _invoke_status =
+      _tao_call.invoke (0, 0, ACE_TRY_ENV);
+    ACE_CHECK;
+    if (_invoke_status == TAO_INVOKE_RESTART)
+      continue;
+    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
+      // cannot happen
+    if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_TRY_ENV.clear ();
-      _tao_call.start (ACE_TRY_ENV);
-ACE_CHECK;
-      TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-      if (!(
-(_tao_out << _tao_ami_result)
-            
-        ))
-        ACE_THROW (CORBA::MARSHAL ());
-      int _invoke_status =
-        _tao_call.invoke (0, 0, ACE_TRY_ENV);
-      ACE_CHECK;
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        continue;
-      // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-        // cannot happen
-      if (_invoke_status != TAO_INVOKE_OK)
-      {
-        ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-      }
-      break;
-      
+      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
     }
-    
+    break;
+
   }
 
+}
+
+
 void
-AMI_Simple_Server_Handler::get_number_skel (TAO_InputCDR &_tao_reply_cdr,
-                                            Messaging::ReplyHandler_ptr _tao_reply_handler,
-                                            CORBA::Environment &ACE_TRY_ENV)
-{
-  // Retrive Reply Handler object.
-  AMI_Simple_Server_Handler_var _tao_reply_handler_object = 
-    AMI_Simple_Server_Handler::_narrow (_tao_reply_handler,
-                                        ACE_TRY_ENV);
+AMI_Simple_Server_Handler::get_put_number_skel (
+  TAO_InputCDR &_tao_in,
+  Messaging::ReplyHandler_ptr _tao_reply_handler,
+  CORBA::Environment &ACE_TRY_ENV
+)
+{
+
+    // Retrieve Reply Handler object.
+  AMI_Simple_Server_Handler_var _tao_reply_handler_object =
+    AMI_Simple_Server_Handler::_narrow(_tao_reply_handler, ACE_TRY_ENV);
   ACE_CHECK;
 
-  // @@ Error handling.
-  
-  // Demarshall all the arguments.
-  CORBA::Long l;
-  _tao_reply_cdr >> l;
-  
+  // @@ Error handling
+
+  //Demarshall all the arguments.
+  CORBA::Long _tao_retval = 0;
+  CORBA::Long out_l;
+  if (!(
+        (_tao_in >> _tao_retval) &&
+        (_tao_in >> out_l)
+     ))
+    ACE_THROW (CORBA::MARSHAL ());
+
   // Invoke the call back method.
-  _tao_reply_handler_object->get_number (l, ACE_TRY_ENV);
-}
+  _tao_reply_handler_object->get_put_number (
+    _tao_retval,
+    out_l,
+    ACE_TRY_ENV
+    );
+  ACE_CHECK;
+
+};
+
+void
+AMI_Simple_Server_Handler::shutdown (
+            CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+
+{
+
+
+  TAO_Stub *istub = this->_stubobj ();
+  if (istub == 0)
+    ACE_THROW (CORBA::INTERNAL ());
+
+  TAO_GIOP_Oneway_Invocation _tao_call (
+      istub,
+      "shutdown",
+      istub->orb_core ()
+    );
 
-  CORBA::Boolean AMI_Simple_Server_Handler::_is_a (const CORBA::Char *value, CORBA::Environment &env)
+
+  for (;;)
   {
-    if (
+    ACE_TRY_ENV.clear ();
+    _tao_call.start (ACE_TRY_ENV);
+    ACE_CHECK;
+    int _invoke_status =
+      _tao_call.invoke (ACE_TRY_ENV);
+    ACE_CHECK;
+    if (_invoke_status == TAO_INVOKE_RESTART)
+      continue;
+    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
+      // cannot happen
+    if (_invoke_status != TAO_INVOKE_OK)
+    {
+      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+    }
+    break;
+
+  }
+
+}
+
+CORBA::Boolean AMI_Simple_Server_Handler::_is_a (const CORBA::Char *value, CORBA::Environment &env)
+{
+  if (
 (!ACE_OS::strcmp ((char *)value, "IDL:AMI_Simple_Server_Handler:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/Messaging/ReplyHandler:1.0")) ||
-            (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/Messaging/ReplyHandler:1.0")) ||
+        (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
   return 1; // success using local knowledge
-    else
-      return this->CORBA_Object::_is_a (value, env);
-  }
+  else
+    return this->CORBA_Object::_is_a (value, env);
+}
 
-  const char* AMI_Simple_Server_Handler::_interface_repository_id (void) const
-  {
-    return "IDL:AMI_Simple_Server_Handler:1.0";
-  }
+const char* AMI_Simple_Server_Handler::_interface_repository_id (void) const
+{
+  return "IDL:AMI_Simple_Server_Handler:1.0";
+}
 
-  static const CORBA::Long _oc_AMI_Simple_Server_Handler[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x414d495f), ACE_NTOHL (0x53696d70), ACE_NTOHL (0x6c655f53), ACE_NTOHL (0x65727665), ACE_NTOHL (0x725f4861), ACE_NTOHL (0x6e646c65), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:AMI_Simple_Server_Handler:1.0
-    26, ACE_NTOHL (0x414d495f), ACE_NTOHL (0x53696d70), ACE_NTOHL (0x6c655f53), ACE_NTOHL (0x65727665), ACE_NTOHL (0x725f4861), ACE_NTOHL (0x6e646c65), ACE_NTOHL (0x72000000),  // name = AMI_Simple_Server_Handler
+static const CORBA::Long _oc_AMI_Simple_Server_Handler[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x414d495f), ACE_NTOHL (0x53696d70), ACE_NTOHL (0x6c655f53), ACE_NTOHL (0x65727665), ACE_NTOHL (0x725f4861), ACE_NTOHL (0x6e646c65), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:AMI_Simple_Server_Handler:1.0
+  26, ACE_NTOHL (0x414d495f), ACE_NTOHL (0x53696d70), ACE_NTOHL (0x6c655f53), ACE_NTOHL (0x65727665), ACE_NTOHL (0x725f4861), ACE_NTOHL (0x6e646c65), ACE_NTOHL (0x72000000),  // name = AMI_Simple_Server_Handler
 };
-  static CORBA::TypeCode _tc_TAO_tc_AMI_Simple_Server_Handler (CORBA::tk_objref, sizeof (_oc_AMI_Simple_Server_Handler), (char *) &_oc_AMI_Simple_Server_Handler, 0, sizeof (AMI_Simple_Server_Handler));
-  CORBA::TypeCode_ptr _tc_AMI_Simple_Server_Handler = &_tc_TAO_tc_AMI_Simple_Server_Handler;
+static CORBA::TypeCode _tc_TAO_tc_AMI_Simple_Server_Handler (CORBA::tk_objref, sizeof (_oc_AMI_Simple_Server_Handler), (char *) &_oc_AMI_Simple_Server_Handler, 0, sizeof (AMI_Simple_Server_Handler));
+CORBA::TypeCode_ptr _tc_AMI_Simple_Server_Handler = &_tc_TAO_tc_AMI_Simple_Server_Handler;
 
-  void operator<<= (CORBA::Any &_tao_any, Simple_Server_ptr _tao_elem)
-  {
-    CORBA::Object_ptr *_tao_obj_ptr = 0;
-    ACE_TRY_NEW_ENV
-    {
-      ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-      *_tao_obj_ptr = Simple_Server::_duplicate (_tao_elem);
-      _tao_any.replace (_tc_Simple_Server, _tao_obj_ptr, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-    ACE_CATCHANY
+class TAO_AMI_Simple_Server_Handler_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+{
+private:
+  unsigned int hash (const char *str, unsigned int len);
+public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+};
+/* starting time is 23:22:01 */
+/* C++ code produced by gperf version 2.8 (ACE version) */
+/* Command-line: /project/danzontmp/alex/ami_phase3/sun5_CC/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_AMI_Simple_Server_Handler_Perfect_Hash_OpTable -N lookup  */
+unsigned int
+TAO_AMI_Simple_Server_Handler_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
+{
+  static const unsigned char asso_values[] =
     {
-      delete _tao_obj_ptr;
-    }
-    ACE_ENDTRY;
-  }
+#if defined (ACE_MVS)
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15,  0,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15,  0,
+     15, 15, 15, 15, 15,  0, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15,  0,
+     15, 15, 15,  0, 15, 15, 15, 15, 15, 15,
+     15, 15,  0,  0, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15,
+#else
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15,  0, 15,  0, 15, 15,
+     15, 15, 15,  0, 15, 15, 15, 15, 15, 15,
+      0, 15, 15, 15,  0,  0,  0, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15,
+#endif /* ACE_MVS */
+    };
+  return len + asso_values[str[len - 1]] + asso_values[str[0]];
+}
 
-  CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Simple_Server_ptr &_tao_elem)
-  {
-    CORBA::Object_ptr *tmp = 0;
-    ACE_TRY_NEW_ENV
+const class TAO_operation_db_entry *
+TAO_AMI_Simple_Server_Handler_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+{
+  enum
     {
-      _tao_elem = Simple_Server::_nil ();
-      CORBA::TypeCode_var type = _tao_any.type ();
-      if (!type->equal (_tc_Simple_Server, ACE_TRY_ENV)) return 0; // not equal
-      ACE_TRY_CHECK;
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      CORBA::Object_var _tao_obj_var;
-      ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-      if (stream.decode (_tc_Simple_Server, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-         == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        _tao_elem = Simple_Server::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-        ((CORBA::Any *)&_tao_any)->replace (_tc_Simple_Server, tmp, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      // failure
+      TOTAL_KEYWORDS = 4,
+      MIN_WORD_LENGTH = 5,
+      MAX_WORD_LENGTH = 14,
+      MIN_HASH_VALUE = 5,
+      MAX_HASH_VALUE = 14,
+      HASH_VALUE_RANGE = 10,
+      DUPLICATES = 0
+    };
+
+  static const class TAO_operation_db_entry  wordlist[] =
+    {
+      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"_is_a",  &POA_AMI_Simple_Server_Handler::_is_a_skel},
+      {"",0},{"",0},
+      {"shutdown",      &POA_AMI_Simple_Server_Handler::shutdown_skel},
+      {"",0},{"",0},{"",0},{"",0},
+      {"_non_existent",  &POA_AMI_Simple_Server_Handler::_non_existent_skel},
+      {"get_put_number",        &POA_AMI_Simple_Server_Handler::get_put_number_skel},
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      unsigned int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
+        {
+          const char *s = wordlist[key].opname_;
+
+          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
+            return &wordlist[key];
+        }
     }
-    ACE_CATCHANY
+  return 0;
+}
+/* ending time is 23:22:01 */
+static TAO_AMI_Simple_Server_Handler_Perfect_Hash_OpTable tao_AMI_Simple_Server_Handler_optable;
+
+AMI_Simple_Server_Handler_ptr _TAO_collocation_POA_AMI_Simple_Server_Handler_Stub_Factory (
+    CORBA::Object_ptr obj
+  )
+{
+  TAO_Stub *stub = obj->_stubobj ();
+
+  switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
     {
-      delete tmp;
-      return 0;
+    case TAO_ORB_Core::THRU_POA:
+      return new _tao_thru_poa_collocated_AMI_Simple_Server_Handler (stub);
+    case TAO_ORB_Core::DIRECT:
+      break;
+    default:
+      break;
     }
-    ACE_ENDTRY;
-    return 0;
-  }
+  return 0;
+}
+
+int _TAO_collocation_POA_AMI_Simple_Server_Handler_Stub_Factory_Initializer (long dummy)
+{
+  ACE_UNUSED_ARG (dummy);
+
+  _TAO_collocation_AMI_Simple_Server_Handler_Stub_Factory_function_pointer =
+    _TAO_collocation_POA_AMI_Simple_Server_Handler_Stub_Factory;
+
+  return 0;
+}
+
+static int _TAO_collocation_POA_AMI_Simple_Server_Handler_Stub_Factory_Initializer_Scarecrow =
+  _TAO_collocation_POA_AMI_Simple_Server_Handler_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_AMI_Simple_Server_Handler_Stub_Factory_Initializer));
 
 // skeleton constructor
 POA_AMI_Simple_Server_Handler::POA_AMI_Simple_Server_Handler (void)
 {
+  this->optable_ = &tao_AMI_Simple_Server_Handler_optable;
 }
 
 // copy ctor
@@ -400,8 +577,75 @@ POA_AMI_Simple_Server_Handler::~POA_AMI_Simple_Server_Handler (void)
 {
 }
 
+void POA_AMI_Simple_Server_Handler::get_put_number  (
+        CORBA::Long _tao_retval,
+        CORBA::Long out_l,
+        CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+
+{
+  ACE_DEBUG ((LM_DEBUG,
+      "(%P | %t):POA_AMI_Simple_Server_Handler\n"));
+
+}
+
+void POA_AMI_Simple_Server_Handler::get_put_number_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void *_tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+)
+{
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_AMI_Simple_Server_Handler *_tao_impl = (POA_AMI_Simple_Server_Handler *)_tao_object_reference;
+
+  CORBA::Long _tao_retval = 0;
+  CORBA::Long out_l;
+  if (!(
+    (_tao_in >> _tao_retval) &&
+    (_tao_in >> out_l)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
+
+  _tao_impl->get_put_number (
+    _tao_retval,
+    out_l,
+    ACE_TRY_ENV
+  );
+  ACE_CHECK;
+_tao_server_request.init_reply (ACE_TRY_ENV);
+}
+
+void POA_AMI_Simple_Server_Handler::shutdown  (
+            CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+
+{
+  ACE_DEBUG ((LM_DEBUG,
+      "(%P | %t):POA_AMI_Simple_Server_Handler\n"));
+
+}
+
+void POA_AMI_Simple_Server_Handler::shutdown_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void *_tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+)
+{
+  POA_AMI_Simple_Server_Handler *_tao_impl = (POA_AMI_Simple_Server_Handler *)_tao_object_reference;
+
+  _tao_impl->shutdown (
+    ACE_TRY_ENV
+  );
+  ACE_CHECK;
+_tao_server_request.init_reply (ACE_TRY_ENV);
+}
+
 void POA_AMI_Simple_Server_Handler::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request, 
+    CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
@@ -413,10 +657,10 @@ void POA_AMI_Simple_Server_Handler::_is_a_skel (
   CORBA::String_var value;
   if (!((_tao_in >> value.out ())))
     ACE_THROW (CORBA::MARSHAL ());
-  
+
   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply (ACE_TRY_ENV);
   ACE_CHECK;
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
@@ -425,7 +669,7 @@ void POA_AMI_Simple_Server_Handler::_is_a_skel (
 }
 
 void POA_AMI_Simple_Server_Handler::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request, 
+    CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
@@ -434,7 +678,7 @@ void POA_AMI_Simple_Server_Handler::_non_existent_skel (
   POA_AMI_Simple_Server_Handler *_tao_impl = (POA_AMI_Simple_Server_Handler *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply (ACE_TRY_ENV);
   ACE_CHECK;
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
@@ -459,9 +703,9 @@ void* POA_AMI_Simple_Server_Handler::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:AMI_Simple_Server_Handler:1.0") == 0)
+if (ACE_OS::strcmp (logical_type_id, "IDL:AMI_Simple_Server_Handler:1.0") == 0)
     return ACE_static_cast (POA_AMI_Simple_Server_Handler_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+    if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
@@ -485,161 +729,195 @@ const char* POA_AMI_Simple_Server_Handler::_interface_repository_id (void) const
   return "IDL:AMI_Simple_Server_Handler:1.0";
 }
 
-
 AMI_Simple_Server_Handler*
 POA_AMI_Simple_Server_Handler::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  return new _tao_collocated_AMI_Simple_Server_Handler (this, stub);
+  switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
+    {
+    case TAO_ORB_Core::THRU_POA:
+      return new _tao_thru_poa_collocated_AMI_Simple_Server_Handler (stub);
+    case TAO_ORB_Core::DIRECT:
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    default:
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    }
 }
 
-void*
-POA_AMI_Simple_Server_Handler::_create_collocated_objref (const char* repository_id, CORBA::ULong type, TAO_Stub *stub)
+_tao_thru_poa_collocated_AMI_Simple_Server_Handler::_tao_thru_poa_collocated_AMI_Simple_Server_Handler (
+  TAO_Stub *stub
+)
+  : AMI_Simple_Server_Handler (),
+    CORBA_Object (stub, 0, 1)
 {
-  if (!ACE_OS::strcmp ("IDL:AMI_Simple_Server_Handler:1.0", repository_id))
-    return ACE_static_cast (
-         AMI_Simple_Server_Handler_ptr,
-        new _tao_collocated_AMI_Simple_Server_Handler (this, stub)
-      );
-  return 0;
 }
 
-void
-POA_AMI_Simple_Server_Handler::get_number (CORBA::Long l, CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P | %t):POA_AMI_Simple_Server_Handler::get_number = %d\n",
-              l));
-}
+CORBA::Boolean _tao_thru_poa_collocated_AMI_Simple_Server_Handler::_is_a(
+    const CORBA::Char *logical_type_id,
+    CORBA_Environment &ACE_TRY_ENV
+  )
 
-void
-POA_AMI_Simple_Server_Handler::get_number_skel (CORBA::ServerRequest &_tao_server_request,
-                                                void *_tao_object_reference,
-                                                void *_tao_context, 
-                                                CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_AMI_Simple_Server_Handler *_tao_impl = (POA_AMI_Simple_Server_Handler *)_tao_object_reference;
-
-  CORBA::Long l;
-  if (!(
-    (_tao_in >> l)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_impl->get_number (
-    l);
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "_is_a",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK_RETURN (0);
+  return ACE_reinterpret_cast (
+      POA_AMI_Simple_Server_Handler_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:AMI_Simple_Server_Handler:1.0"
+        )
+    )->_is_a (logical_type_id, ACE_TRY_ENV);
 }
 
-// *********************************************************************
 
-_tao_collocated_AMI_Simple_Server_Handler::_tao_collocated_AMI_Simple_Server_Handler (
-    POA_AMI_Simple_Server_Handler_ptr  servant,
-    TAO_Stub *stub
+CORBA::Boolean _tao_thru_poa_collocated_AMI_Simple_Server_Handler::_non_existent(
+    CORBA_Environment &ACE_TRY_ENV
   )
-  : AMI_Simple_Server_Handler (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
+
 {
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "_non_existent",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK_RETURN (0);
+  return ACE_reinterpret_cast (
+      POA_AMI_Simple_Server_Handler_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:AMI_Simple_Server_Handler:1.0"
+        )
+    )->_non_existent (ACE_TRY_ENV);
 }
 
-CORBA::Boolean _tao_collocated_AMI_Simple_Server_Handler::_is_a(
-    const CORBA::Char *logical_type_id,
-    CORBA_Environment &ACE_TRY_ENV
+
+void _tao_thru_poa_collocated_AMI_Simple_Server_Handler::get_put_number  (
+        CORBA::Long _tao_retval,
+        CORBA::Long out_l,
+        CORBA::Environment &ACE_TRY_ENV
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
-  if (this->_stubobj ()->orb_core ()->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
-    {
-      TAO_Object_Adapter::Servant_Upcall servant_upcall (
-          *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
-        );
-      servant_upcall.prepare_for_upcall (
-          this->_object_key (),
-          "_is_a",
-          ACE_TRY_ENV
-        );
-      ACE_CHECK_RETURN (0);
-      return ACE_reinterpret_cast (
-          POA_AMI_Simple_Server_Handler_ptr,
-          servant_upcall.servant ()->_downcast (
-              "IDL:AMI_Simple_Server_Handler:1.0"
-            )
-        )->_is_a (logical_type_id, ACE_TRY_ENV);
-    }
-  return this->servant_->_is_a (logical_type_id, ACE_TRY_ENV);
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "get_put_number",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK;
+  ACE_reinterpret_cast (
+      POA_AMI_Simple_Server_Handler_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:AMI_Simple_Server_Handler:1.0"
+        )
+    )->get_put_number (
+      _tao_retval,
+      out_l,
+      ACE_TRY_ENV
+    );
+  return;
 }
 
+void _tao_thru_poa_collocated_AMI_Simple_Server_Handler::shutdown  (
+            CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 
-POA_AMI_Simple_Server_Handler_ptr _tao_collocated_AMI_Simple_Server_Handler::_get_servant (void) const
 {
-  return this->servant_;
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "shutdown",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK;
+  ACE_reinterpret_cast (
+      POA_AMI_Simple_Server_Handler_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:AMI_Simple_Server_Handler:1.0"
+        )
+    )->shutdown (
+      ACE_TRY_ENV
+    );
+  return;
 }
 
-CORBA::Boolean _tao_collocated_AMI_Simple_Server_Handler::_non_existent(
-    CORBA_Environment &ACE_TRY_ENV
-  )
 
+
+Simple_Server_ptr (*_TAO_collocation_Simple_Server_Stub_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+AMI_Simple_Server_Handler_ptr (*_TAO_collocation_AMI_Simple_Server_Handler_Stub_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+void operator<<= (CORBA::Any &_tao_any, Simple_Server_ptr _tao_elem)
 {
-  if (this->_stubobj ()->orb_core ()->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
-    {
-      TAO_Object_Adapter::Servant_Upcall servant_upcall (
-          *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
-        );
-      servant_upcall.prepare_for_upcall (
-          this->_object_key (),
-          "_non_existent",
-          ACE_TRY_ENV
-        );
-      ACE_CHECK_RETURN (0);
-      return ACE_reinterpret_cast (
-          POA_AMI_Simple_Server_Handler_ptr,
-          servant_upcall.servant ()->_downcast (
-              "IDL:AMI_Simple_Server_Handler:1.0"
-            )
-        )->_non_existent (ACE_TRY_ENV);
-    }
-  return this->servant_->_non_existent (ACE_TRY_ENV);
+  CORBA::Object_ptr *_tao_obj_ptr = 0;
+  ACE_TRY_NEW_ENV
+  {
+    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
+    *_tao_obj_ptr = Simple_Server::_duplicate (_tao_elem);
+    _tao_any.replace (_tc_Simple_Server, _tao_obj_ptr, 1, ACE_TRY_ENV);
+    ACE_TRY_CHECK;
+  }
+  ACE_CATCHANY
+  {
+    delete _tao_obj_ptr;
+  }
+  ACE_ENDTRY;
 }
 
-void
-_tao_collocated_AMI_Simple_Server_Handler::get_number  (CORBA::Long l, CORBA::Environment &)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Simple_Server_ptr &_tao_elem)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  if (this->_stubobj ()->orb_core ()->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
+  CORBA::Object_ptr *tmp = 0;
+  ACE_TRY_NEW_ENV
+  {
+    _tao_elem = Simple_Server::_nil ();
+    CORBA::TypeCode_var type = _tao_any.type ();
+    if (!type->equal (_tc_Simple_Server, ACE_TRY_ENV)) return 0; // not equal
+    ACE_TRY_CHECK;
+    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    CORBA::Object_var _tao_obj_var;
+    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
+    if (stream.decode (_tc_Simple_Server, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
+       == CORBA::TypeCode::TRAVERSE_CONTINUE)
     {
-      TAO_Object_Adapter::Servant_Upcall servant_upcall (
-          *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
-        );
-      servant_upcall.prepare_for_upcall (
-          this->_object_key (),
-          "get_number",
-          ACE_TRY_ENV
-        );
-      ACE_CHECK;
-      ACE_reinterpret_cast (
-          POA_AMI_Simple_Server_Handler_ptr,
-          servant_upcall.servant ()->_downcast (
-              "IDL:AMI_Simple_Server_Handler:1.0"
-            )
-        )->get_number (
-          l);
-      return;
+      _tao_elem = Simple_Server::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
+      ((CORBA::Any *)&_tao_any)->replace (_tc_Simple_Server, tmp, 1, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      return 1;
     }
-  this->servant_->get_number (
-      l );
-
+    // failure
+  }
+  ACE_CATCHANY
+  {
+    delete tmp;
+    return 0;
+  }
+  ACE_ENDTRY;
+  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class TAO_Object_Field_T<Simple_Server>;
-    template class TAO_Object_Field_T<AMI_Simple_Server_Handler>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Field_T<Simple_Server>
-  #  pragma instantiate TAO_Object_Field_T<AMI_Simple_Server_Handler>
-  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+  template class TAO_Object_Field_T<Simple_Server,Simple_Server_var>;
+template class TAO_Object_Manager<Simple_Server,Simple_Server_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Field_T<Simple_Server,Simple_Server_var>
+#  pragma instantiate TAO_Object_Manager<Simple_Server,Simple_Server_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/AMI/test.idl b/TAO/tests/AMI/test.idl
index 376da4a58c6..8fa715984b1 100644
--- a/TAO/tests/AMI/test.idl
+++ b/TAO/tests/AMI/test.idl
@@ -4,13 +4,9 @@
 
 interface Simple_Server
 {
-  // void test_method ();
-
-  long get_number ();
-
-  // void put_number (in long l);
-
-  // long get_put_number (out long out_l, in long in_l);
- 
-  // oneway void shutdown ();
+  long get_put_number (out long out_l, in long in_l);
+  // Get the number as the return value as well as the out value and
+  // also puts the value.  
+  
+  oneway void shutdown ();
 };
diff --git a/TAO/tests/AMI/test_i.cpp b/TAO/tests/AMI/test_i.cpp
index 1b199315a26..19e5d65be99 100644
--- a/TAO/tests/AMI/test_i.cpp
+++ b/TAO/tests/AMI/test_i.cpp
@@ -9,36 +9,6 @@
 
 ACE_RCSID(MT_Client, test_i, "$Id$")
 
-void
-Simple_Server_i::test_method (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "%N:%l:(%P:%t):Simple_Server_i::test_method called\n"));
-}
-
-CORBA::Long
-Simple_Server_i::get_number (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "%N:%l:(%P:%t):Simple_Server_i::get_number called\n"));
-  return this->number_++;
-}
-
-void
-Simple_Server_i::put_number (CORBA::Long l,
-                             CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "%N:%l:(%P:%t):Simple_Server_i::put_number: %d\n",
-                l));
-}
-
 CORBA::Long
 Simple_Server_i::get_put_number (CORBA::Long_out out_l,
                                  CORBA::Long in_l,
diff --git a/TAO/tests/AMI/test_i.h b/TAO/tests/AMI/test_i.h
index c050a2795d8..b6567cec81e 100644
--- a/TAO/tests/AMI/test_i.h
+++ b/TAO/tests/AMI/test_i.h
@@ -31,21 +31,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void test_method (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Long get_number (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void put_number (CORBA::Long l,
-                   CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   CORBA::Long get_put_number (CORBA::Long_out out_l,
                               CORBA::Long in_l,
                               CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void shutdown (CORBA::Environment&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tests/CDR/Makefile b/TAO/tests/CDR/Makefile
index 2d9381062f0..3b8476e4d13 100644
--- a/TAO/tests/CDR/Makefile
+++ b/TAO/tests/CDR/Makefile
@@ -31,6 +31,9 @@ OCTET_SEQUENCE_OBJS = octet_sequence.o
 ALLOCATOR_OBJS = allocator.o
 
 BIN = basic_types tc growth octet_sequence allocator
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/tests/Collocation/Coll_Tester.cpp b/TAO/tests/Collocation/Coll_Tester.cpp
deleted file mode 100644
index f7865934778..00000000000
--- a/TAO/tests/Collocation/Coll_Tester.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-
-//============================================================================
-//
-//  =FILENAME
-//     Collocation_Test.h
-//
-//  =DESCRIPTION
-//     Server class to perform testing of TAO's collocation mechanism.
-//
-//  =AUTHOR
-//     Nanbor Wang
-//
-//=============================================================================
-
-#include "Coll_Tester.h"
-
-Collocation_Test::Collocation_Test (void)
-{
-  // no-op.
-}
-
-int
-Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
-{
-  // Initialize the ORB.
-  this->orb_ = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  int result = this->parse_args (argc, argv);
-  if (result != 0)
-    return result;
-
-  // Get an Object reference to RootPOA.
-  CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RootPOA");
-
-  // Narrow the Object reference to a POA reference
-  this->root_poa_ =
-    PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // Get the POAManager of RootPOA
-  this->poa_manager_ =
-    this->root_poa_->the_POAManager (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // Activate the diamond servant and its base classes under RootPOA.
-  PortableServer::ObjectId_var id =
-    this->root_poa_->activate_object (&this->top_servant_,
-                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  id =
-    this->root_poa_->activate_object (&this->left_servant_,
-                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  id =
-    this->root_poa_->activate_object (&this->right_servant_,
-                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  id =
-    this->root_poa_->activate_object (&this->diamond_servant_,
-                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // We only care about the most derived class here.
-  this->diamond_obj_ = this->diamond_servant_._this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  CORBA::String_var str =
-    this->orb_->object_to_string (this->diamond_obj_.in (),
-                                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n",
-              str.in()));
-
-  return 0;
-
-
-}
-
-int
-Collocation_Test::parse_args (int argc, char *argv[])
-{
-  return 0;
-}
-
-int
-Collocation_Test::test_narrow (CORBA::Environment &ACE_TRY_ENV)
-{
-  Diamond::Top_var top =
-    Diamond::Top::_narrow (this->diamond_obj_, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  Diamond::Left_var left =
-    Diamond::Left::_narrow (this->diamond_obj_, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  Diamond::Right_var right =
-    Diamond::Right::_narrow (this->diamond_obj_, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  Diamond::Buttom_var buttom =
-    Diamond::Buttom::_narrow (this->diamond_obj_, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  CORBA::String_var str = top->shape (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-  ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ()));
-
-  str = left->shape (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-  ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ()));
-
-  str = right->shape (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-  ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ()));
-
-  str = buttom->shape (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-  ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ()));
-
-  return 0;
-}
-
-int
-Collocation_Test::run (CORBA::Environment &ACE_TRY_ENV)
-{
-  this->poa_manager_->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  this->test_narrow (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
diff --git a/TAO/tests/Collocation/Coll_Tester.h b/TAO/tests/Collocation/Coll_Tester.h
deleted file mode 100644
index 110712c0122..00000000000
--- a/TAO/tests/Collocation/Coll_Tester.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-//============================================================================
-//
-//  =FILENAME
-//     Collocation_Test.h
-//
-//  =DESCRIPTION
-//     Server class to perform testing of TAO's collocation mechanism.
-//
-//  =AUTHOR
-//     Nanbor Wang
-//
-//=============================================================================
-
-#if !defined (TAO_COLLOCATION_TEST_H)
-#define TAO_COLLOCATION_TEST_H
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Diamond_i.h"
-
-class Collocation_Test
-{
-public:
-  Collocation_Test (void);
-
-  int init (int argc, char *argv[], CORBA::Environment &);
-  // Initializing the Collocation_Test object.
-
-  int parse_args (int argc, char *argv[]);
-  // Parse the test specific arguments.
-
-  int test_narrow (CORBA::Environment &);
-  // This test narrow an object reference to its base class and see
-  // if it works correctly.
-
-  int run (CORBA::Environment &);
-  // Run the test.
-
-private:
-  CORBA::ORB_var orb_;
-
-  PortableServer::POA_var root_poa_;
-
-  PortableServer::POAManager_var poa_manager_;
-
-  CORBA::Object_var diamond_obj_;
-  // Our basic test object.
-
-  Top_i top_servant_;
-  Left_i left_servant_;
-  Right_i right_servant_;
-  Buttom_i diamond_servant_;
-  // A collection of servant for basic narrowing test.
-};
-
-#endif /* TAO_COLLOCATION_TEST_H */
diff --git a/TAO/tests/Collocation/Collocation.dsp b/TAO/tests/Collocation/Collocation.dsp
deleted file mode 100644
index c067c93fa9e..00000000000
--- a/TAO/tests/Collocation/Collocation.dsp
+++ /dev/null
@@ -1,223 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Collocation" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Collocation - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Collocation.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Collocation.mak" CFG="Collocation - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Collocation - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Collocation - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Collocation - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ELSEIF  "$(CFG)" == "Collocation - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Collocation - Win32 Release"

-# Name "Collocation - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Coll_Tester.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Diamond_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DiamondC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DiamondS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\Coll_Tester.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Diamond_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DiamondC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DiamondS.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter "idl"

-# Begin Source File

-

-SOURCE=.\Diamond.idl

-

-!IF  "$(CFG)" == "Collocation - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__DIAMO="..\..\..\bin\release\tao_idl.exe"	

-# Begin Custom Build - Invoking tao_idl on $(InputName).idl

-InputPath=.\Diamond.idl

-InputName=Diamond

-

-BuildCmds= \

-	..\..\..\bin\release\tao_idl.exe -Ge 1 -Gd $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "Collocation - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__DIAMO="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking tao_idl on $(InputName).idl

-InputPath=.\Diamond.idl

-InputName=Diamond

-

-BuildCmds= \

-	..\..\..\bin\tao_idl.exe -Ge 1 -Gd $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Collocation/Collocation.dsw b/TAO/tests/Collocation/Collocation.dsw
deleted file mode 100644
index 52658fe3e58..00000000000
--- a/TAO/tests/Collocation/Collocation.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Collocation"=.\Collocation.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Collocation/Diamond.idl b/TAO/tests/Collocation/Diamond.idl
deleted file mode 100644
index 0e60b25c52c..00000000000
--- a/TAO/tests/Collocation/Diamond.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-module Diamond
-{
-  interface Top
-    {
-      string shape ();
-    };
-
-  interface Left : Top
-    {
-      string color ();
-    };
-
-  interface Right : Top
-    {
-      long width ();
-    };
-
-  interface Buttom : Left, Right
-    {
-      string name ();
-    };
-};
diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp
deleted file mode 100644
index c6ab3f9cd7f..00000000000
--- a/TAO/tests/Collocation/Diamond_i.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-
-#include "Diamond_i.h"
-
-Top_i::Top_i ()
-{
-  // no-op.
-}
-
-Top_i::~Top_i ()
-{
-  // No-op.
-}
-
-CORBA::String
-Top_i::shape (CORBA::Environment &)
-{
-  return CORBA::string_dup ("a point.");
-}
-
-Left_i::Left_i ()
-{
-  // No-op.
-}
-
-Left_i::~Left_i ()
-{
-  // No-op.
-}
-
-CORBA::String
-Left_i::shape (CORBA::Environment &)
-{
-  return CORBA::string_dup ("the left line");
-}
-
-CORBA::String
-Left_i::color (CORBA::Environment &)
-{
-  return CORBA::string_dup ("black");
-};
-
-Right_i::Right_i ()
-{
-  // no-op.
-}
-
-Right_i::~Right_i ()
-{
-  // no-op.
-}
-
-CORBA::String
-Right_i::shape (CORBA::Environment &)
-{
-  return CORBA::string_dup ("the right line");
-}
-
-CORBA::String
-Right_i::color (CORBA::Environment &)
-{
-  return CORBA::string_dup ("red");
-  //
-}
-
-CORBA::Long
-Right_i::width (CORBA::Environment &)
-{
-  return 0;
-}
-
-Buttom_i::Buttom_i ()
-{
-  // no-op.
-}
-
-Buttom_i::~Buttom_i ()
-{
-  // no-op.
-}
-
-CORBA::String
-Buttom_i::shape (CORBA::Environment &)
-{
-  return CORBA::string_dup ("a diamond");
-}
-
-CORBA::String
-Buttom_i::color (CORBA::Environment &)
-{
-  return CORBA::string_dup ("translucent");
-}
-
-CORBA::Long
-Buttom_i::width (CORBA::Environment &)
-{
-  return 100;
-}
-
-CORBA::String
-Buttom_i::name (CORBA::Environment &)
-{
-  return CORBA::string_dup ("Jubilee");
-}
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
deleted file mode 100644
index 7a0b0c403ff..00000000000
--- a/TAO/tests/Collocation/Diamond_i.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-
-#if !defined (TAO_DIAMOND_I_H)
-#define TAO_DIAMOND_I_H
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "DiamondS.h"
-
-class Top_i : public POA_Diamond::Top
-{
-public:
-  Top_i ();
-  ~Top_i ();
-  // Ctor and dtor.
-
-  virtual CORBA::String shape (CORBA::Environment &);
-  // Return the shape of this object (interface.)
-};
-
-class Left_i : public POA_Diamond::Left
-{
-public:
-  Left_i ();
-  ~Left_i ();
-  // Ctor, dtor.
-
-  virtual CORBA::String shape (CORBA::Environment &);
-  // Return the shape of this object (interface.)
-
-  virtual CORBA::String color (CORBA::Environment &);
-  // Return the color of this object (interface.)
-};
-
-class Right_i : public POA_Diamond::Right
-{
-public:
-  Right_i ();
-  ~Right_i ();
-  // Ctor, dtor.
-
-  virtual CORBA::String shape (CORBA::Environment &);
-  // Return the shape of this object (interface.)
-
-  virtual CORBA::String color (CORBA::Environment &);
-  // Return the color of this object (interface.)
-
-  virtual CORBA::Long width (CORBA::Environment &);
-  // Return the width of the stuff.
-};
-
-class Buttom_i : public POA_Diamond::Buttom
-{
-public:
-  Buttom_i ();
-  ~Buttom_i ();
-  // Ctor, dtor.
-
-  virtual CORBA::String shape (CORBA::Environment &);
-  // Return the shape of this object (interface.)
-
-  virtual CORBA::String color (CORBA::Environment &);
-  // Return the color of this object (interface.)
-
-  virtual CORBA::Long width (CORBA::Environment &);
-  // Return the width of the stuff.
-
-  virtual CORBA::String name (CORBA::Environment &);
-  // Return the name of the object.
-};
-#endif /* TAO_DIAMOND_I_H */
diff --git a/TAO/tests/Collocation/README b/TAO/tests/Collocation/README
deleted file mode 100644
index 400803cae87..00000000000
--- a/TAO/tests/Collocation/README
+++ /dev/null
@@ -1 +0,0 @@
-This program performs a series of sanity check on the collocation support in TAO.
diff --git a/TAO/tests/Collocation/main.cpp b/TAO/tests/Collocation/main.cpp
deleted file mode 100644
index 84ce376b7fc..00000000000
--- a/TAO/tests/Collocation/main.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-#include "Coll_Tester.h"
-
-ACE_RCSID(Collocation, main, "$Id$")
-
-int main (int argc, char *argv[])
-{
-  Collocation_Test coll_test;
-
-  ACE_TRY_NEW_ENV
-    {
-      coll_test.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      coll_test.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Uncaught exception: ");
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/Collocation/svc.conf b/TAO/tests/Collocation/svc.conf
deleted file mode 100644
index c278301c9bf..00000000000
--- a/TAO/tests/Collocation/svc.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# $Id$
-#
-# Please see $TAO_ROOT/docs/Options.html for details on these options.
-#
-
-# This is a single threaded "server."
-static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
-
-# Make sure we use RW client handler so if something goes wrong, the program will bloc,
-# i.e., won't work.
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
-
-# Not absolutely necessary for this test, but we add it for fun.
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
diff --git a/TAO/tests/Connection_Purging/Connection_Purging.cpp b/TAO/tests/Connection_Purging/Connection_Purging.cpp
deleted file mode 100644
index 0c345f244a9..00000000000
--- a/TAO/tests/Connection_Purging/Connection_Purging.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/Connection_Purging
-//
-// = FILENAME
-//     Connection_Purging.cpp
-//
-// = DESCRIPTION
-//     This program tests automatic purging in TAO.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//     Irfan Pyarali <irfan@cs.wustl.edu>
-//
-//=========================================================================
-
-#include "testS.h"
-#include "ace/Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/Handle_Gobbler.h"
-#include "ace/Get_Opt.h"
-
-struct arguments
-{
-  int argc;
-  char **argv;
-};
-
-struct Info
-{
-  CORBA::ORB_var orb;
-  PortableServer::POA_var root_poa;
-  CORBA::String_var ior;
-};
-
-static size_t keep_handles_available = 10;
-static size_t iterations = 20;
-static size_t remote_calls = 2;
-static Info *info = 0;
-static int debug = 0;
-static int go_to_next_orb = 0;
-
-class test_i : public POA_test
-{
-public:
-
-  test_i (void);
-
-  void method (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  size_t counter_;
-};
-
-test_i::test_i (void)
-  : counter_ (0)
-{
-}
-
-void
-test_i::method (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  go_to_next_orb = 1;
-
-  if (debug)
-    ACE_DEBUG ((LM_DEBUG,
-                "test_i::method() iteration = %d\n",
-                ++this->counter_));
-}
-
-class Server_Task : public ACE_Task_Base
-{
-public:
-
-  Server_Task (Info *info);
-  int svc (void);
-
-private:
-
-  Info *info_;
-};
-
-Server_Task::Server_Task (Info *info)
-  : info_ (info)
-{
-}
-
-int
-Server_Task::svc (void)
-{
-  for (size_t j = 0;
-       j < remote_calls;
-       ++j)
-    {
-      for (size_t i = 0;
-           i < iterations;
-           ++i)
-        {
-          while (!go_to_next_orb)
-            this->info_[i].orb->perform_work ();
-
-          go_to_next_orb = 0;
-        }
-    }
-
-  return 0;
-}
-
-static int
-parse_args (int argc,
-            char **argv)
-{
-  ACE_Get_Opt get_opts (argc, argv, "i:a:r:d");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'i':
-        iterations = ACE_OS::atoi (get_opts.optarg);
-        break;
-
-      case 'd':
-        debug = 1;
-        break;
-
-      case 'a':
-        keep_handles_available = atoi (get_opts.optarg);
-        break;
-
-      case 'r':
-        remote_calls = atoi (get_opts.optarg);
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s \n"
-                           "[-i iterations] \n"
-                           "[-d (debug)] \n"
-                           "[-a (keep handles available)] \n",
-                           "[-r (remote calls per server)] \n",
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-void
-setup_server_orbs (test_i &servant,
-                   int argc,
-                   char **argv)
-{
-  ACE_NEW (info,
-           Info[iterations]);
-
-  for (size_t i = 0;
-       i < iterations;
-       ++i)
-    {
-      int argc_copy = argc;
-      char **argv_copy = 0;
-
-      ACE_NEW (argv_copy,
-               char *[argc]);
-
-      int j = 0;
-
-      for (j = 0;
-           j < argc;
-           ++j)
-        argv_copy[j] = ACE_OS::strdup (argv[j]);
-
-      ACE_DECLARE_NEW_CORBA_ENV;
-
-      ACE_TRY
-        {
-          char orb_name[BUFSIZ];
-          ACE_OS::sprintf (orb_name,
-                           "%d",
-                           i);
-
-          // Initialize the ORB first.
-          info[i].orb = CORBA::ORB_init (argc_copy,
-                                         argv_copy,
-                                         orb_name,
-                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          for (j = 0;
-               j < argc;
-               ++j)
-            ACE_OS::free (argv_copy[j]);
-
-          delete[] argv_copy;
-
-          // Obtain the RootPOA.
-          CORBA::Object_var object = info[i].orb->resolve_initial_references ("RootPOA",
-                                                                              ACE_TRY_ENV);
-
-          // Get the POA_var object from Object_var.
-          info[i].root_poa =
-            PortableServer::POA::_narrow (object.in (),
-                                          ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // Get the POAManager of the RootPOA.
-          PortableServer::POAManager_var poa_manager =
-            info[i].root_poa->the_POAManager (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          poa_manager->activate (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          PortableServer::ObjectId_var id =
-            info[i].root_poa->activate_object (&servant,
-                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          object = info[i].root_poa->id_to_reference (id.in (),
-                                                      ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          info[i].ior =
-            info[i].orb->object_to_string (object.in (),
-                                           ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception in setting up servers");
-          ACE_ASSERT (0);
-        }
-      ACE_ENDTRY;
-    }
-}
-
-void
-setup_client_orb (CORBA::ORB_out client_orb,
-                  int argc,
-                  char **argv)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Initialize the client ORB first.
-      client_orb = CORBA::ORB_init (argc,
-                                    argv,
-                                    0,
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception in initializing client ORB");
-      ACE_ASSERT (0);
-    }
-  ACE_ENDTRY;
-}
-
-void
-invoke_remote_calls (CORBA::ORB_ptr client_orb)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      for (size_t j = 0;
-           j < remote_calls;
-           ++j)
-        {
-          for (size_t i = 0;
-               i < iterations;
-               ++i)
-            {
-              CORBA::Object_var object =
-                client_orb->string_to_object (info[i].ior.in (),
-                                              ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              test_var test_object =
-                test::_narrow (object.in (),
-                               ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              test_object->method (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-            }
-        }
-
-      for (size_t i = 0;
-           i < iterations;
-           ++i)
-        {
-          info[i].orb->shutdown (1,
-                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception in running client side");
-      ACE_ASSERT (0);
-    }
-  ACE_ENDTRY;
-}
-
-void
-cleanup (void)
-{
-  for (size_t i = 0;
-       i < iterations;
-       ++i)
-    {
-      ACE_DECLARE_NEW_CORBA_ENV;
-
-      ACE_TRY
-        {
-          info[i].root_poa->destroy (1,
-                                     1,
-                                     ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception in cleaning up");
-          ACE_ASSERT (0);
-        }
-      ACE_ENDTRY;
-    }
-
-  delete[] info;
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  int argc_copy = argc;
-  char **argv_copy = 0;
-
-  ACE_NEW_RETURN (argv_copy,
-                  char *[argc],
-                  -1);
-
-  int j = 0;
-
-  for (j = 0;
-       j < argc;
-       ++j)
-    argv_copy[j] = ACE_OS::strdup (argv[j]);
-
-  CORBA::ORB_var client_orb;
-
-  setup_client_orb (client_orb.out (),
-                    argc,
-                    argv);
-
-  int result = parse_args (argc,
-                           argv);
-  if (result != 0)
-    return result;
-
-  test_i servant;
-
-  setup_server_orbs (servant,
-                     argc_copy,
-                     argv_copy);
-
-  for (j = 0;
-       j < argc;
-       ++j)
-    ACE_OS::free (argv_copy[j]);
-
-  delete[] argv_copy;
-
-  Server_Task server_task (info);
-  result = server_task.activate (THR_BOUND);
-  ACE_ASSERT (result == 0);
-
-  // Consume all handles in the process, leaving us
-  // <keep_handles_available> to play with.
-  ACE_Handle_Gobbler handle_gobbler;
-  result = handle_gobbler.consume_handles (keep_handles_available);
-  ACE_ASSERT (result == 0);
-
-  invoke_remote_calls (client_orb.in ());
-
-  cleanup ();
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-// = Handle Gobbler
-template class ACE_Node<ACE_HANDLE>;
-template class ACE_Unbounded_Set<ACE_HANDLE>;
-template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-// = Handle Gobbler
-#pragma instantiate ACE_Node<ACE_HANDLE>
-#pragma instantiate ACE_Unbounded_Set<ACE_HANDLE>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Connection_Purging/Connection_Purging.dsp b/TAO/tests/Connection_Purging/Connection_Purging.dsp
deleted file mode 100644
index 4b100823c33..00000000000
--- a/TAO/tests/Connection_Purging/Connection_Purging.dsp
+++ /dev/null
@@ -1,201 +0,0 @@
-# Microsoft Developer Studio Project File - Name="POA Connection Purging" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=POA Connection Purging - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "Connection_Purging.mak".

-!MESSAGE

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "Connection_Purging.mak" CFG="POA Connection Purging - Win32 Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "POA Connection Purging - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "POA Connection Purging - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "POA Connection Purging - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "POA Connection Purging - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "POA Connection Purging - Win32 Release"

-# Name "POA Connection Purging - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Connection_Purging.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\testC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter "idl"

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "POA Connection Purging - Win32 Release"

-

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "POA Connection Purging - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Connection_Purging/Connection_Purging.dsw b/TAO/tests/Connection_Purging/Connection_Purging.dsw
deleted file mode 100644
index 684cbd0abfa..00000000000
--- a/TAO/tests/Connection_Purging/Connection_Purging.dsw
+++ /dev/null
@@ -1,28 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Connection_Purging"=.\Connection_Purging.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

diff --git a/TAO/tests/Connection_Purging/Makefile b/TAO/tests/Connection_Purging/Makefile
deleted file mode 100644
index 5c95c228dbe..00000000000
--- a/TAO/tests/Connection_Purging/Makefile
+++ /dev/null
@@ -1,843 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDL_SRC	= testC.cpp testS.cpp
-PROG_SRCS =	$(IDL_SRC) Connection_Purging.cpp
-
-LSRC = $(PROG_SRCS)
-
-SVR_OBJS = testC.o testS.o Connection_Purging.o
-
-BIN = Connection_Purging
-
-TAO_IDLFLAGS += -Ge 1
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-
-.PRECIOUS: testC.h testC.i testC.cpp testS.h testS.i testS.cpp testS_T.h testS_T.i testS_T.cpp
-
-Connection_Purging:	$(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) testC.* testS.* testS_T.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
-.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i
-.obj/Connection_Purging.o .obj/Connection_Purging.so .shobj/Connection_Purging.o .shobj/Connection_Purging.so: Connection_Purging.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Connection_Purging/run_test.pl b/TAO/tests/Connection_Purging/run_test.pl
deleted file mode 100755
index 784ea16d659..00000000000
--- a/TAO/tests/Connection_Purging/run_test.pl
+++ /dev/null
@@ -1,24 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-unshift @INC, '../../../bin';
-require Process;
-require ACEutils;
-
-$T = Process::Create ($EXEPREFIX."Connection_Purging".$EXE_EXT);
-
-$client = $T->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: test timedout\n";
-  $T->Kill (); $T->TimedWait (1);
-}
-
-if ($client == -1) {
-  exit 1;
-}
-
-exit 0;
diff --git a/TAO/tests/Connection_Purging/test.idl b/TAO/tests/Connection_Purging/test.idl
deleted file mode 100644
index dd1b063b9bf..00000000000
--- a/TAO/tests/Connection_Purging/test.idl
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-interface test
-{
-  void method ();
-};
diff --git a/TAO/tests/DynAny_Test/Makefile b/TAO/tests/DynAny_Test/Makefile
index 7d70a1135e3..de67c60ff1b 100644
--- a/TAO/tests/DynAny_Test/Makefile
+++ b/TAO/tests/DynAny_Test/Makefile
@@ -33,6 +33,9 @@ BASIC_TEST_OBJS = $(addsuffix .o, $(BASIC_TEST_FILES))
 SRC = $(addsuffix .cpp, $(BASIC_TEST_FILES))
 
 BIN = basic_test
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/tests/DynAny_Test/da_tests.idl b/TAO/tests/DynAny_Test/da_tests.idl
index 2afb3a9b13a..a3e8baa33ce 100644
--- a/TAO/tests/DynAny_Test/da_tests.idl
+++ b/TAO/tests/DynAny_Test/da_tests.idl
@@ -15,7 +15,7 @@ module DynAnyTests
   struct test_struct 
   {
     char c;
-    long l;
+    long long ll;
     enclosed_struct es;
   };
 
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp
index 30909fe33b2..7d37da22d9b 100644
--- a/TAO/tests/DynAny_Test/data.cpp
+++ b/TAO/tests/DynAny_Test/data.cpp
@@ -28,6 +28,7 @@ Data::Data (CORBA::ORB_var orb)
     m_ulong1 (123456),                          m_ulong2 (0),
     m_float1 (0.142857f),                       m_float2 (0.0f),
     m_double1 (3.14159),                        m_double2 (0.0),
+    m_longlong1 (-654321),                      m_longlong2 (0),
     m_ulonglong1 (654321),                      m_ulonglong2 (0),
     m_string1 (CORBA::string_dup ("upchuck")),  m_string2 (0),
 
diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h
index c16960a7c8a..f8059a691af 100644
--- a/TAO/tests/DynAny_Test/data.h
+++ b/TAO/tests/DynAny_Test/data.h
@@ -33,6 +33,7 @@ public:
   CORBA::ULong          m_ulong1,     m_ulong2;
   CORBA::Float          m_float1,     m_float2;
   CORBA::Double         m_double1,    m_double2;
+  CORBA::LongLong       m_longlong1,  m_longlong2;
   CORBA::ULongLong      m_ulonglong1, m_ulonglong2;
   CORBA::String         m_string1,    m_string2;
   CORBA::TypeCode_ptr   m_typecode1,  m_typecode2;
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 1d9e3dd7953..144f26fa7d5 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -46,7 +46,7 @@ Test_DynStruct::run_test (void)
 
   DynAnyTests::test_struct ts;
   ts.c = data.m_char2;
-  ts.l = data.m_long2;
+  ts.ll = data.m_longlong2;
   ts.es.f = data.m_float2;
   ts.es.s = data.m_short2;
 
@@ -67,7 +67,7 @@ Test_DynStruct::run_test (void)
       fa1->insert_char (data.m_char1,
                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      fa1->insert_long (data.m_long1,
+      fa1->insert_longlong (data.m_longlong1,
         ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa1->current_component (ACE_TRY_ENV)->insert_float (data.m_float1,
@@ -84,15 +84,14 @@ Test_DynStruct::run_test (void)
       ACE_TRY_CHECK;
       if (c != data.m_char1)
         ++this->error_count_;
-      CORBA::Long l = fa1->get_long (ACE_TRY_ENV);
+      CORBA::LongLong ll = fa1->get_longlong (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (l != data.m_long1)
+      if (ll != data.m_longlong1)
         ++this->error_count_;
       fa1->current_component(ACE_TRY_ENV)->seek (1,
                                                 ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::Short s = 
-        fa1->current_component (ACE_TRY_ENV)->get_short (ACE_TRY_ENV);
+      CORBA::Short s = fa1->current_component (ACE_TRY_ENV)->get_short (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (s != data.m_short1)
         ++this->error_count_;
@@ -108,7 +107,7 @@ Test_DynStruct::run_test (void)
                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
       ts.c = data.m_char1;
-      ts.l = data.m_long1;
+      ts.ll = data.m_longlong1;
       ts.es.f = data.m_float1;
       ts.es.s = data.m_short1;
       CORBA_Any in_any2;
diff --git a/TAO/tests/FL_Cube/Makefile b/TAO/tests/FL_Cube/Makefile
index dfce4c558dd..0c64e60b6c3 100644
--- a/TAO/tests/FL_Cube/Makefile
+++ b/TAO/tests/FL_Cube/Makefile
@@ -22,6 +22,10 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
 CLIENT_OBJS = client.o $(addsuffix .o, $(IDLFILES))
 SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
 
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/TAO/tests/Faults/Makefile b/TAO/tests/Faults/Makefile
index 52c48da55a7..6ed49d56258 100644
--- a/TAO/tests/Faults/Makefile
+++ b/TAO/tests/Faults/Makefile
@@ -22,6 +22,10 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
 CLIENT_OBJS = client.o test_i.o $(addsuffix .o, $(IDLFILES))
 SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
 
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/TAO/tests/Faults/client.dsp b/TAO/tests/Faults/client.dsp
index c6816e6bbb0..f002ca1ff4d 100644
--- a/TAO/tests/Faults/client.dsp
+++ b/TAO/tests/Faults/client.dsp
@@ -17,13 +17,12 @@ CFG=Faults Client - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Faults Client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Faults Client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Faults Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Faults Client - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -125,7 +124,6 @@ SOURCE=.\test.idl
 !IF  "$(CFG)" == "Faults Client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -164,7 +162,6 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "Faults Client - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

diff --git a/TAO/tests/Faults/server.dsp b/TAO/tests/Faults/server.dsp
index bed51cb6e16..d40a97bb6c3 100644
--- a/TAO/tests/Faults/server.dsp
+++ b/TAO/tests/Faults/server.dsp
@@ -17,13 +17,12 @@ CFG=Faults Server - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Faults Server - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Faults Server - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Faults Server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Faults Server - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -133,7 +132,6 @@ SOURCE=.\test.idl
 !IF  "$(CFG)" == "Faults Server - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -172,7 +170,6 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "Faults Server - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

diff --git a/TAO/tests/IDL_Test/IDL_Test.dsw b/TAO/tests/IDL_Test/IDL_Test.dsw
deleted file mode 100644
index 763edea3167..00000000000
--- a/TAO/tests/IDL_Test/IDL_Test.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "idl_test"=.\idl_test\idl_test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/IDL_Test/Makefile b/TAO/tests/IDL_Test/Makefile
deleted file mode 100644
index f26673eba2d..00000000000
--- a/TAO/tests/IDL_Test/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for IDL_Test examples
-#------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS  += -lTAO
-LDFLAGS += -L$(ACE_ROOT)/bin
-
-IDL_SRC =	anonymous		\
-		array			\
-		constants		\
-		enum_in_struct		\
-		generic_object		\
-		included		\
-		including		\
-		interface		\
-		keywords		\
-		sequence		\
-		typedef			\
-		union			\
-
-IDL_FILES = \
-        $(addsuffix S, $(IDL_SRC)) \
-        $(addsuffix C, $(IDL_SRC))
-
-IDL_TEST_FILES = $(IDL_FILES) main namespace_check
-
-IDL_TEST_OBJS = $(addsuffix .o, $(IDL_TEST_FILES))
-SRC = $(addsuffix .cpp, $(IDL_TEST_FILES))
-
-BIN = main
-
-TAO_IDLFLAGS += -Ge 1
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-CPPFLAGS += -I$(TAO_ROOT)
-
-.PRECIOUS: $(foreach file, $(IDL_SRC), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
-
-main:	$(addprefix $(VDIR),$(IDL_TEST_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean:	clean
-	-$(RM) $(foreach file, $(IDL_SRC), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
-
-
diff --git a/TAO/tests/IDL_Test/README b/TAO/tests/IDL_Test/README
deleted file mode 100644
index 90fa7e584ca..00000000000
--- a/TAO/tests/IDL_Test/README
+++ /dev/null
@@ -1,41 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    README
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-This test is a collection of IDL files that once caused IDL compiler
-or C++ compiler errors, plus a dummy main.cpp for the build. There is
-no execution check in this test, the only outcome of interest being
-the build. The examples in the IDL files come from many sources - some
-are made from scratch, some are adapted from other tests, and some are
-adapted from examples sent in by ACE and/or TAO users. To all of these
-last, many thanks for your help in digging out these bugs!
-
-Each IDL file contains examples that are related, either by the IDL
-type involved or by the context in which the error occurs. As new bugs
-are uncovered and fixed, new examples will be added to the suite, to
-ensure that the bugs do not recur.
-
-To build the test files, type 'make' at the command line. The TAO IDL
-compiler will open each IDL file in the directory and generate code
-that will then be compiled by the C++ compiler on your platform.
-
-To run the test, type 'main' at the command line.  A message will be
-output saying that the build had no errors. To test the client/server
-functionality of the various IDL types and operations, see the test
-suite in ACE_wrappers/TAO/tests/Param_Test.
-
-The generated code from reopened_modules.idl is not included in the
-Makefile per se. Platforms without namespaces cannot handle
-reopened modules, so reopened_modulesC.cpp and reopened_modulesS.cpp
-have been conditionally included in a file called namespace_check.cpp.
\ No newline at end of file
diff --git a/TAO/tests/IDL_Test/anonymous.idl b/TAO/tests/IDL_Test/anonymous.idl
deleted file mode 100644
index e0c966a08f6..00000000000
--- a/TAO/tests/IDL_Test/anonymous.idl
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    anonymous.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-// Normal typedef'd sequence
-module Not_Anon
-{
-  typedef sequence<short > short_seq;
-};
-
-// Array is typedef'd, but sequence is not
-module Half_Anon
-{
-  typedef sequence<char> char_seq_array[14];
-  typedef sequence<unsigned long, 18> bd_ulong_seq_array[17];
-  typedef sequence<unsigned short> ushort_seq_array[12];
-  typedef sequence<unsigned short, 7> bd_ushort_seq_array[11];
-};
-
-// Neither array nor sequence are typedef'd.
-module All_Anon
-{
-  exception Nested_Anon 
-  {
-    sequence<float> float_seq_array[6];
-  };
-};
diff --git a/TAO/tests/IDL_Test/array.idl b/TAO/tests/IDL_Test/array.idl
deleted file mode 100644
index 406a01c7b79..00000000000
--- a/TAO/tests/IDL_Test/array.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    array.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-// Multidimensional arrays - constant vigilance.
-typedef short TwoDArray[64][63];
-
-typedef short ThreeDArray[64][63][62];
-
-// This problem is a combination of two others
-// that have long been fixed, but you never know...
-
-typedef long inside_array[5];
-
-struct wrap
-  {
-    inside_array member;
-  };
-
-typedef wrap outside_array[10];
-
-
-// Once a problem with expressions in the brackets,
-// as well as the typedef'd/anonymous thing.
-
-interface tdef 
-{
-  const short byteslen = 12;
-  typedef octet Bytes[byteslen + 1];
-
-  struct bytes_or_longs 
-    {
-      Bytes the_bytes;	          // typedef'd
-      long Longs[byteslen];       // anonymous
-    }; 
-};
-
diff --git a/TAO/tests/IDL_Test/constants.idl b/TAO/tests/IDL_Test/constants.idl
deleted file mode 100644
index d8475df0fe2..00000000000
--- a/TAO/tests/IDL_Test/constants.idl
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    constants.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-
-const string all_escape = "\n\t\v\b\r\f\a\\\?\'\"";
-
-const char tick = '\'';
-
-const char backslash = '\\';
-
-// The escape sequences will display differently
-// depending on whether the platform uses signed
-// or unsigned chars, but either should build w/o
-// errors.
-
-// octal escape sequences
-
-const char oct_nought = '\000';
-const char lucky = '\7';
-const char square = '4';
-const char blastoff = '\321';
-const char max_char_oct = '\377';
-
-// hex escape sequences
-
-const char hex_nought ='\x0';
-const char fingers = '\xA';
-const char fortnight = '\xe';
-const char fivebits = '\x32';
-const char maybe_minus = '\xAf';
-const char max_char_hex = '\xff';
-
-// unsigned longs greater than LONG_MAX
-
-const unsigned long in_range = 3222111000;
-const unsigned long max_ulong_oct = 037777777777;
-const unsigned long max_ulong_hex = 0XFFFFFFFF;
-
-// various uncommon but legal formats for floats and doubles
-
-const float root_beer = .2;
-const double bogey = .2;
-const float trip = 2.;
-const double vision = .2e-4;
-const double take = 2e3;
-const double dip = 1.7976931348623157E+308;
-const double trouble = 2.2250738585072014E-308;
-
-
-
-
-
diff --git a/TAO/tests/IDL_Test/enum_in_struct.idl b/TAO/tests/IDL_Test/enum_in_struct.idl
deleted file mode 100644
index 07e309fe5b7..00000000000
--- a/TAO/tests/IDL_Test/enum_in_struct.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    enum_in_struct.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-// Tests for correct parsing and code generation for
-// both named and anonymous enums in a struct.
-
-enum UnNamed
-  {
-    UNNAMED_FIRST,
-    UNNAMED_SECOND,
-    UNNAMED_THIRD
-  };
-
-struct HoldsEnum
-{
-  enum Named 
-    { 
-      NAMED_FIRST, 
-      NAMED_SECOND, 
-      NAMED_THIRD 
-    } named_enum;
-
-  UnNamed unnamed_enum;
-};
-
diff --git a/TAO/tests/IDL_Test/generic_object.idl b/TAO/tests/IDL_Test/generic_object.idl
deleted file mode 100644
index c1f27021b97..00000000000
--- a/TAO/tests/IDL_Test/generic_object.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    generic_object.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-// The IDL compiler deals with these in a completely
-// different way that it deals with a derived object,
-// i.e., an interface.
-
-enum ObjectType 
-  {
-    THIS, 
-    THAT
-  };
-
-union Selecter switch (ObjectType) 
-  {
-    case THIS: Object this_object;
-    case THAT: Object that_object;
-  };
-
diff --git a/TAO/tests/IDL_Test/idl_test.dsp b/TAO/tests/IDL_Test/idl_test.dsp
deleted file mode 100644
index 3cf23b6c4ee..00000000000
--- a/TAO/tests/IDL_Test/idl_test.dsp
+++ /dev/null
@@ -1,638 +0,0 @@
-# Microsoft Developer Studio Project File - Name="idl_test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=idl_test - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "idl_test.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "idl_test.mak" CFG="idl_test - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "idl_test - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "idl_test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /out:"main.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "idl_test - Win32 Release"

-# Name "idl_test - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\anonymousC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\anonymousS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\arrayC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\arrayS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\constantsC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\constantsS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\enum_in_structC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\enum_in_structS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\generic_objectC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\generic_objectS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\includedC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\includedS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\includingC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\includingS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\interfaceC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\interfaceS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\keywordsC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\keywordsS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\reopened_modulesC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\reopened_modulesS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequenceC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequenceS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\typedefC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\typedefS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\unionC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\unionS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\anonymousC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\anonymousS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\arrayC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\arrayS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\constantsC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\constantsS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\enum_in_structC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\enum_in_structS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\generic_objectC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\generic_objectS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\includedC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\includedS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\includingC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\includingS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\interfaceC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\interfaceS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\keywordsC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\keywordsS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\reopened_modulesC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\reopened_modulesS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequenceC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequenceS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\typedefC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\typedefS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\unionC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\unionS.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\anonymousC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\arrayC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\constantsC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\enum_in_structC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\generic_objectC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\includedC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\includingC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\interfaceC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\keywordsC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\reopened_modulesC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequenceC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\typedefC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\unionC.i

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\anonymous.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__ANONY="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\anonymous.idl

-InputName=anonymous

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\array.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__ARRAY="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\array.idl

-InputName=array

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\constants.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__CONST="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\constants.idl

-InputName=constants

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\enum_in_struct.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__ENUM_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\enum_in_struct.idl

-InputName=enum_in_struct

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\generic_object.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__GENER="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\generic_object.idl

-InputName=generic_object

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\included.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__INCLU="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\included.idl

-InputName=included

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\including.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__INCLUD="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\including.idl

-InputName=including

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\interface.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__INTER="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\interface.idl

-InputName=interface

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\keywords.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__KEYWO="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\keywords.idl

-InputName=keywords

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\reopened_modules.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__REOPE="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\reopened_modules.idl

-InputName=reopened_modules

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequence.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__SEQUE="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\sequence.idl

-InputName=sequence

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\typedef.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__TYPED="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\typedef.idl

-InputName=typedef

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\union.idl

-

-!IF  "$(CFG)" == "idl_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "idl_test - Win32 Debug"

-

-USERDEP__UNION="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\union.idl

-InputName=union

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl $(InputName).idl

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/IDL_Test/included.idl b/TAO/tests/IDL_Test/included.idl
deleted file mode 100644
index 2b04e959bd6..00000000000
--- a/TAO/tests/IDL_Test/included.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    included.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-// Included in IDL file 'including.idl'.
-module A 
-{
-  typedef sequence<double> Seq1Type;
-};
-
diff --git a/TAO/tests/IDL_Test/including.idl b/TAO/tests/IDL_Test/including.idl
deleted file mode 100644
index dbce7a4b6be..00000000000
--- a/TAO/tests/IDL_Test/including.idl
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    including.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-#include "included.idl"
-
-// includes module A and sequence typedef.
-
-enum choice 
-{
-  dog
-};
-
-union myUnion switch (choice) 
-{
-  case dog: A::Seq1Type cat;
-};
-
diff --git a/TAO/tests/IDL_Test/interface.idl b/TAO/tests/IDL_Test/interface.idl
deleted file mode 100644
index 8df94baa61c..00000000000
--- a/TAO/tests/IDL_Test/interface.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    interface.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-
-
-// Used to be a problem in the get() and set() 
-// generated code.
-
-interface Base
-{
-  attribute long value;
-};
-
-interface Derived : Base
-{
-};
-
-// The fact that the interface begins with 'foo' was causing
-// problems. The IDL compiler thought the interface was in
-// foo's scope.
-module foo 
-{
-  struct date 
-    {
-	    short month;
-    };
-};
-
-interface foostep
-{
-  foo::date getDate ();
-};
-
-
diff --git a/TAO/tests/IDL_Test/keywords.idl b/TAO/tests/IDL_Test/keywords.idl
deleted file mode 100644
index d6b39c590ac..00000000000
--- a/TAO/tests/IDL_Test/keywords.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    keywords.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-// All these identifiers should be accepted, but
-// prepended with _cxx_.
-
-struct Keywords
-{
-  unsigned short or;
-  char or_eq;
-  octet private;
-  boolean protected;
-  float public;
-  double int;
-};
-
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
deleted file mode 100644
index 1528f78e6f5..00000000000
--- a/TAO/tests/IDL_Test/main.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    main.cpp
-//
-// = DESCRIPTION
-//    This test isn't for functionality, but only for IDL compiler
-//    and C++ compiler errors and warnings
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "ace/Log_Msg.h"
-
-int 
-main (int, char *[])
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "IDL_Test build completed without errors\n"
-              "Check compiler output for warnings\n"));
-
-  return 0;
-}
diff --git a/TAO/tests/IDL_Test/namespace_check.cpp b/TAO/tests/IDL_Test/namespace_check.cpp
deleted file mode 100644
index fa0ab1fc406..00000000000
--- a/TAO/tests/IDL_Test/namespace_check.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    namespace_check.cpp
-//
-// = DESCRIPTION
-//    Contains conditional include of reopened_modulesC.cpp
-//    and reopened_modulesS.cpp, for platforms without
-//    namespaces.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-
-#include "ace/OS.h"
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-#include "reopened_modulesC.cpp"
-#include "reopened_modulesS.cpp"
-
-#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/tests/IDL_Test/reopened_modules.idl b/TAO/tests/IDL_Test/reopened_modules.idl
deleted file mode 100644
index 8deff8308f5..00000000000
--- a/TAO/tests/IDL_Test/reopened_modules.idl
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    reopened_modules.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-// These examples test the lookup abilities of the
-// TAO IDL compiler, which must backtrack to find all
-// the possibly reopened scopes.
-
-module A 
-{
-  module B 
-  {
-    interface x1 {};
-  };
-};
-
-module A 
-{
-  module C 
-  {
-    interface x2 
-    {
-      // 'A::B::' should be implicit
-      void op1 (in x1 obj);
-      // 'A::' should be implicit
-      void op2 (in B::x1 obj);
-      // Just for reference
-      void op3 (in A::B::x1 obj);
-    };
-  };
-};
-
-// Each occurrence of Party and Person should be
-// recognized as being in the same scope as the
-// previous occurrence(s).
-
-module dot 
-{ 
-  interface Party;
-
-  interface Person 
-    {
-      attribute Party someParty;
-    };
-};
-
-module dot 
-{ 
-  interface Person;  
-   
-  interface Party 
-    {
-      attribute Person somePerson;
-    };
-};
-
-// Should be no problem in lookup of all the
-// arguments in Operation.
-module Outside
-{
-  module Reopened
-    {
-      typedef short Tricky;
-    };
-
-  typedef long Tricky;
-
-  module Reopened
-    {
-      typedef float Newdef;
-    };
-};
-
-interface OpHolder
-  {
-
-    void  Operation (in ::Outside::Tricky p1,
-                     out ::Outside::Reopened::Tricky p2,
-                     inout ::Outside::Reopened::Newdef p3);
-  };
-
diff --git a/TAO/tests/IDL_Test/sequence.idl b/TAO/tests/IDL_Test/sequence.idl
deleted file mode 100644
index 59c43b7f715..00000000000
--- a/TAO/tests/IDL_Test/sequence.idl
+++ /dev/null
@@ -1,41 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    sequence.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-
-// Bounded string elements of a sequence,
-// require the use of CORBA_Any::to_char.
-
-interface seqTest 
-{
-  typedef sequence< string<12> > dozens;
-
-  void send_dozen (inout dozens bouquets);
-};
-
-// CDR operator declarations and definitions 
-// for the sequences were getting generated
-// twice. Now there's an #if !defined guard
-// around them.
-struct twinStruct
-  {
-    sequence<short> and_;
-    sequence<short> or_;
-  };
diff --git a/TAO/tests/IDL_Test/typedef.idl b/TAO/tests/IDL_Test/typedef.idl
deleted file mode 100644
index c2e4ddad6de..00000000000
--- a/TAO/tests/IDL_Test/typedef.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    typedef.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-
-// Must keep unaliasing until all levels of typedef
-// are removed.
-
-typedef char A5[5];
-
-typedef A5 C5;
-
-typedef C5 G5;
-
-typedef G5 J5;
-
-typedef J5 M5[5];
-
-typedef M5 R5;
-
-typedef R5 V5;
-
- typedef V5 Z5[5];
-
-
diff --git a/TAO/tests/IDL_Test/union.idl b/TAO/tests/IDL_Test/union.idl
deleted file mode 100644
index fa2e4cb1607..00000000000
--- a/TAO/tests/IDL_Test/union.idl
+++ /dev/null
@@ -1,157 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    union.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
-
-
-// Implicit default case
-
-enum DataType
-{
-  dtEmpty,
-  dtLong,
-  dtShort
-};
-
-union Data switch (DataType)
-{
-  case dtLong: long longData;
-  case dtShort: short shortData;
-  // by default, empty union
-};
-
-// Explicit default case
-
-module Necessary 
-{
-  // It is important to have a module, in which 
-  // the following union is declared.
-
-  typedef long Result;
-
-  enum Kind
-    {
-      e_Result,
-      e_Unused
-    };
-
-  union WhichResult switch (Kind )
-    {   
-      case e_Result: Result  m_Result;
-      default: long m_Unused;
-    };
-};
-
-// Make sure that CORBA_Any::to_* is used everywhere.
-module UnionDiscTest
-  {
-   	union BooleanUnion switch (boolean) 
-      {
-      	case TRUE: string value;
-   		};
-
-    union CharUnion switch (char)
-      {
-        case 'a': string value;
-      };
-
-    union WCharUnion switch (wchar)
-      {
-        case 23: string value;
-      };
-	};
-
-
-// Nested unions
-
-enum disc1
-{
-  one,
-  two
-};
-
-enum disc2
-{
-  a,
-  b
-};
-
-enum disc_outer
-{
-  out1,
-  out2
-};
-
-union inner1 switch (disc1)
-{ 
-  case one: short s;
-  case two: long l;
-};
-
-union inner2 switch (disc2)
-{
-  case a: char c;
-  case b: long lng;
-};
-
-union outer switch (disc_outer)
-{
-  case out1: inner1 first;
-  case out2: inner2 second;
-};
-
-module UnionTest3 
-{
-   enum ValChoice 
-     {
-    	 intVal,
-    	 realVal
-   	 };
-
-   union ValType switch(ValChoice) 
-     {
-       case intVal: long integerValue;
-       case realVal: double realValue;
-   	 };
-
-   struct UpType 
-     {
-       ValType high;
-       ValType low;
-   	 };
-
-   struct DownType 
-     {
-       ValType high;
-       ValType low;
-   	 };
-
-   enum IndChoice 
-     {
-       up_Level,
-       down_Level
-   	 };
-
-   union IndType switch(IndChoice) 
-     {
-       case up_Level: UpType up;
-       case down_Level: DownType down;
-   	 };
-};
-
diff --git a/TAO/tests/IORManipulation/Makefile b/TAO/tests/IORManipulation/Makefile
index c784b23276e..0c2920195bd 100644
--- a/TAO/tests/IORManipulation/Makefile
+++ b/TAO/tests/IORManipulation/Makefile
@@ -23,6 +23,8 @@ SRC = $(PROG_SRCS)
 SIMPLE_CLT_OBJS = IORTest.o
 SIMPLE_SVR_OBJS = 
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = IORTest
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index ad61102c93f..29538e30303 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -7,8 +7,6 @@
 int
 main (int argc, char *argv[])
 {
-  int i = 0;
-
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -23,109 +21,68 @@ main (int argc, char *argv[])
         {
           ACE_DEBUG ((LM_DEBUG,
                       "No Name specified to be resolved\n"));
-          return -1;
+          return 0;
         }
 
-      CORBA::Object_var objref;
-
-      for (i = 1; i < argc; ++i)
-        { 
-          if (ACE_OS::strcmp (argv[i], "-l") == 0)
-            {
-              // List initial services
-              CORBA::ORB::ObjectIdList_var list =
-                orb->list_initial_services (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              size_t length = list->length ();
-
-              if (length > 0)
-                {
-                  ACE_DEBUG ((LM_INFO,
-                              "Listing initial references...\n"));
-
-                  for (size_t n = 0; n < length; ++n)
-                    {
-                      ACE_DEBUG ((LM_DEBUG,
-                                  "  Reference %u: %s\n",
-                                  n,
-                                  list[n].in ()));
-                    }
-                }
-              else
-                {
-                  // We should at least get TAO's initial references,
-                  // such as "RootPOA", "NameService", etc.
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "\n"
-                                     "No initial references. "
-                                     "This condition shouldn't happen.\n"),
-                                    -1);
-                }
-            }
-          else 
-            {
-              objref = orb->resolve_initial_references (argv[i], ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+      CORBA::Object_var objref =
+        orb->resolve_initial_references (argv[1], ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-              if (CORBA::is_nil (objref.in ()))
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   " (%P|%t) Unable to resolve the "
-                                   "given name.\n"),
-                                  -1);
+      if (CORBA::is_nil (objref.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to resolve the given Name.\n"),
+                          -1);
 
-              if (ACE_OS::strcmp (argv[i], "NameService") == 0)
-                {
-                  CosNaming::NamingContext_var naming_context =
-                    CosNaming::NamingContext::_narrow (objref.in (),
-                                                       ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
+      if (ACE_OS::strcmp (argv[1], "NameService") == 0)
+        {
+          CosNaming::NamingContext_var naming_context =
+            CosNaming::NamingContext::_narrow (objref.in (),
+                                               ACE_TRY_ENV);
+          ACE_TRY_CHECK;
               
-                  ACE_DEBUG ((LM_DEBUG,
-                              "Resolved IOR for %s : %s\n",
-                              argv[i],
-                              orb->object_to_string (naming_context.in ())));
+          ACE_DEBUG ((LM_DEBUG,
+                      "Resolved IOR for %s : %s\n",
+                      argv[1],
+                      orb->object_to_string (naming_context.in ())));
 
-                  // Sanity check to see if the reference to Naming
-                  // Context is alright.
-                  CosNaming::Name my_name;
-                  my_name.length (1);
-                  my_name[0].id = CORBA::string_dup ("ObjName");
+          // Sanity check to see if the reference to Naming
+          // Context is alright.
+          CosNaming::Name my_name;
+          my_name.length (1);
+          my_name[0].id = CORBA::string_dup ("ObjName");
 
-                  naming_context->bind (my_name,
-                                        objref.in (),
-                                        ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
+          naming_context->bind (my_name,
+                                objref.in (),
+                                ACE_TRY_ENV);
+          ACE_TRY_CHECK;
 
-                  ACE_DEBUG ((LM_DEBUG,
-                              "\nBind successful on the "
-                              "resolved Naming Context\n")); 
-                }
-              else
-                {
-                  INS_var server = INS::_narrow (objref.in (),
-                                                 ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
+          ACE_DEBUG ((LM_DEBUG,
+                      "\nBind successful on the resolved Naming Context\n"));
 
-                  ACE_DEBUG ((LM_DEBUG,
-                              "Resolved IOR for %s : %s\n",
-                              argv[i],
-                              orb->object_to_string (server.in ())));
+        }
+      else
+        {
+          INS_var server = INS::_narrow (objref.in (),
+                                         ACE_TRY_ENV);
+          ACE_TRY_CHECK;
 
-                  ACE_DEBUG ((LM_DEBUG,
-                              "\nResult of Remote Call : %s\n",
-                              server->test_ins (ACE_TRY_ENV)));
-                }
-            }
+          ACE_DEBUG ((LM_DEBUG,
+                      "Resolved IOR for %s : %s\n",
+                      argv[1],
+                      orb->object_to_string (server.in ())));
+
+          ACE_DEBUG ((LM_DEBUG,
+                      "\nResult of Remote Call : %s\n",
+                      server->test_ins (ACE_TRY_ENV)));
         }
     }
   ACE_CATCH (CORBA::ORB::InvalidName, name)
     {
-      ACE_DEBUG ((LM_DEBUG, "Cannot resolve <%s>\n", argv[i]));
+      ACE_DEBUG ((LM_DEBUG, "Cannot resolve <%s>\n", argv[1]));
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
     }
 
   ACE_ENDTRY;
diff --git a/TAO/tests/InterOp-Naming/Makefile b/TAO/tests/InterOp-Naming/Makefile
index ff9c367b390..cea11eedc21 100644
--- a/TAO/tests/InterOp-Naming/Makefile
+++ b/TAO/tests/InterOp-Naming/Makefile
@@ -24,7 +24,7 @@ PROG_SRCS = \
 	Server_i.cpp \
 	INS_test_server.cpp
 
-SRC = $(PROG_SRCS) $(IDL_SRCS)
+SRC = $(PROG_SRCS)
 
 SIMPLE_CLIENT_OBJS = \
 		INSC.o \
@@ -38,6 +38,14 @@ SIMPLE_SERVER_OBJS = \
 		Server_i.o \
 		INS_test_server.o
 
+BIN = \
+	INS_test_server \
+	INS_test_client
+
+BUILD = $(BIN)
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = \
 	INS_test_server \
         INS_test_client
@@ -198,13 +206,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/CDR.h \
@@ -238,6 +243,9 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
@@ -297,7 +305,6 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -459,13 +466,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/CDR.h \
@@ -499,6 +503,9 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
@@ -558,7 +565,6 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -697,9 +703,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
@@ -760,6 +763,9 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
@@ -819,7 +825,6 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -984,9 +989,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
@@ -1047,6 +1049,9 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
@@ -1106,7 +1111,6 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1184,523 +1188,5 @@ realclean: clean
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  INS_i.h INSS.h INSC.h INSC.i INSS_T.h INSS_T.i INSS_T.cpp INSS.i
-.obj/INSC.o .obj/INSC.so .shobj/INSC.o .shobj/INSC.so: INSC.cpp INSC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- INSC.i
-.obj/INSS.o .obj/INSS.so .shobj/INSS.o .shobj/INSS.so: INSS.cpp INSS.h INSC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- INSC.i INSS_T.h INSS_T.i INSS_T.cpp INSS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/InterOp-Naming/run_test.pl b/TAO/tests/InterOp-Naming/run_test.pl
index b0d6c6cc119..aec5fbe794e 100755
--- a/TAO/tests/InterOp-Naming/run_test.pl
+++ b/TAO/tests/InterOp-Naming/run_test.pl
@@ -96,31 +96,6 @@ if ($client == -1) {
   exit 1;
 }
 
-print STDERR "\n\n==== Multi endpoint test with "
-  . "CORBA::ORB::list_initial_services ()\n";
-
-$port1 = $port + 1;
-$port2 = $port + 2;
-
-$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
-                       " random_service "
-                       . " -l "
-                       . "-ORBInitRef random_service="
-                       . "iioploc://"
-                       . "localhost:$port1,"
-                       . "localhost:$port2,"
-                       . "localhost:$port"
-                       . "/object_name");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $SV->Kill (); $SV->TimedWait (1);
-  unlink $file;
-  exit 1;
-}
-
 print STDERR "\n\n==== Multi endpoint default ref test\n";
 
 $CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
diff --git a/TAO/tests/MT_Client/Makefile b/TAO/tests/MT_Client/Makefile
index b58ab075191..a5bc72b71be 100644
--- a/TAO/tests/MT_Client/Makefile
+++ b/TAO/tests/MT_Client/Makefile
@@ -24,6 +24,9 @@ SIMPLE_CLIENT_OBJS = simple-client.o $(addsuffix .o, $(IDLFILES))
 ORB_CREATION_OBJS = orb_creation.o $(addsuffix .o, $(IDLFILES))
 SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
 
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/TAO/tests/MT_Client/client_muxed.conf b/TAO/tests/MT_Client/client_muxed.conf
new file mode 100644
index 00000000000..05145bd0896
--- /dev/null
+++ b/TAO/tests/MT_Client/client_muxed.conf
@@ -0,0 +1,3 @@
+# $Id$
+
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler MT  -ORBTransportMuxStrategy MUXED"
diff --git a/TAO/tests/MT_Client/simple-client.conf b/TAO/tests/MT_Client/simple-client.conf
new file mode 100644
index 00000000000..ed5a9b0379e
--- /dev/null
+++ b/TAO/tests/MT_Client/simple-client.conf
@@ -0,0 +1,3 @@
+# $Id$
+
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
diff --git a/TAO/tests/MT_Server/Makefile b/TAO/tests/MT_Server/Makefile
index e2eac974d59..00f589d2d86 100644
--- a/TAO/tests/MT_Server/Makefile
+++ b/TAO/tests/MT_Server/Makefile
@@ -22,6 +22,10 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
 CLIENT_OBJS = client.o testC.o
 SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
 
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/TAO/tests/Multiple_Inheritance/Makefile b/TAO/tests/Multiple_Inheritance/Makefile
index fd1b4e6e910..0aff7171b7d 100644
--- a/TAO/tests/Multiple_Inheritance/Makefile
+++ b/TAO/tests/Multiple_Inheritance/Makefile
@@ -23,6 +23,9 @@ FILE_SVR_OBJS = Multiple_InheritanceC.o Multiple_InheritanceS.o server.o
 FILE_CLT_OBJS = Multiple_InheritanceC.o Multiple_InheritanceS.o client.o
 
 BIN = server client
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/tests/Native_Exceptions/Makefile b/TAO/tests/Native_Exceptions/Makefile
index 657d7554d69..dd400ff6429 100644
--- a/TAO/tests/Native_Exceptions/Makefile
+++ b/TAO/tests/Native_Exceptions/Makefile
@@ -21,6 +21,8 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
 
 CLIENT_OBJS = client.o testC.o
 SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 0
 
@@ -31,7 +33,7 @@ TAO_IDLFLAGS += -Ge 0
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 ifeq ($(exceptions),1)
-  BUILD = $(VBIN)
+  BUILD = $(BIN)
 else
 default:
 	@echo This directory only compiles if native exceptions are enabled!
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
index f4d17335375..e06656b0d9c 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
@@ -26,6 +26,7 @@ CLIENT_OBJS = MT_Client_TestS.o MT_Client_TestC.o \
 SERVER_OBJS = MT_Client_TestS.o MT_Client_TestC.o server.o \
         MT_Object_i.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 BIN = client server
 
 TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/tests/NestedUpcall/Simple/Makefile b/TAO/tests/NestedUpcall/Simple/Makefile
index 2191163e2e6..92d1ee7c5b5 100644
--- a/TAO/tests/NestedUpcall/Simple/Makefile
+++ b/TAO/tests/NestedUpcall/Simple/Makefile
@@ -23,6 +23,8 @@ NESTEDUPCALLS_CLT_OBJS = testS.o testC.o client.o client_i.o
 SRC = $(sort $(NESTEDUPCALLS_SVR_OBJS:.o=.cpp) \
              $(NESTEDUPCALLS_CLT_OBJS:.o=.cpp))
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN = server client
 
 TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 5cdfba0d2bf..b7ef73c460a 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -21,7 +21,7 @@ static int quiet = 0;
 static int number_of_threads = 1;
 // Number of client threads.
 
-class Client_Task : public ACE_Task_Base
+class Client_Task
 {
 public:
   Client_Task (client_ptr c,
@@ -169,17 +169,8 @@ main (int argc,
 
       Client_Task client_tasks (client_object.in (),
                                 server.in ());
-
-      result = client_tasks.activate (THR_BOUND,
-                                      number_of_threads);
-
-      if (result != 0)
-        return result;
-
-      result = ACE_Thread_Manager::instance ()->wait ();
-
-      if (result != 0)
-        return result;
+      
+      client_tasks.svc ();
 
       if (shutdown_server)
         {
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
new file mode 100644
index 00000000000..8cfa5b34760
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -0,0 +1,195 @@
+// $Id$
+
+#include "client_i.h"
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+
+ACE_RCSID(Simple, client, "$Id$")
+
+static const char *ior = "file://test.ior";
+// Server IOR.
+
+static int shutdown_server = 0;
+// Flag to tell server to shutdown.
+
+static CORBA::UShort call_count = 5;
+// # of nested calls to be made.
+
+static int quiet = 0;
+// The test is quiet...
+
+static int number_of_threads = 1;
+// Number of client threads.
+
+class Client_Task
+{
+public:
+  Client_Task (client_ptr c,
+               server_ptr s);
+  int svc (void);
+
+private:
+  client_var client_;
+  server_var server_;
+};
+
+Client_Task::Client_Task (client_ptr c,
+                          server_ptr s)
+  : client_ (client::_duplicate (c)),
+    server_ (server::_duplicate (s))
+{
+}
+
+int
+Client_Task::svc (void)
+{
+  ACE_TRY_NEW_ENV
+    {
+      if (!quiet)
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%t) Client_Task::svc calling start -> time to live = %d\n",
+                    call_count));
+
+      // Now, we can invoke an operation on the remote side.
+      this->server_->start (this->client_.in (),
+                            call_count,
+                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Client_Task::svc");
+      return -1;
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+static int
+parse_args (int argc,
+            char **argv)
+{
+  ACE_Get_Opt get_opts (argc, argv, "qxn:k:t:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'q':
+        quiet = 1;
+        break;
+
+      case 'x':
+        shutdown_server = 1;
+        break;
+
+      case 'n':
+        call_count = ACE_OS::atoi (get_opts.optarg);
+        break;
+
+      case 't':
+        number_of_threads = ACE_OS::atoi (get_opts.optarg);
+        break;
+
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-n number of nested calls]"
+                           " [-k ior]"
+                           " [-q (quite)]"
+                           " [-x (shutdown server)]"
+                           "\n",
+                           argv[0]),
+                          -1);
+      }
+
+  if (ior == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%s: no nested up calls server ior specified\n",
+                       argv[0]),
+                      -1);
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+int
+main (int argc,
+      char **argv)
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc,
+                                            argv,
+                                            0,
+                                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      int result = parse_args (argc,
+                               argv);
+      if (result != 0)
+        return result;
+
+      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA",
+                                                                  ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (object.in (),
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      object = orb->string_to_object (ior,
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server_var server = server::_narrow (object.in (),
+                                           ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Create an client object to hand to the other side...
+      client_i client_servant (quiet,
+                               server.in ());
+
+      client_var client_object = client_servant._this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Client_Task client_tasks (client_object.in (),
+                                server.in ());
+
+      client_tasks.svc ();
+
+
+      if (shutdown_server)
+        {
+          server->shutdown (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+
+      root_poa->destroy (1,
+                         1,
+                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "client::main");
+      return -1;
+    }
+  ACE_ENDTRY;
+  return 0;
+}
diff --git a/TAO/tests/NestedUpcall/Simple/svc.conf b/TAO/tests/NestedUpcall/Simple/svc.conf
index 659a3204439..abce93ca63f 100644
--- a/TAO/tests/NestedUpcall/Simple/svc.conf
+++ b/TAO/tests/NestedUpcall/Simple/svc.conf
@@ -1,5 +1,5 @@
 # $Id$
 #
 
-# static Resource_Factory "-ORBReactorType tp"
+static Resource_Factory "-ORBReactorType tp"
 # static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
index 9138ed75538..264f14450db 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Makefile
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
@@ -32,6 +32,9 @@ NESTEDUPCALLS_INITIATOR_OBJS = Triangle_TestS.o Triangle_TestC.o initiator.o \
 
 
 BIN = server_A server_B initiator
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/tests/OctetSeq/Makefile b/TAO/tests/OctetSeq/Makefile
index c2cb6c9b38c..c23e85d54c3 100644
--- a/TAO/tests/OctetSeq/Makefile
+++ b/TAO/tests/OctetSeq/Makefile
@@ -23,6 +23,10 @@ CLIENT_OBJS = client.o testC.o
 SERVER_OBJS = server.o test_i.o testC.o testS.o
 OCTETSEQ_OBJS = testC.o testS.o OctetSeq.o
 
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/tests/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl
index 2064ee23cdb..9e34f1807bf 100755
--- a/TAO/tests/OctetSeq/run_test.pl
+++ b/TAO/tests/OctetSeq/run_test.pl
@@ -17,7 +17,7 @@ unlink $file;
 
 $SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
                        "-o $file");
-if (ACE::waitforfile_timed ($file, 15) == -1) {
+if (ACE::waitforfile_timed ($file, 3) == -1) {
   print STDERR "ERROR: cannot find file <$file>\n";
   $SV->Kill (); $SV->TimedWait (1);
   exit 1;
diff --git a/TAO/tests/POA/Deactivation/Deactivation.cpp b/TAO/tests/POA/Deactivation/Deactivation.cpp
index 6dfd62612ff..7ad1cc18c93 100644
--- a/TAO/tests/POA/Deactivation/Deactivation.cpp
+++ b/TAO/tests/POA/Deactivation/Deactivation.cpp
@@ -56,7 +56,6 @@ test_i::deactivate_self (CORBA::Environment &ACE_TRY_ENV)
   ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete: signaling main thread and going to sleep\n"));
   int result = this->event_.signal ();
   ACE_ASSERT (result == 0);
-  ACE_UNUSED_ARG (result);
 
   ACE_OS::sleep (3);
   ACE_DEBUG ((LM_DEBUG, "(%t) test_i::deactivate_self complete\n"));
@@ -104,7 +103,6 @@ Activator::svc (void)
 
   int result = this->event_.wait ();
   ACE_ASSERT (result == 0);
-  ACE_UNUSED_ARG (result);
 
   ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete, trying to activate\n"));
 
@@ -250,11 +248,6 @@ main (int argc, char **argv)
 
       if (result != 0)
         return result;
-
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/POA/Deactivation/Deactivation.dsp b/TAO/tests/POA/Deactivation/Deactivation.dsp
index 6a4cc20767b..9fefded390f 100644
--- a/TAO/tests/POA/Deactivation/Deactivation.dsp
+++ b/TAO/tests/POA/Deactivation/Deactivation.dsp
@@ -127,9 +127,6 @@ InputName=test
 BuildCmds= \

 	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

 "$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

@@ -165,9 +162,6 @@ InputName=test
 BuildCmds= \

 	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

 "$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

diff --git a/TAO/tests/POA/Deactivation/Makefile b/TAO/tests/POA/Deactivation/Makefile
index a2bb08922fc..2844b446fcd 100644
--- a/TAO/tests/POA/Deactivation/Makefile
+++ b/TAO/tests/POA/Deactivation/Makefile
@@ -22,6 +22,9 @@ LSRC = $(PROG_SRCS)
 SVR_OBJS = testC.o testS.o Deactivation.o
 
 BIN = Deactivation
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/tests/POA/Destruction/Destruction.dsp b/TAO/tests/POA/Destruction/Destruction.dsp
index 41a7150097b..91229796573 100644
--- a/TAO/tests/POA/Destruction/Destruction.dsp
+++ b/TAO/tests/POA/Destruction/Destruction.dsp
@@ -7,19 +7,19 @@
 CFG=POA Destruction - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "Destruction.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "Destruction.mak" CFG="POA Destruction - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "POA Destruction - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "POA Destruction - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -76,7 +76,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -119,7 +119,7 @@ SOURCE=.\test.idl
 

 !IF  "$(CFG)" == "POA Destruction - Win32 Release"

 

-USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"

+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

 InputPath=.\test.idl

 InputName=test

@@ -127,9 +127,6 @@ InputName=test
 BuildCmds= \

 	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

 "$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

@@ -157,7 +154,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "POA Destruction - Win32 Debug"

 

-USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"

+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

 InputPath=.\test.idl

 InputName=test

@@ -165,9 +162,6 @@ InputName=test
 BuildCmds= \

 	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

 "$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

@@ -193,7 +187,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/POA/Destruction/Makefile b/TAO/tests/POA/Destruction/Makefile
index ccd61a6e377..842113c2e06 100644
--- a/TAO/tests/POA/Destruction/Makefile
+++ b/TAO/tests/POA/Destruction/Makefile
@@ -22,6 +22,9 @@ LSRC = $(PROG_SRCS)
 SVR_OBJS = testC.o testS.o Destruction.o
 
 BIN = Destruction
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index 57913c03d45..0018fd2917c 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -178,7 +178,6 @@ test_poas (CORBA::ORB_ptr orb,
 
     ACE_ASSERT (servant_from_reference == servant_from_id);
     ACE_ASSERT (servant_from_reference == &servant);
-    ACE_UNUSED_ARG (servant_from_id);
 
     obj = root_poa->servant_to_reference (&servant,
                                           ACE_TRY_ENV);
@@ -303,7 +302,6 @@ test_poas (CORBA::ORB_ptr orb,
 
     ACE_ASSERT (servant_from_reference == servant_from_id);
     ACE_ASSERT (servant_from_reference == &servant);
-    ACE_UNUSED_ARG (servant_from_id);
 
     first_poa->deactivate_object (id.in (),
                                   ACE_TRY_ENV);
@@ -403,7 +401,6 @@ test_poas (CORBA::ORB_ptr orb,
 
     ACE_ASSERT (servant_from_reference == servant_from_id);
     ACE_ASSERT (servant_from_reference == &servant);
-    ACE_UNUSED_ARG (servant_from_id);
 
     obj = second_poa->servant_to_reference (&servant,
                                             ACE_TRY_ENV);
@@ -535,7 +532,6 @@ test_poas (CORBA::ORB_ptr orb,
 
     ACE_ASSERT (servant_from_reference == servant_from_id);
     ACE_ASSERT (servant_from_reference == &servant);
-    ACE_UNUSED_ARG (servant_from_id);
 
     obj = third_poa->servant_to_reference (&servant,
                                            ACE_TRY_ENV);
@@ -637,7 +633,6 @@ test_poas (CORBA::ORB_ptr orb,
 
     ACE_ASSERT (servant_from_reference == servant_from_id);
     ACE_ASSERT (servant_from_reference == &servant);
-    ACE_UNUSED_ARG (servant_from_id);
 
     forth_poa->deactivate_object (id.in ());
 
diff --git a/TAO/tests/POA/Identity/Makefile b/TAO/tests/POA/Identity/Makefile
index d6cfeefe12b..f6ec39af176 100644
--- a/TAO/tests/POA/Identity/Makefile
+++ b/TAO/tests/POA/Identity/Makefile
@@ -16,6 +16,9 @@ LSRC = $(PROG_SRCS)
 PROG_OBJS = testC.o testS.o Identity.o
 
 BIN = Identity
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile
index 81f8ce28f38..bbc3771b021 100644
--- a/TAO/tests/Param_Test/Makefile
+++ b/TAO/tests/Param_Test/Makefile
@@ -66,6 +66,9 @@ SRC	= $(addsuffix .cpp,$(SVR_FILES)) \
 	  $(addsuffix .cpp,$(CLI_FILES))
 
 BIN = server client
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index d0600e98bd3..e4f090486cb 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -201,8 +201,7 @@ Param_Test_Client<T>::run_dii_test (void)
 
       // then the result holder (length 1 because value is *replaced*)
       CORBA::NVList_var retval;
-      this->orb_->create_list (1, 
-                               retval.out ());
+      this->orb_->create_list (1, retval.out ());
 
       // create the request
       CORBA::Request_var req;
@@ -237,7 +236,7 @@ Param_Test_Client<T>::run_dii_test (void)
             ACE_DEBUG ((LM_DEBUG, "\n****** Before call values *****\n"));
 
           // Make the invocation, verify the result.
-          this->test_object_->dii_req_invoke (req.in (), 
+          this->test_object_->dii_req_invoke (req, 
                                               ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
diff --git a/TAO/tests/Param_Test/param_test.idl b/TAO/tests/Param_Test/param_test.idl
index 03ca97d8990..e2dfaa130d2 100644
--- a/TAO/tests/Param_Test/param_test.idl
+++ b/TAO/tests/Param_Test/param_test.idl
@@ -162,11 +162,8 @@ interface Param_Test
   // variable structures
   struct Var_Struct
   {
-    double dbl;
     DUMMY dummy1;
-    boolean boole;
     DUMMY dummy2;
-    short shrt;
     StrSeq seq;
   };
 
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 46a30199b51..ac068c3b6af 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -38,7 +38,7 @@ Coffee_i::description (CORBA::Environment & /*env*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Coffee::Desc *desc = new Coffee::Desc;
-  desc->name = CORBA::string_dup (this->name_.in ());
+  desc->name = CORBA::string_dup (this->name_);
   return desc;
 }
 
@@ -805,13 +805,7 @@ Param_Test_i::test_exception (CORBA::ULong s1,
   else if (d == 1)
       ACE_THROW_RETURN (Param_Test::Ooops (CORBA::string_dup (" % 3 == 1"), s1), 0);
 
-  // This will avoid the compiler
-  // warning that test_exception is throwing an exception
-  // not in its THROW_SPEC, but still test TAO's 
-  // conversion of such an exception to UNKNOWN.
-  this->throw_badboy (ACE_TRY_ENV);
-
-  return 0;
+  ACE_THROW_RETURN (Param_Test::BadBoy (), 0);
 }
 
 Param_Test::Big_Union*
@@ -864,9 +858,3 @@ Param_Test_i::shutdown (CORBA::Environment &)
 {
   this->orb_->shutdown ();
 }
-
-void
-Param_Test_i::throw_badboy (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (Param_Test::BadBoy ());
-}
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 41d0e0609c2..cdf667e8d9a 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -288,12 +288,6 @@ private:
 
   Coffee_i obj_;
   // the coffee object reference we maintain
-
-  void throw_badboy (CORBA::Environment &ACE_TRY_ENV);
-  // Called by test_exception. This will avoid the compiler
-  // warning that test_exception is throwing an exception
-  // not in its THROW_SPEC, but still test TAO's 
-  // conversion of such an exception to UNKNOWN.
 };
 
 #endif /* PARAM_TEST_I_H */
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index 780906e3949..a234def7fb9 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -24,11 +24,12 @@ sub run_test
 
   unlink $iorfile; # Ignore errors
   print STDERR "==== Testing $type === wait....\n";
+  sleep 2;
 
   $SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
                          "$debug -o $iorfile");
 
-  if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
@@ -44,7 +45,7 @@ sub run_test
     $CL->Kill (); $CL->TimedWait (1);
   }
 
-  $server = $SV->TimedWait (10);
+  $server = $SV->TimedWait (2);
   if ($server == -1) {
     print STDERR "ERROR: server timedout\n";
     $SV->Kill (); $SV->TimedWait (1);
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 5104f3bcdd1..18fa4936abe 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -63,12 +63,9 @@ Test_Var_Struct::init_parameters (Param_Test_ptr ,
   // get some sequence length (not more than 10)
   CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1;
 
-  this->in_.dbl = 3.14159;
+  // set the length of the sequence
   this->in_.dummy1 = gen->gen_string ();
-  this->in_.boole = gen->gen_short () % 2;
   this->in_.dummy2 = gen->gen_string ();
-  this->in_.shrt = gen->gen_short ();
-  // set the length of the sequence
   this->in_.seq.length (len);
   // now set each individual element
   for (CORBA::ULong i=0; i < this->in_.seq.length (); i++)
@@ -181,21 +178,12 @@ CORBA::Boolean
 Test_Var_Struct::check_validity (void)
 {
   CORBA::Boolean flag = 0;
-  if (this->in_.dbl == this->inout_->dbl &&
-      this->in_.dbl == this->out_->dbl &&
-      this->in_.dbl == this->ret_->dbl &&
-      (!ACE_OS::strcmp (this->in_.dummy1, this->inout_->dummy1)) &&
+  if ((!ACE_OS::strcmp (this->in_.dummy1, this->inout_->dummy1)) &&
       (!ACE_OS::strcmp (this->in_.dummy1, this->out_->dummy1)) &&
       (!ACE_OS::strcmp (this->in_.dummy1, this->ret_->dummy1)) &&
-      this->in_.boole == this->inout_->boole &&
-      this->in_.boole == this->out_->boole &&
-      this->in_.boole == this->ret_->boole &&
       (!ACE_OS::strcmp (this->in_.dummy2, this->inout_->dummy2)) &&
       (!ACE_OS::strcmp (this->in_.dummy2, this->out_->dummy2)) &&
       (!ACE_OS::strcmp (this->in_.dummy2, this->ret_->dummy2)) &&
-      this->in_.shrt == this->inout_->shrt &&
-      this->in_.shrt == this->out_->shrt &&
-      this->in_.shrt == this->ret_->shrt &&
       (this->in_.seq.length () == this->inout_->seq.length ()) &&
       (this->in_.seq.length () == this->out_->seq.length ()) &&
       (this->in_.seq.length () == this->ret_->seq.length ()))
diff --git a/TAO/tests/Quoter/FactoryFinder.exe b/TAO/tests/Quoter/FactoryFinder.exe
deleted file mode 100755
index 2d5a2b39e7a..00000000000
--- a/TAO/tests/Quoter/FactoryFinder.exe
+++ /dev/null
diff --git a/TAO/tests/Quoter/ns.btm b/TAO/tests/Quoter/ns.btm
deleted file mode 100644
index ebe5b49ad5d..00000000000
--- a/TAO/tests/Quoter/ns.btm
+++ /dev/null
@@ -1,4 +0,0 @@
-set nsiorfile=%temp%\qns_ior
-REM Naming Service must have been built or else this will fail
-start "Naming Service" /K ..\..\orbsvcs\Naming_Service\Naming_Service.exe -ORBport 10042 -ORBobjrefstyle url -o %nsiorfile
-
diff --git a/TAO/tests/Quoter/run_test.btm b/TAO/tests/Quoter/run_test.btm
deleted file mode 100644
index a0e2ed1be86..00000000000
--- a/TAO/tests/Quoter/run_test.btm
+++ /dev/null
@@ -1,161 +0,0 @@
-@echo off
-
-REM This is a 4NT Batch file.  To use, just type run_test and it will start the 
-REM server, wait for a second, and then start the client.  At the end, it will
-REM clean up.  
-
-setlocal
-
-set nsiorfile=%temp%\qns_ior
-set del=2
-
-REM variables for parameters
-
-set nsport=20002
-set clport=20003
-set svport=20004
-set ffport=20005
-set lcport=20006
-set gfport=20007
-set n=1
-set leave=/C
-set ior=0
-set done=
-
-:get_args
-
-if %1 == /h goto is_h
-if %1 == /? goto is_h
-goto no_h
-:is_h
-echo run_test [/n num] [/leave] [/h] [/ns, /sv, /ff, /cl, /gf]
-echo.
-echo /n num              -- runs the client num times
-echo /leave              -- leaves the servers running and their windows open
-echo /h                  -- prints this information
-echo /ns /sv /ff /cl /gf -- Runs only one of the executables
-quit
-:no_h
-
-if not %1 == /ns goto no_ns
-set done=quit
-goto run_name_server
-:no_ns
-
-if not %1 == /sv goto no_sv
-set done=quit
-goto run_server
-:no_sv
-
-if not %1 == /ff goto no_ff
-set done=quit
-goto run_finder
-:no_ff
-
-if not %1 == /lc goto no_lc
-set done=quit
-goto run_lifecycle_service
-:no_lc
-
-if not %1 == /gf goto no_gf
-set done=quit
-goto run_generic_factory
-:no_gf
-
-
-if not %1 == /cl goto no_cl
-set done=quit
-goto run_client
-:no_cl
-
-if not %1 == /n goto no_n
-set n=%2
-shift
-shift
-goto get_args
-:no_n
-
-if not %1 == /leave goto no_leave
-set leave=/K
-shift
-goto get_args
-:no_leave
-
-:run_name_server
-REM Naming Service must have been built or else this will fail
-start "Naming Service" %leave ..\..\orbsvcs\Naming_Service\Naming_Service.exe -ORBport %nsport -ORBobjrefstyle url -o %nsiorfile
-rem -ORBnameserviceior %temp\qns_ior
-
-%done
-
-REM Delay some to let the Naming Service get set up
-DELAY %del
-
-:run_server
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the server
-start "Quoter Server" %leave server.exe -ORBport %svport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf server.conf 
-
-%done
-
-REM Delay some to let the server get set up
-DELAY %del
-
-:run_finder
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the factory finder
-start "Quoter Factory Finder" %leave Factory_Finder.exe -ORBport %ffport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf svc.conf
-
-%done
-
-REM Delay some to let the Factory Finder get set up
-DELAY %del
-
-:run_lifecycle_service
-REM read in the IOR from the file
-REM for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the Lifecycle Service
-REM start "Quoter LifeCycle Service" %leave LifeCycle_Service.exe -ORBport %lcport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf svc.conf
-
-%done
-
-REM Delay some to let the LifeCycle Service get set up
-REM DELAY %del
-
-:run_generic_factory
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the factory finder
-start "Quoter Generic Factory" %leave Generic_Factory.exe -ORBport %gfport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf svc.conf
-
-
-%done
-
-REM Delay some to let the Generic Factory get set up
-DELAY %del
-
-:run_client
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM And now start the client
-for /l %x in (1,1,%n) do client.exe -ORBobjrefstyle url -ORBport %clport -ORBnameserviceior %ior -ORBsvcconf client.conf
-
-%done
-
-REM We don't really need to delete this
-REM del %temp%\qns_ior
-
-REM Remove any running servers
-if %leave==/C activate "Naming Service" CLOSE
-if %leave==/C activate "Quoter Server" CLOSE
-if %leave==/C activate "Quoter Factory Finder" CLOSE
-if %leave==/C activate "Quoter Generic Factory" CLOSE
-
-endlocal
\ No newline at end of file
diff --git a/TAO/tests/Quoter/sv.btm b/TAO/tests/Quoter/sv.btm
deleted file mode 100644
index dff9cf19039..00000000000
--- a/TAO/tests/Quoter/sv.btm
+++ /dev/null
@@ -1,7 +0,0 @@
-set nsiorfile=%temp%\qns_ior
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the server
-echo %ior
-start "Quoter Server" /k Quoter_Server.exe -ORBport 10041 -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf server.conf 
diff --git a/TAO/tests/Timeout/Makefile b/TAO/tests/Timeout/Makefile
index 2a6b916660d..f0bb165b98f 100644
--- a/TAO/tests/Timeout/Makefile
+++ b/TAO/tests/Timeout/Makefile
@@ -22,6 +22,9 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
 CLIENT_OBJS = client.o $(addsuffix .o, $(IDLFILES))
 SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
 
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/TAO/tests/Xt_Stopwatch/Makefile b/TAO/tests/Xt_Stopwatch/Makefile
index 99320af2706..c9bd693f131 100644
--- a/TAO/tests/Xt_Stopwatch/Makefile
+++ b/TAO/tests/Xt_Stopwatch/Makefile
@@ -22,6 +22,10 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i Stopwatch_display Control time
 CLIENT_OBJS = client.o Control.o testC.o
 SERVER_OBJS = server.o test_i.o Stopwatch_display.o timer.o $(addsuffix .o, $(IDLFILES))
 
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/TAO/utils/IOR-parser/Makefile b/TAO/utils/IOR-parser/Makefile
index 979a79a7ebd..cc079ef9b76 100644
--- a/TAO/utils/IOR-parser/Makefile
+++ b/TAO/utils/IOR-parser/Makefile
@@ -15,6 +15,8 @@ FILES  	= ior-handler
 SRC   	= $(addsuffix .cpp,$(FILES))
 OBJ	= $(addsuffix .o,$(FILES))
 
+BUILD	= $(VBIN)
+
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/utils/catior/Makefile b/TAO/utils/catior/Makefile
index e4074f475b4..35ecd73391e 100644
--- a/TAO/utils/catior/Makefile
+++ b/TAO/utils/catior/Makefile
@@ -18,6 +18,8 @@ BIN   	= catior
 
 SRC= catior.cpp
 
+BUILD	= $(VBIN)
+
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/utils/nslist/Makefile b/TAO/utils/nslist/Makefile
index 473a17e5a12..3c6a59441b4 100644
--- a/TAO/utils/nslist/Makefile
+++ b/TAO/utils/nslist/Makefile
@@ -19,6 +19,8 @@ BIN2	= nslist
 
 SRC	= nslist.cpp
 
+BUILD	= $(VBIN)
+
 TAO_IDLFLAGS += -Ge 1
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
diff --git a/TAO/version_tests.dsw b/TAO/version_tests.dsw
index 3bd77c4ca88..c8e2e47b8bc 100644
--- a/TAO/version_tests.dsw
+++ b/TAO/version_tests.dsw
@@ -210,36 +210,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Cached_Conn_Test"=..\tests\Cached_Conn_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Cached_Accept_Conn_Test"=..\tests\Cached_Accept_Conn_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

 Project: "Callback Quoter Consumer"=.\examples\Callback_Quoter\Consumer.dsp - Package Owner=<4>

 

 Package=<5>

@@ -867,21 +837,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Hash_Map_Bucket_Iterator_Test"=..\tests\Hash_Map_Bucket_Iterator_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

 Project: "High_Res_Timer_Test"=..\tests\High_Res_Timer_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -1461,48 +1416,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Nested Upcall Simple Client"=.\tests\NestedUpcall\Simple\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Nested Upcall Simple Server"=.\tests\NestedUpcall\Simple\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

 Project: "Nested Upcall MT_Client Client"=.\tests\NestedUpcall\MT_Client_Test\client.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/THANKS b/THANKS
index cfe92613b4f..d358f3d3b3c 100644
--- a/THANKS
+++ b/THANKS
@@ -23,7 +23,6 @@ Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
 Fred Kuhns <fredk@cs.wustl.edu>
 David Levine <levine@cs.wustl.edu>
 Mike Moran <mm4@cs.wustl.edu>
-Sumedh Mungee <sumedh@cs.wustl.edu>
 Balachandran Natarajan <bala@cs.wustl.edu>
 Kirthika Parameswaran <kirthika@cs.wustl.edu>
 Carlos O'Ryan <coryan@cs.wustl.edu>
@@ -79,6 +78,7 @@ Chandra Venkatapathy <cvenkat@develop.bsis.com>
 Matt Stevens <mstevens@kirk.softeng.infonautics.com>
 Bob Vistica <robertv@ims.com>
 David Trumble <trumble@cvg.enet.dec.com>
+John Morey <jmorey@crl.com>
 George Reynolds <george@dvcorp.com>
 Hans Rohnert <hans.rohnert@mchp.siemens.de>
 Alex V. Maclinovsky <alexm@teltrunk1.tait.co.nz>
@@ -314,7 +314,7 @@ Achint Sandhu <sandhu@nortel.ca>
 Mitch Kuninsky <Mitch_Kuninsky@avid.com>
 Alex Chan <Alex.Chan@Aspect.com>
 Jeff Hellzen <JHellzen@hwdcsaws.cahwnet.gov>
-Thomas Venturella <thomas.e.venturella@boeing.com>
+Thomas Venturella <tventurell@mdc.com>
 Philippe O'Reilly <philippe@robot.ireq.ca>
 Stan Leeson <STANLEY.D.LEESON@cdev.com>
 Richard Keizer <RICHARD.L.KEIZER@cdev.com>
@@ -387,7 +387,7 @@ Johan Lundin <johan@lundin.com>
 Eric Powers <powerg@deltanet.com>
 Zheng Han <zhan@glenvan.glenayre.com>
 Gabriel Lima <gali@enea.se>
-Doug Anderson <dla@home.com>
+Doug Anderson <doug@clark.net>
 Hongyin Quan <hq1@arl.wustl.edu>
 Maximilian Hoferer <mhoferer@krones.de>
 Kevin Stanley <kstanley1@mdc.com>
@@ -484,7 +484,7 @@ Jon Lindgren <jlindgren@SLK.com>
 Steve Vinoski <vinoski@iona.com>
 Christian Mueffling <cvm@aiss.de>
 Victor Yu <victor.yu@computechnics.com.au>
-Jeff Donner <JDonner@schedsys.com>
+Jeff Donner's <JDonner@schedsys.com>
 Joe Loyall <jloyall@bbn.com>
 Stanislav Meduna <stanom@etm.co.at>
 Christian Korn <korn@gate.qaqa.com>
@@ -592,6 +592,7 @@ Dave Steele <Dave_Steele@Mitel.COM>
 Simeon Simeonov <simeons@allaire.com>
 David H. Whittington <david.h.whittington@boeing.com>
 Ian MacDonald <ianmacd@bg.com>
+Rene Matteau <matteau@ca.ibm.com>
 Hans Ridder <ridder@veritas.com>
 Todd Mullanix <Todd.Mullanix@sylantro.com>
 Hai Vu <Hai_Vu@Mitel.Com>
@@ -673,36 +674,12 @@ John Chludzinski <john_chludzinski@jsims.com>
 Pedro Alves Ferreira <pedro.ferreira@inescn.pt>
 Bruce Edge <bedge@sattel.com>
 Dan Butler <daniel.g.butler@boeing.com>
-Ron MacKenzie <ronm@SLAC.Stanford.EDU>
-Craig Rodrigues <rodrigc@mediaone.net>
-Surovegin Eugene <Surovegin@SoftLab.RU>
-Phil Y. Wang <yhwang@cs.columbia.edu>
-David Brock <dbrock@mail.arc.nasa.gov>
-John Morey <jmorey@tbi.com>
-Dwayne Burns <dburns@isrglobal.com>
-Denis Ouellet <douellet@gel.ulaval.ca>
-Stefan Ullrich <SUllrich@Heimannsystems.com>
-Brian Raven <brianr@liffe.com>
-Gheorghe Aprotosoaie <gaprotosoaie@paragonms.com>
-Roger Egbers <regbers@isrglobal.com>
-Carsten Zerbst <zerbst@tu-harburg.de>
-Paul Calabrese <calabrese_p@ociweb.com>
-Stephane Chatre <schatre@oresis.com>
-James Whitledge <jwhitledge@spyglass.com>
-Erik Johannes <ejohannes@oresis.com>
-Alex Hornby <alex@anvil.co.uk>
-Riaz Syed <syed@Lynx.COM>
-Clarence M. Weaver <clarence_m_weaver@md.northgrum.com>
-John Forest <forestj@res.raytheon.com>
-Roger Egbers <regbers@isrglobal.com>
-Ralf Kluthe <kluthe@iti.mu-luebeck.de>
-Ruud Diterwich<R.M.L.Diterwich@marin.nl>
 
 I would particularly like to thank Paul Stephenson, who worked with me
-at Ericsson.  Paul devised the recursive Makefile scheme that
-underlies this distribution and also spent countless hours with me
-discussing object-oriented techniques for developing distributed
-application frameworks.
+at Ericsson and is now at ObjectSpace.  Paul devised the recursive
+Makefile scheme that underlies this distribution and also spent
+countless hours with me discussing object-oriented techniques for
+developing distributed application frameworks.
 
 Finally, I'd also like to thank Todd L. Montgomery <tmont@cs.wvu.edu>,
 fellow heavy metal head, for fulfilling his quest to get ACE to
diff --git a/TODO b/TODO
deleted file mode 100644
index 43d7d388bba..00000000000
--- a/TODO
+++ /dev/null
@@ -1,272 +0,0 @@
-============================================================================
-                              ACE/TAO TODO List
-============================================================================
-
-ACE and TAO
------------
-For notes about what things need to be done for ACE and TAO, see their
-respective release notes.
-
-
-ACE/TAO Configuration Project
------------------------------
-1.	Add support for Linux netdb reentrant functions  (LOW PRIORITY)
-2.	Add support for Linux sysinfo().   (LOW PRIORITY)
-3.	Change tests that need ACE_CONVERT_WARNINGS_TO_ERRORS and possibly
-	others to use regular expression searches instead.    (MAYBE NOT)
-4.	Process all of the remaining TODOs and FIXMEs in configure.in.
-5.	Ensure the configure script will work for cross-compiled platforms.
-6.	Make sure failed autoconf test programs in config.log failed for
-	the "right" reasons, not due to some typo, for example.
-7.	Figure out the best way to choose interface numbers for the libACE.la
-	-version-info libtool flag.
-8.	Integrate the remaining ACE subdirectories into the automake scheme.
-9.	Verify that the new automake build scheme works, i.e. everything
-	gets built correctly.
-10.	Really test the configure script and automake build scheme; really
-        "pound" on them.  (e.g. test and make sure everything works on
-	as many platforms as possible).
-11.	Write documentation on how to maintain the Autoconf and Automake files.
-	HOWTOs/tutorials on how to use Auto{conf,make} and libtool would be
-	good, too.
-12.	Implement remaining configure script options (e.g. --enable-optimize,
-	--with-orbix).
-13.	Make sure all of the ACE feature macros are supported by the configure
-	script.
-14.	Modify ace/Makefile.am and tao/Makefile.am so that the template
-	sources are always included in the distribution (though not
-	necessarily the installation).
-15.	Verify that the contents of the `AUTHORS' file is correct.
-16.	Add some information to the `NEWS' file.
-17.     Add subset dependencies to subsets.m4 for libACE_Token and
-        libACE_Other.
-18.     Add ACE subset library support to the ace-config script.
-19.     Fix/check the minimum/maximum thread priority test.
-20.     Verify that the asynchronous IO checks actually work properly.
-21.     ACE_TEMPLATES_REQUIRE_SOURCE test fails for the wrong reasons
-        Solaris' linker claims that the function Foo<int>::Foo<int> (int)
-        doesn't exist.  Where is it getting function Foo<int>::Foo<int> (int)
-        from?  It should be getting function Foo<int>::Foo (int).
-22.     Fix tests/Makefile.am to conditionally build some of the tests
-        since some of the ACE components that are needed for the tests
-        may not have been built.
-23.     Repeat #22 for other binaries in ACE.
-24.	Need to implement and/or verify tests for the following ACE macros:
-
-/* Define this if you don't want debug version ACE search for debug version
-   DLLs first before looking for the DLL names specified. */
-#undef ACE_DISABLE_DEBUG_DLL_CHECK
-
-+ACE_DONT_INCLUDE_ACE_SIGNAL_H
-
-+ACE_HAS_BROKEN_ACCEPT_ADDR
-
-/* Platform doesn't cast MAP_FAILED to a (void *). */
-#undef ACE_HAS_BROKEN_MAP_FAILED
-
-/* Compiler/platform has the wrong prototype for t_error(), i.e.,
-   t_error(char *) rather than t_error(const char *). */
-#undef ACE_HAS_BROKEN_T_ERROR
-
-/* Platform has Fast-Light (FL) toolkit installed */
-#undef ACE_HAS_FL
-
-+ACE_HAS_FORE_ATM_WS2
-+ACE_HAS_FORE_ATM_XTI
-+ACE_HAS_IP6
-+ACE_HAS_LIMITED_SELECT
-+ACE_HAS_PHARLAP_RT
--ACE_HAS_PTHREAD_SIGMASK
-+ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-+ACE_HAS_TK
-+ACE_HAS_WINSOCK2_GQOS
-+ACE_LACKS_CHAR_RIGHT_SHIFTS
-+ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS
-+ACE_LACKS_NULL_PTHREAD_STATUS
-+ACE_LACKS_PTHREAD_SIGMASK
--ACE_LACKS_SCHED_H
-+ACE_LACKS_TCP_NODELAY
-+ACE_NEEDS_SCHED_H
-+ACE_USES_HIGH_BAUD_RATES
-+ACE_USES_OLD_TERMIOS_STRUCT
-
-
-
-/* Compiler enforces C++ One Definition Rule */
-#undef ACE_HAS_ONE_DEFINITION_RULE
-
-/* Platform also has __TEXT defined */
-#undef ACE_HAS_TEXT_MACRO_CONFLICT
-
-/* Platform has void (*)(...) prototype for pthread_key_create() destructor
-   (e.g., LynxOS). */
-#undef ACE_HAS_STDARG_THR_DEST
-
-/* Platform/compiler supports Win32 structural exceptions */
-#undef ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS
-
-/* Platform, such as AIX4, needs to wrap #include of sys/socket.h with
-   #undef/#define of __cplusplus. */
-#undef ACE_HAS_AIX_BROKEN_SOCKET_HEADER
-
-/* Compiler/platform correctly calls init()/fini() for shared libraries */
-#undef ACE_HAS_AUTOMATIC_INIT_FINI
-
-/* Compiler has integer overflow problem with bit-shift operations. */
-#undef ACE_HAS_BROKEN_BITSHIFT
-
-/* Earlier versions of HP/UX C++ are damned... */
-#undef ACE_HAS_BROKEN_HPUX_TEMPLATES
-
-/* FIXME: What does this do and what do we test for? */
-#undef ACE_HAS_BROKEN_IF_HEADER
-
-/* TODO: WE HAVE A TEST FOR THIS, BUT WE NEED TO KNOW IF IT WORKS! */
-/* Platform headers don't support <msg.h> prototypes */
-#undef ACE_HAS_BROKEN_MSG_H
-
-/* MSVC has trouble with defining STL containers for nested structs and
-   classes */
-#undef ACE_HAS_BROKEN_NESTED_TEMPLATES
-
-/* Platform has a bug with non-blocking connects (e.g., WinNT 4.0) */
-#undef ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS
-
-/* OS/compiler's header files are inconsistent with libC definition of
-   rand_r(). */
-#undef ACE_HAS_BROKEN_RANDR
-
-/* OS/Compiler's header files are not consistent with readv() definition. */
-#undef ACE_HAS_BROKEN_READV
-
-/* OS header files have some problems with XTI (HP/UX 11). */
-#undef ACE_HAS_BROKEN_XTI_MACROS
-
-/* Build ACE using the frigging PC DLL nonsense... */
-#undef ACE_HAS_DLL
-
-/* Needed for pSoS -- FIXME: need a better description */
-#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE
-
-/* Optimize ACE_Handle_Set::count_bits for select() operations (common case) */
-#undef ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-/* Platform supports IP multicast */
-#undef ACE_HAS_IP_MULTICAST
-
-/* Platform supports IPv6 */
-#undef ACE_HAS_IP6
-
-/* Causes the ACE_Object_Manager instance to be created in
-   main (int, char *[]), instead of as a static (global) instance. */
-#undef ACE_HAS_NONSTATIC_OBJECT_MANAGER
-
-/* Compiler/platform has "big" fd_set, i.e. large number of bits set
-   in fd_set passed back from select(). */
-#undef ACE_HAS_BIG_FD_SET
-
-/* Platform supports MT safe mktime() call (do any of them?) */
-#undef ACE_HAS_MT_SAFE_MKTIME
-
-/* Sockets may be called in multi-threaded programs */
-#undef ACE_HAS_MT_SAFE_SOCKETS
-
-/* Use the semaphore implementation of ACE_Message_Queue rather than the
-   emulated condition variable (NT and VxWorks). */
-#undef ACE_HAS_OPTIMIZED_MESSAGE_QUEUE
-
-/* Platform has Orbix CORBA implementation */
-#undef ACE_HAS_ORBIX
-
-/* Purify'ing.  Defined on command line. */
-#undef ACE_HAS_PURIFY
-
-/* Quantify'ing.  Defined on command line. */
-#undef ACE_HAS_QUANTIFY
-
-/* Platform will recurse infinitely on thread exits from TSS cleanup routines
-   (e.g., AIX) */
-#undef ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-
-/* Compiler typedefs wchar with char. */
-#undef ACE_HAS_WCHAR_TYPEDEFS_CHAR
-
-/* For Win32: Use Select_Reactor as default implementation of Reactor instead
-   of WFMO_Reactor. */
-#undef ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL
-
-/* Platform has bug with sigismember() (HP/UX 11). */
-#undef ACE_HAS_SIGISMEMBER_BUG
-
-/* Compiler requires extern "C" functions for signals. */
-#undef ACE_HAS_SIG_C_FUNC
-
-/* Use the STRICT compilation mode on Win32. */
-#undef ACE_HAS_STRICT
-
-/* Compiler/platform has strange hostent API for socket *_r() calls */
-#undef ACE_HAS_STRUCT_NETDB_DATA
-
-/* HP/UX has an undefined syscall for GETRUSAGE... */
-#undef ACE_HAS_SYSCALL_GETRUSAGE
-
-/* Platform allows multiple threads to call accept() on the same port
-   (e.g., WinNT). */
-#undef ACE_HAS_THREAD_SAFE_ACCEPT
-
-/* The pthread_keycreate() routine *must* take extern C functions. */
-#undef ACE_HAS_THR_C_DEST
-
-/* The pthread_create() routine *must* take extern C functions. */
-#undef ACE_HAS_THR_C_FUNC
-
-/* Platform/compiler supports UNICODE */
-#undef ACE_HAS_UNICODE
-
-/* The Win32 platform supports WinSock 2.0 */
-#undef ACE_HAS_WINSOCK2
-
-/* No system support for replacing any previous mappings. */
-#undef ACE_LACKS_AUTO_MMAP_REPLACEMENT
-
-/* pthread_cond_timedwait does *not* reset the time argument when
-   the lock is acquired. */
-#undef ACE_LACKS_COND_TIMEDWAIT_RESET
-
-/* Platform forgot const in cond_timewait (e.g., HP/UX). */
-#undef ACE_LACKS_CONST_TIMESPEC_PTR
-
-/* Platform lacks SYSV message queue prototypes */
-#undef ACE_LACKS_SYSV_MSQ_PROTOS
-
-/* Required by platforms with small default stacks. */
-#undef ACE_NEEDS_HUGE_THREAD_STACKSIZE
-
-///// FIX THIS TEST /////
-/* Platform needs regexpr.h for regular expression support */
-#undef ACE_NEEDS_REGEXPR_H
-
-///// FIX THIS TEST /////
-/* Platform needs to #include <sched.h> to get thread scheduling defs. */
-#undef ACE_NEEDS_SCHED_H
-
-/* OS has LWPs, and when the priority of a bound thread is set, then the LWP
-   priority must be set also. */
-#undef ACE_NEEDS_LWP_PRIO_SET
-
-/* Platform redefines the t_... names (UnixWare) */
-#undef ACE_REDEFINES_XTI_FUNCTIONS
-
-/* Compiler's template mechanism must use a pragma.  This is used for AIX's
-   C++ compiler. */
-#undef ACE_TEMPLATES_REQUIRE_PRAGMA
-
-/* Platform uses assembly symbols instead of C symbols in dlsym() */
-#undef ACE_USES_ASM_SYMBOL_IN_DLSYM
-
-/* When linking MFC as a static library is desired */
-#undef ACE_USES_STATIC_MFC
-
-/* A parameter list indicating the version of WinSock (e.g., "1, 1" is
-   version 1.1). */
-#undef ACE_WSOCK_VERSION
diff --git a/VERSION b/VERSION
index 3ddf30e498e..48da0b2902d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 4.6.46, released Mon Jul 26 12:32:41 1999.
+This is ACE version 4.6.43, released Thu Jul 01 21:07:22 1999.
 
 If you have any problems with or questions about ACE, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/acconfig.h b/acconfig.h
index 8872313a00a..28969dfc40b 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -14,6 +14,15 @@
   autoheader may encounter.
 */
 
+/* Name of package */
+#ifndef PACKAGE
+# undef PACKAGE
+#endif
+
+/* Version of package */
+#ifndef VERSION
+# undef VERSION
+#endif
 
 /* Define _REENTRANT if reentrant functions should be used. */
 #ifndef _REENTRANT
@@ -672,9 +681,6 @@
 /* No system support for replacing any previous mappings. */
 #undef ACE_LACKS_AUTO_MMAP_REPLACEMENT
 
-/* Platform lacks support for the standard C++ auto_ptr class */
-#undef ACE_LACKS_AUTO_PTR
-
 /* Compiler/platform lacks the standard C library bsearch() function  */
 #undef ACE_LACKS_BSEARCH
 
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index c42a654c78d..0c6921c5b74 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -30,29 +30,6 @@ size_t ACE::pagesize_ = 0;
 // Size of allocation granularity.
 size_t ACE::allocation_granularity_ = 0;
 
-int
-ACE::out_of_handles (int error)
-{
-  // EMFILE is common to all platforms.
-  if (error == EMFILE ||
-#if defined (ACE_WIN32)
-      // On Win32, we need to check for ENOBUFS also.
-      error == ENOBUFS ||
-#elif defined (HPUX)
-      // On HPUX, we need to check for EADDRNOTAVAIL also.
-      error == EADDRNOTAVAIL ||
-#elif defined (linux)
-      // On linux, we need to check for ENOENT also.
-      error == ENOENT ||
-#elif defined (sun)
-      // On sun, we need to check for ENOSR also.
-      error == ENOSR ||
-#endif /* ACE_WIN32 */
-      error == ENFILE)
-    return 1;
-  else
-    return 0;
-}
 
 int
 ACE::init (void)
@@ -252,7 +229,7 @@ ACE::strsplit_r (char *str,
 const char *
 ACE::execname (const char *old_name)
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32)
   if (ACE_OS::strstr (old_name, ".exe") == 0)
     {
       char *new_name;
@@ -264,7 +241,7 @@ ACE::execname (const char *old_name)
 
       ACE_NEW_RETURN (new_name,
                       char[size],
-                      0);
+                      -1);
       char *end = new_name;
 
       end = ACE_OS::strecpy (new_name, old_name);
@@ -274,7 +251,7 @@ ACE::execname (const char *old_name)
 
       return new_name;
     }
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32 */
   return old_name;
 }
 
@@ -332,7 +309,7 @@ ACE::strsplit_r (wchar_t *str,
 const wchar_t *
 ACE::execname (const wchar_t *old_name)
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32)
   if (ACE_OS::strstr (old_name, L".exe") == 0)
     {
       wchar_t *new_name;
@@ -344,7 +321,7 @@ ACE::execname (const wchar_t *old_name)
 
       ACE_NEW_RETURN (new_name,
                       wchar_t[size],
-                      0);
+                      -1);
       wchar_t *end = new_name;
 
       end = ACE_OS::strecpy (new_name, old_name);
@@ -354,7 +331,7 @@ ACE::execname (const wchar_t *old_name)
 
       return new_name;
     }
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32 */
   return old_name;
 }
 #endif /* ACE_HAS_UNICODE */
@@ -1692,7 +1669,7 @@ ACE::timestamp (ASYS_TCHAR date_and_time[], int date_and_timelen)
                    timebuf,
                    date_and_timelen);
   ACE_OS::sprintf (&date_and_time[19],
-                   ".%06ld",
+                   ".%06d",
                    cur_time.usec ());
 #endif /* WIN32 */
   date_and_time[26] = '\0';
@@ -2851,6 +2828,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
         {
           ACE_UINT64 haddr;  // a place to put the address
           char * haddrp = (char *) &haddr;  // convert to char pointer
+          haddr += 4;   // adjust within the word
           ACE_OS::memcpy(haddrp,(char *) hp->h_addr,hp->h_length);
           ip_addr.sin_addr.s_addr = haddr;
         }
@@ -3220,7 +3198,7 @@ ACE::get_ip_interfaces (size_t &count,
       // Ethernet.
       ACE_OS::sprintf (dev_name,
                        "ether%d",
-                       i);
+                       i);    
       ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
       if (ip_dev[count] == 0)
         break;
@@ -3230,7 +3208,7 @@ ACE::get_ip_interfaces (size_t &count,
       // SLIP.
       ACE_OS::sprintf (dev_name,
                        "sl%d",
-                       i);
+                       i); 
       ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
       if (ip_dev[count] == 0)
         break;
diff --git a/ace/ACE.h b/ace/ACE.h
index 88b74211d55..7ff95db5d77 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -72,10 +72,6 @@ public:
   static u_int compiler_beta_version (void);
   // E.g., the "0" in SunPro C++ 4.32.0
 
-  static int out_of_handles (int error);
-  // Check if error indicates the process being out of handles (file
-  // descriptors).
-
   // = Recv operations that factor out differences between Win32 and UNIX.
   static ssize_t recv (ACE_HANDLE handle,
                        void *buf,
diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index 49cd1b525e5..440987e7e41 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -422,18 +422,16 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump ();
   this->creation_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_));
   this->accept_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_));
   this->concurrency_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_));
   this->scheduling_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nservice_name_ = %s"),
-              this->service_name_ == 0 ? ASYS_TEXT ("<unknown>") : this->service_name_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nservice_description_ = %s"),
-              this->service_description_ == 0 ? ASYS_TEXT ("<unknown>") : this->service_description_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nservice_port_ = %d"), this->service_port_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\nservice_name_ = %s"), this->service_name_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\nservice_description_ = %s"), this->service_description_));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\nservice_port_ = %d"), this->service_port_));
   this->service_addr_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
@@ -567,8 +565,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
       scheduling_strategy_ (0),
       delete_scheduling_strategy_ (0),
       service_name_ (0),
-      service_description_ (0),
-      service_port_ (0)
+      service_description_ (0)
 {
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor");
 
@@ -592,17 +589,6 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
    const ASYS_TCHAR service_name[],
    const ASYS_TCHAR service_description[],
    int use_select)
-    : creation_strategy_ (0),
-      delete_creation_strategy_ (0),
-      accept_strategy_ (0),
-      delete_accept_strategy_ (0),
-      concurrency_strategy_ (0),
-      delete_concurrency_strategy_ (0),
-      scheduling_strategy_ (0),
-      delete_scheduling_strategy_ (0),
-      service_name_ (0),
-      service_description_ (0),
-      service_port_ (0)
 {
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor");
 
@@ -749,13 +735,9 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ASYS_TCHAR **strp
   // @@ Should add the protocol in...
   ACE_OS::sprintf (buf,
                    ASYS_TEXT ("%s\t %s #%s\n"),
-                   this->service_name_ == 0 
-                   ? ASYS_TEXT ("<unknown>")
-                   : this->service_name_,
+                   this->service_name_,
                    service_addr_str,
-                   this->service_description_ == 0 
-                   ? ASYS_TEXT ("<unknown>")
-                   : this->service_description_);
+                   this->service_description_);
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h
index 4d743d0530e..f4f88c1f1d3 100644
--- a/ace/Based_Pointer_Repository.h
+++ b/ace/Based_Pointer_Repository.h
@@ -18,8 +18,6 @@
 #ifndef ACE_BASED_POINTER_REPOSITORY_H
 #define ACE_BASED_POINTER_REPOSITORY_H
 
-#include "ace/OS.h"                  // Need ACE_Export
-
 // Forward decl., using the "Cheshire Cat" technique.
 class ACE_Based_Pointer_Repository_Rep;
 
diff --git a/ace/Based_Pointer_T.cpp b/ace/Based_Pointer_T.cpp
index 0e97efcee87..5c993b8855f 100644
--- a/ace/Based_Pointer_T.cpp
+++ b/ace/Based_Pointer_T.cpp
@@ -7,44 +7,24 @@
 #include "ace/Based_Pointer_T.h"
 #include "ace/Based_Pointer_Repository.h"
 
-#   define ACE_TRACEX(X) ACE_Trace ____ (ASYS_TEXT (X), __LINE__, ASYS_TEXT (__FILE__))
-// #   define ACE_TRACEX(X)
-
-// #if !defined (__ACE_INLINE__)
+#if !defined (__ACE_INLINE__)
 #include "ace/Based_Pointer_T.i"
-// #endif /* __ACE_INLINE__ */
-
-template <class CONCRETE> ACE_INLINE
-ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (void)
-{
-  ACE_TRACEX ("ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer");
-}
-
-template <class CONCRETE> void
-ACE_Based_Pointer_Basic<CONCRETE>::dump (void) const
-{
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::dump");
+#endif /* __ACE_INLINE__ */
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ntarget_ = %d\n"), this->target_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base_offset_ = %d\n"), this->base_offset_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("computed pointer = %x\n"), (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this))));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-template <class CONCRETE>
-ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (CONCRETE *initial)
-  : ACE_Based_Pointer_Basic<CONCRETE> (initial)
+template <class CONCRETE> ACE_Based_Pointer<CONCRETE> 
+operator+ (const ACE_Based_Pointer<CONCRETE> &lhs, long increment)
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic");
+  // Perform pointer arithmetic.
+  CONCRETE *ptr = ((CONCRETE *) ACE_COMPUTE_BASED_POINTER (&lhs)) + increment;
+  ACE_Based_Pointer<CONCRETE> tmp (ptr);
+  return tmp;
 }
 
 template <class CONCRETE>
-ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic (void)
+ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (void)
   : target_ (0),
     base_offset_ (0)
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic");
   void *base_addr = 0;
 
   // Find the base address associated with our <this> pointer.  Note
@@ -53,51 +33,22 @@ ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic (void)
   ACE_BASED_POINTER_REPOSITORY::instance ()->find (this, 
                                                    base_addr);
   this->base_offset_ = (char *) this - (char *) base_addr;
-    this->dump ();
 }
 
 template <class CONCRETE>
-ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic (CONCRETE *rhs)
+ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (CONCRETE *addr)
   : target_ (0),
     base_offset_ (0)
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic");
   void *base_addr = 0;
 
   // Find the base address associated with the <addr> pointer.  Note
   // that it's ok for <find> to return 0, which simply indicates that
   // the address is not in memory-mapped virtual address space.
-  ACE_BASED_POINTER_REPOSITORY::instance ()->find (this,
+  ACE_BASED_POINTER_REPOSITORY::instance ()->find (addr,
                                                    base_addr);
-  this->base_offset_ = (char *) this - (char *) base_addr;
-  this->target_ = ((char *) rhs - (char *) base_addr);
-    this->dump ();
-}
-
-template <class CONCRETE> ACE_INLINE
-ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic (const ACE_Based_Pointer_Basic<CONCRETE> &rhs)
-{
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::ACE_Based_Pointer_Basic");
-
-  ACE_ASSERT (!"not implemented");
-  void *base_addr = 0;
-
-  // Find the base address associated with the <addr> pointer.  Note
-  // that it's ok for <find> to return 0, which simply indicates that
-  // the address is not in memory-mapped virtual address space.
-  ACE_BASED_POINTER_REPOSITORY::instance ()->find (this,
-                                                   base_addr);
-  this->base_offset_ = (char *) this - (char *) base_addr;
-  this->target_ = ((char *) &rhs - (char *) base_addr);
-    this->dump ();
-}
-
-template <class CONCRETE> ACE_INLINE
-ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (const ACE_Based_Pointer<CONCRETE> &rhs)
-  : ACE_Based_Pointer_Basic<CONCRETE> (rhs)
-{
-  ACE_TRACEX ("ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer");
-  ACE_ASSERT (!"not implemented");
+  this->base_offset_ = (char *) addr - (char *) base_addr;
 }
 
 #endif/* ACE_BASED_POINTER_T_CPP */
+
diff --git a/ace/Based_Pointer_T.h b/ace/Based_Pointer_T.h
index 0753b1980e5..0003bce08e8 100644
--- a/ace/Based_Pointer_T.h
+++ b/ace/Based_Pointer_T.h
@@ -18,8 +18,6 @@
 #ifndef ACE_BASED_POINTER_T_H
 #define ACE_BASED_POINTER_T_H
 
-#include "ace/OS.h"              // Need ACE_Export
-
 #if defined (_MSC_VER)
 // Suppress warning e.g. "return type for
 // 'ACE_Based_Pointer<long>::operator ->' is 'long *' (i.e., not a UDT
@@ -29,19 +27,21 @@
 #endif /* _MSC_VER */
 
 template <class CONCRETE> 
-class ACE_Based_Pointer_Basic
+class ACE_Based_Pointer
 {
   // = TITLE
   //   A proxy that keeps track of the relative offset of a "pointer"
   //   from its base address. 
   //
+  // = DESCRIPTION
   //   This class makes it possible to transparently use "pointers" in
   //   shared memory as easily as programming with pointers to local
   //   memory.  In particular, we don't need to ensure that the base
   //   addresses of all the pointers are mapped into separate
   //   processes at the same absolute memory base address.
 public:
-  ACE_Based_Pointer_Basic (void);
+  // = Initialization method.
+  ACE_Based_Pointer (void);
   // This constructor initializes the <base_offset_> by asking the
   // <ACE_BASED_POINTER_REPOSITORY> Singleton for the base address of
   // the memory region within which it is instantiated.  Two results
@@ -58,49 +58,37 @@ public:
   //    based-pointer uses its address as an offset to it's base
   //    address 0.
 
-  ACE_Based_Pointer_Basic (CONCRETE *initial);
-  // Initialize this object using the <initial> pointer.  This
-  // constructor initializes the <base_offset_> by asking the
-  // <ACE_BASED_POINTER_REPOSITORY> Singleton for the base address of
-  // the memory region within which it is instantiated.  Two results
-  // are possible:
-  // 
-  // 1. An <ACE_*_Memory_Pool> has stored a base address/size pair and the
-  //    new based-pointer instance is located between the base address and
-  //    the base address + size - 1.  In this case, the repository
-  //    returns the base address.
-  //
-  // 2. No suitable address/size pair was found.  The repository
-  //    assumes an address in the regular (not mapped) virtual address
-  //    space of the process and returns 0.  In this case, the
-  //    based-pointer uses its address as an offset to it's base
-  //    address 0.
+  ACE_Based_Pointer (CONCRETE *initial);
+  // Initialize this object with the <initial> pointer.
 
-  ACE_Based_Pointer_Basic (const ACE_Based_Pointer_Basic<CONCRETE> &);
+  ACE_Based_Pointer (const ACE_Based_Pointer<CONCRETE> &rhs);
   // Copy constructor.
 
-  void operator = (CONCRETE *from);
+  CONCRETE *operator->(void);
+  // The C++ "delegation operator".
+
+  CONCRETE *operator =(CONCRETE *from);
   // Pseudo-assignment operator.
 
-  CONCRETE operator * (void) const;
+  CONCRETE operator *(void) const;
   // Dereference operator.
 
-  int operator < (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator < (const ACE_Based_Pointer<CONCRETE> &) const;
   // Less than operator.
 
-  int operator <= (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator <= (const ACE_Based_Pointer<CONCRETE> &) const;
   // Less than or equal operator.
 
-  int operator > (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator > (const ACE_Based_Pointer<CONCRETE> &) const;
   // Greater than operator.
 
-  int operator >= (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator >= (const ACE_Based_Pointer<CONCRETE> &) const;
   // Greater than or equal operator.
 
-  int operator == (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator == (const ACE_Based_Pointer<CONCRETE> &) const;
   // Equality operator.
 
-  int operator != (const ACE_Based_Pointer_Basic<CONCRETE> &) const;
+  int operator != (const ACE_Based_Pointer<CONCRETE> &) const;
   // Inequality operator.
 
   CONCRETE operator [](long index) const;
@@ -109,63 +97,26 @@ public:
   void operator+= (long index);
   // Increment operator.
 
-  CONCRETE *addr (void) const;
+  operator void *() const;
   // Returns the underlying memory address of the smart pointer.
 
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-  void dump (void) const;
-  // Dump the state of the object.
-
   // The following should be private, but that causes problems due to
   // broken C++ compilers that don't like friends for methods
   // in templates.
-protected:
-  long target_;
+// private:
+  CONCRETE *target_;
 
   long base_offset_;
   // Keep track of our offset from the base pointer.
-
-  // = Prevent assignment and initialization (for now).
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Based_Pointer_Basic<CONCRETE> &))
 };
 
-template <class CONCRETE> 
-class ACE_Based_Pointer : public ACE_Based_Pointer_Basic<CONCRETE>
-{
-  // = TITLE
-  //   A smart proxy that keeps track of the relative offset of a
-  //   "pointer" from its base address.
-  //
-  // = DESCRIPTION
-  //   This class makes it possible to transparently use "pointers" in
-  //   shared memory as easily as programming with pointers to local
-  //   memory by overloading the C++ delegation operator ->().
-public:
-  // = Initialization method.
-  ACE_Based_Pointer (void);
-  // Constructor.  See constructor for <ACE_Based_Pointer_Basic> for
-  // details.
-
-  ACE_Based_Pointer (CONCRETE *initial);
-  // Initialize this object using the <initial> pointer.  
-
-  ACE_Based_Pointer (const ACE_Based_Pointer<CONCRETE> &);
-  // Copy constructor.
-
-  void operator = (CONCRETE *from);
-  // Pseudo-assignment operator.
-
-  CONCRETE *operator-> (void);
-  // The C++ "delegation operator".
-
-  // = Prevent assignment and initialization (for now).
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Based_Pointer<CONCRETE> &))
-};
+ACE_Export template <class CONCRETE> 
+ACE_Based_Pointer<CONCRETE> operator+ (const ACE_Based_Pointer<CONCRETE> &lhs,
+                                       long increment);
+// Emulate "pointer arithmetic" by adding <increment> to <lhs>.
 
 #if defined (__ACE_INLINE__)
-// #include "ace/Based_Pointer_T.i"
+#include "ace/Based_Pointer_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Based_Pointer_T.i b/ace/Based_Pointer_T.i
index c37d3a894d9..cb0a3ae5fea 100644
--- a/ace/Based_Pointer_T.i
+++ b/ace/Based_Pointer_T.i
@@ -1,116 +1,86 @@
 /* -*- C++ -*- */
 // $Id$
 
-#define ACE_COMPUTE_BASED_POINTER(P) (((char *) (P) - (P)->base_offset_) + (P)->target_)
+#define ACE_COMPUTE_BASED_POINTER(P) (((char *) (P) - (P)->base_offset_) + (long) (P)->target_)
 
-template <class CONCRETE> ACE_INLINE CONCRETE *
-ACE_Based_Pointer<CONCRETE>::operator->(void)
+template <class CONCRETE> ACE_INLINE
+ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (const ACE_Based_Pointer<CONCRETE> &lhs)
+  : target_ (lhs.target_),
+    base_offset_ (lhs.base_offset_)
 {
-  ACE_TRACEX ("ACE_Based_Pointer<CONCRETE>::operator->");
-    this->dump ();
-  return (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this));
 }
 
-template <class CONCRETE> ACE_INLINE void
-ACE_Based_Pointer_Basic<CONCRETE>::operator = (CONCRETE *rhs)
+template <class CONCRETE> ACE_INLINE CONCRETE *
+ACE_Based_Pointer<CONCRETE>::operator->(void)
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator=");
-  if (rhs != 0)
-    this->target_ = ((char *) rhs
-                     - ((char *) this - this->base_offset_));
-  this->dump ();
+  return (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this));
 }
 
-template <class CONCRETE> ACE_INLINE void
-ACE_Based_Pointer<CONCRETE>::operator = (CONCRETE *rhs)
+template <class CONCRETE> ACE_INLINE CONCRETE *
+ACE_Based_Pointer<CONCRETE>::operator =(CONCRETE *from)
 {
-  ACE_TRACEX ("ACE_Based_Pointer<CONCRETE>::operator=");
-  this->target_ = ((char *) rhs
-                   - ((char *) this - this->base_offset_));
-    this->dump ();
+  this->target_ = (CONCRETE *)((char *) from 
+                               - ((char *) this - this->base_offset_));
+  return from;
 }
 
 template <class CONCRETE> ACE_INLINE CONCRETE 
-ACE_Based_Pointer_Basic<CONCRETE>::operator *(void) const
+ACE_Based_Pointer<CONCRETE>::operator *(void) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator *");
-  this->dump ();
-  return *ACE_reinterpret_cast (CONCRETE *,
-                                ACE_COMPUTE_BASED_POINTER (this));
+  return *(CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this));
 }
 
-template <class CONCRETE> ACE_INLINE CONCRETE *
-ACE_Based_Pointer_Basic<CONCRETE>::addr (void) const
+template <class CONCRETE> ACE_INLINE 
+ACE_Based_Pointer<CONCRETE>::operator void *() const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::addr");
-    this->dump ();
-  return ACE_reinterpret_cast (CONCRETE *,
+  return ACE_reinterpret_cast (void *,
                                ACE_COMPUTE_BASED_POINTER (this));
 }
 
 template <class CONCRETE> ACE_INLINE CONCRETE
-ACE_Based_Pointer_Basic<CONCRETE>::operator [] (long index) const
+ACE_Based_Pointer<CONCRETE>::operator [] (long index) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator[]");
-    this->dump ();
-  CONCRETE *c = ACE_reinterpret_cast (CONCRETE *,
-                                      ACE_COMPUTE_BASED_POINTER (this));
-  return c[index];
+  return *((CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this)) + index);
 }
 
 template <class CONCRETE> ACE_INLINE void
-ACE_Based_Pointer_Basic<CONCRETE>::operator += (long index)
+ACE_Based_Pointer<CONCRETE>::operator += (long index)
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator+=");
-    this->dump ();
   this->base_offset_ += (index * sizeof (CONCRETE));
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator == (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator == (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator==");
-    this->dump ();
   return ACE_COMPUTE_BASED_POINTER (this) == ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator != (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator != (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator!=");
-    this->dump ();
   return !(*this == rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator < (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator < (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator<");
-    this->dump ();
   return ACE_COMPUTE_BASED_POINTER (this) < ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator <= (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator <= (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator<=");
-    this->dump ();
   return ACE_COMPUTE_BASED_POINTER (this) <= ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator > (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator > (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator>");
-    this->dump ();
   return ACE_COMPUTE_BASED_POINTER (this) > ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
-ACE_Based_Pointer_Basic<CONCRETE>::operator >= (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
+ACE_Based_Pointer<CONCRETE>::operator >= (const ACE_Based_Pointer<CONCRETE> &rhs) const
 {
-  ACE_TRACEX ("ACE_Based_Pointer_Basic<CONCRETE>::operator>=");
-    this->dump ();
   return ACE_COMPUTE_BASED_POINTER (this) >= ACE_COMPUTE_BASED_POINTER (&rhs);
 }
-
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index cc4530c8b13..f9aaedf009d 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -165,10 +165,10 @@
 # elif (ACE_SIZEOF_SHORT) == 4 && defined(_CRAYMPP)
   // mpp cray - uses Alpha processors
   //   Use the real 32-bit quantity for ACE_INT32's, and use a "long"
-  //   for ACE_INT16's.  This gets around conflicts with size_t in some ACE
+  //   for shorts.  This gets around conflicts with size_t in some ACE
   //   method signatures, among other things.
-  typedef long ACE_INT16;
-  typedef unsigned long ACE_UINT16;
+  typedef short ACE_INT16;
+  typedef unsigned short ACE_UINT16;
   typedef short ACE_INT32;
   typedef unsigned short ACE_UINT32;
 # elif (ACE_SIZEOF_SHORT) == 8 && defined(_UNICOS)
@@ -196,7 +196,7 @@ typedef ACE_UINT16 ACE_USHORT16;
       typedef int ACE_INT32;
       typedef unsigned int ACE_UINT32;
 #   endif
-  typedef unsigned long long ACE_UINT64;
+  typedef unsigned long ACE_UINT64;
 # else
 #   error Have to add to the ACE_UINT32 type setting
 # endif
@@ -219,17 +219,6 @@ typedef ACE_UINT16 ACE_USHORT16;
 # error "Can't find a suitable type for doing pointer arithmetic."
 #endif /* ACE_SIZEOF_VOID_P */
 
-#if defined (ACE_LACKS_LONGLONG_T)
-  // This throws away the high 32 bits.  It's very unlikely that a
-  // pointer will be more than 32 bits wide if the platform does not
-  // support 64-bit integers.
-# define ACE_LONGLONG_TO_PTR(PTR_TYPE, L) \
-  ACE_reinterpret_cast (PTR_TYPE, L.lo ())
-#else  /* ! ACE_LACKS_LONGLONG_T */
-# define ACE_LONGLONG_TO_PTR(PTR_TYPE, L) \
-  ACE_reinterpret_cast (PTR_TYPE, ACE_static_cast (ptr_arith_t, L))
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
 // If the platform lacks a long long, define one.
 # if defined (ACE_LACKS_LONGLONG_T)
   class ACE_Export ACE_U_LongLong
@@ -318,6 +307,18 @@ typedef ACE_UINT16 ACE_USHORT16;
     ACE_UINT32 operator/ (const int) const;
 #   endif /* ACE_SIZEOF_INT != 4 */
 
+    // Conversion operator.  Try to avoid adding more of these,
+    // because they can lead to subtle problems.  But a conversion to
+    // ptr_arith_t is useful.
+#   if ACE_SIZEOF_VOID_P == ACE_SIZEOF_INT  || \
+       ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG
+      operator ptr_arith_t () { return data_.lo_; }
+#   elif ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG
+      operator ptr_arith_t () { return data_.hi_ << 32U  &  data_.lo_; }
+#   else
+#     error "Can't find a suitable type for doing pointer arithmetic."
+#   endif /* ACE_SIZEOF_VOID_P */
+
     // = Helper methods.
     void output (FILE * = stdout) const;
     // Outputs the value to the FILE, in hex.
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index e64d13b2791..aea3198e0dd 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -1,5 +1,37 @@
+// CDR_Stream.cpp
 // $Id$
 
+// Portions of this file are:
+// Copyright 1994-1995 by Sun Microsystems Inc.
+// All Rights Reserved
+
+// CDR:         Encode/Decode basic machine data types
+//
+// Implementation of OMG "Common Data Representation" (CDR) ... there
+// are one routine each for byte/halfword/word/doubleword put/get,
+// which adjust to establish "natural" alignment (the bulk of the
+// code) and then put or get with byteswapping as needed.
+//
+// The implementation knows that native data formats are conformant
+// with OMG-IDL's (and hence CDR's) size requirements, and relies on
+// the fact that (for example) CORBA's Long is always four bytes long
+// even if the environment's "int" is a different size.
+//
+//      char, octet                       8 bits (1 byte)
+//      short, unsigned short            16 bits (2 bytes)
+//      long, unsigned long, float       32 bits (4 bytes)
+//      double, (unsigned) long long     64 bits (8 bytes)
+//      long double                     128 bits (16 bytes)
+//
+// Moreover, this "knows" that the native 'char' represents ISO
+// Latin/1 characters (an ASCII superset addressing Western European
+// characters) and that "double" and "float" comply with the IEEE
+// standards. (The "long double" may not be a native data type,
+// though.)
+//
+// THREADING NOTE: "CDR" is a data structure which must be protected
+// by external critical sections.
+
 #define ACE_BUILD_DLL
 #include "ace/CDR_Stream.h"
 
@@ -85,20 +117,20 @@ ACE_CDR::LongDouble::operator!= (const ACE_CDR::LongDouble &rhs) const
 }
 #endif /* NONNATIVE_LONGDOUBLE */
 
-#if defined(_UNICOS) && !defined(_CRAYMPP)
+#if defined(_UNICOS)
 // placeholders to get things compiling
 ACE_CDR::Float::Float()
 {
 }
 
-ACE_CDR::Float::Float(const float & init)
+ACE_CDR::Float::Float(const float & init))
 {
 }
 
-ACE_CDR::Float &
-ACE_CDR::Float::operator= (const float &rhs)
+float
+ACE_CDR::Float::operator= (const ACE_CDR::Float &rhs) const
 {
-    return *this;
+    return 0.0f;
 }
 
 int
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index 13dad9d7ab5..95efb66f46a 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -4,32 +4,46 @@
 // ============================================================================
 //
 // = LIBRARY
-//   ace
+//    ace
 //
 // = FILENAME
-//   CDR_Stream.h
+//    CDR.h
 //
 // = DESCRIPTION
-//   ACE Common Data Representation (CDR) marshaling and demarshaling
-//   classes.
+//     Common Data Representation (CDR) marshaling streams.
 //
-//   This implementation was inspired in the CDR class in SunSoft's
-//   IIOP engine, but has a completely different implementation and a
-//   different interface too.
+//     This implementation assumes that the native numeric
+//     representation is two's complement for integers, IEEE
+//     single/double for floats.  Also that characters are in ISO
+//     Latin/1.
 //
-//   The current implementation assumes that the host has 1-byte,
-//   2-byte and 4-byte integral types, and that it has single
-//   precision and double precision IEEE floats.
-//   Those assumptions are pretty good these days, with Crays beign
-//   the only known exception.
+//     Note that CDR itself makes no such assumptions, but this
+//     implementation makes such assumptions for reasons of
+//     efficiency.  Careful enhancements could preserve that
+//     efficiency where the assumptions are true, yet still allow the
+//     code to work when they aren't true.
+//
+//     The implementation expects that buffers are aligned according
+//     to the strongest CDR alignment restriction.
+//
+//     NOTE: this does everything "CDR 1.1" does ... that is, it
+//     supports the five extended OMG-IDL data types in UNO Appendix
+//     A, which provide richer arithmetic types (64 bit integers,
+//     "quad precision" FP) and UNICODE-based characters and strings.
+//     Those types are not standard parts of OMG-IDL at this time.
+//
+//     THREADING NOTE: CDR data structures must be protected against
+//     concurrent access by their owning thread.
 //
 // = AUTHORS
-//   Aniruddha Gokhale <gokhale@cs.wustl.edu> and Carlos O'Ryan
-//   <coryan@cs.wustl.edu> for the original implementation in TAO.
-//   ACE version by Jeff Parsons <parsons@cs.wustl.edu>
-//   and Istvan Buki <istvan.buki@euronet.be>.
-//   Codeset translation by Jim Rogers (jrogers@viasoft.com) and
-//   Carlos O'Ryan <coryan@cs.wustl.edu>
+//     Original copyright 1994-1995 by Sun Microsystems, Inc.  See
+//     $TAO_ROOT/COPYING.sun for more info.
+//     Many enhancements added by Aniruddha Gokhale
+//     <gokhale@cs.wustl.edu> and Carlos O'Ryan <coryan@cs.wustl.edu>
+//     for TAO.  ACE version by Jeff Parsons <parsons@cs.wustl.edu>
+//     and Istvan Buki <istvan.buki@euronet.be>.
+//     Codeset translation by Jim Rogers (jrogers@viasoft.com) and
+//     Carlos O'Ryan <coryan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -143,7 +157,7 @@ public:
   # if    (defined (_MSC_VER) && (_MSC_VER >= 900)) \
           || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530))
       typedef __int64 LongLong;
-  # elif ACE_SIZEOF_LONG == 8 && !defined(_CRAYMPP)
+  # elif ACE_SIZEOF_LONG == 8
       typedef long LongLong;
   # elif ACE_SIZEOF_LONG_LONG == 8 && !defined (ACE_LACKS_LONGLONG_T)
   #   if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T) && !defined (__KCC)
@@ -179,11 +193,11 @@ public:
   #     else  /* ACE_SIZEOF_INT != 4 */
           // Applications will probably have trouble with this.
           char f[4];
-  #       if defined(_UNICOS) && !defined(_CRAYMPP)
-            Float (void);
-            Float (const float &init);
-            Float & operator= (const float &rhs);
-            int operator!= (const Float &rhs) const;
+  #       if defined(_UNICOS)
+        Float (void);
+        Float (const float &init);
+        float operator= (const Float &rhs) const;
+        int operator!= (const Float &rhs) const;
   #       endif /* _UNICOS */
   #     endif /* ACE_SIZEOF_INT != 4 */
       };
diff --git a/ace/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp
index 6d7d0770773..376f981e5e4 100644
--- a/ace/Cache_Map_Manager_T.cpp
+++ b/ace/Cache_Map_Manager_T.cpp
@@ -21,26 +21,17 @@ ACE_RCSID(ace, Cache_Map_Manager_T, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Manager)
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Iterator)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Reverse_Iterator)
 
-#define ACE_T1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
-
-#else
-
-#define ACE_T1 class KEY, class VALUE, class MAP, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, CACHING_STRATEGY, ATTRIBUTES
+#define T_1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
+#define T_2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-template <ACE_T1>
-ACE_Cache_Map_Manager<ACE_T2>::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
-                                                      size_t size,
-                                                      ACE_Allocator *alloc)
+  template <T_1>
+ACE_Cache_Map_Manager<T_2>::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
+                                                   size_t size,
+                                                   ACE_Allocator *alloc)
   : caching_strategy_ (caching_s)
 {
   if (this->open (size, alloc) == -1)
@@ -50,29 +41,29 @@ ACE_Cache_Map_Manager<ACE_T2>::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_
 
 }
 
-template <ACE_T1>
-ACE_Cache_Map_Manager<ACE_T2>::~ACE_Cache_Map_Manager (void)
+template <T_1>
+ACE_Cache_Map_Manager<T_2>::~ACE_Cache_Map_Manager (void)
 {
   this->close ();
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::open (size_t length,
-                                     ACE_Allocator *alloc)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::open (size_t length,
+                                  ACE_Allocator *alloc)
 {
   return this->map_.open (length,
                           alloc);
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::close (void)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::close (void)
 {
   return this->map_.close ();
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::bind (const KEY &key,
-                                     const VALUE &value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::bind (const KEY &key,
+                                  const VALUE &value)
 {
   // Insert an entry which has the <key> and the <cache_value> which
   // is the combination of the <value> and the attributes of the
@@ -106,9 +97,9 @@ ACE_Cache_Map_Manager<ACE_T2>::bind (const KEY &key,
 }
 
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
-                                       const VALUE &value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
+                                    const VALUE &value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_.attributes ());
@@ -143,10 +134,10 @@ ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
 }
 
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
-                                       const VALUE &value,
-                                       VALUE &old_value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
+                                    const VALUE &value,
+                                    VALUE &old_value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_.attributes ());
@@ -190,11 +181,11 @@ ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
   return rebind_result;
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
-                                       const VALUE &value,
-                                       KEY &old_key,
-                                       VALUE &old_value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
+                                    const VALUE &value,
+                                    KEY &old_key,
+                                    VALUE &old_value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_.attributes ());
@@ -239,9 +230,9 @@ ACE_Cache_Map_Manager<ACE_T2>::rebind (const KEY &key,
   return rebind_result;
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::trybind (const KEY &key,
-                                        VALUE &value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::trybind (const KEY &key,
+                                     VALUE &value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_.attributes ());
@@ -281,9 +272,9 @@ ACE_Cache_Map_Manager<ACE_T2>::trybind (const KEY &key,
   return trybind_result;
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::find (const KEY &key,
-                                     VALUE &value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::find (const KEY &key,
+                                  VALUE &value)
 {
   // Lookup the key and populate the <value>.
   CACHE_VALUE cache_value;
@@ -320,8 +311,8 @@ ACE_Cache_Map_Manager<ACE_T2>::find (const KEY &key,
   return find_result;
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::find (const KEY &key)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::find (const KEY &key)
 {
   // Lookup the key and populate the <value>.
   CACHE_VALUE cache_value;
@@ -358,8 +349,8 @@ ACE_Cache_Map_Manager<ACE_T2>::find (const KEY &key)
 }
 
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::unbind (const KEY &key)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key)
 {
   // Remove the entry from the cache.
   CACHE_VALUE cache_value;
@@ -381,9 +372,9 @@ ACE_Cache_Map_Manager<ACE_T2>::unbind (const KEY &key)
   return unbind_result;
 }
 
-template <ACE_T1> int
-ACE_Cache_Map_Manager<ACE_T2>::unbind (const KEY &key,
-                                       VALUE &value)
+template <T_1> int
+ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key,
+                                    VALUE &value)
 {
   // Remove the entry from the cache.
   CACHE_VALUE cache_value;
@@ -408,15 +399,15 @@ ACE_Cache_Map_Manager<ACE_T2>::unbind (const KEY &key,
 }
 
 
-template <ACE_T1> void
-ACE_Cache_Map_Manager<ACE_T2>::dump (void) const
+template <T_1> void
+ACE_Cache_Map_Manager<T_2>::dump (void) const
 {
   this->map_.dump ();
 
   this->caching_strategy_.dump ();
 }
 
-#undef ACE_T1
-#undef ACE_T2
+#undef T_1
+#undef T_2
 
 #endif /* ACE_CACHE_MAP_MANAGER_T_C */
diff --git a/ace/Cache_Map_Manager_T.h b/ace/Cache_Map_Manager_T.h
index 82033b28b09..20dfb3b9e1d 100644
--- a/ace/Cache_Map_Manager_T.h
+++ b/ace/Cache_Map_Manager_T.h
@@ -28,25 +28,13 @@
 // Forward declaration.
 class ACE_Allocator;
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
 template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Iterator;
 
 template <class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Reverse_Iterator;
 
-#define ACE_T1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
-
-#else
-
-#define ACE_T1 class KEY, class VALUE, class MAP, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, CACHING_STRATEGY, ATTRIBUTES
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-template <ACE_T1>
+template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Manager
 {
   // = TITLE
@@ -70,11 +58,12 @@ public:
   typedef VALUE mapped_type;
   typedef MAP map_type;
   typedef CACHING_STRATEGY caching_strategy_type;
-
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
   typedef ITERATOR_IMPL ITERATOR_IMPLEMENTATION;
   typedef REVERSE_ITERATOR_IMPL REVERSE_ITERATOR_IMPLEMENTATION;
+  typedef ACE_Pair<VALUE, ATTRIBUTES> CACHE_VALUE;
+  // The actual value mapped to the key in the map. The <attributes>
+  // are used by the strategy and is transparent to the user of this
+  // class.
 
   friend class ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>;
   friend class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>;
@@ -91,13 +80,6 @@ public:
   typedef REVERSE_ITERATOR
           reverse_iterator;
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-  typedef ACE_Pair<VALUE, ATTRIBUTES> CACHE_VALUE;
-  // The actual value mapped to the key in the map. The <attributes>
-  // are used by the strategy and is transparent to the user of this
-  // class.
-
   // = Initialization and termination methods.
 
   ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_strategy,
@@ -186,8 +168,6 @@ public:
   void dump (void) const;
   // Dumps the state of the object.
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
   // = STL styled iterator factory functions.
 
   ITERATOR begin (void);
@@ -198,8 +178,6 @@ public:
   REVERSE_ITERATOR rend (void);
   // Return reverse iterator.
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
   MAP &map (void);
   // The map managed by the Cache_Map_Manager.
 
@@ -217,13 +195,11 @@ protected:
 private:
 
   // = Disallow these operations.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cache_Map_Manager<ACE_T2> &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager<ACE_T2> &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
+  ACE_UNIMPLEMENTED_FUNC (ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
 
 };
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
 template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Iterator
 {
@@ -371,11 +347,6 @@ protected:
   // belonging to the Cache_Map_Manager.
 };
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-#undef ACE_T1
-#undef ACE_T2
-
 #if defined (__ACE_INLINE__)
 #include "ace/Cache_Map_Manager_T.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Cache_Map_Manager_T.i b/ace/Cache_Map_Manager_T.i
index ab90786fe1b..1a199e8bc53 100644
--- a/ace/Cache_Map_Manager_T.i
+++ b/ace/Cache_Map_Manager_T.i
@@ -1,273 +1,259 @@
 /* -*- C++ -*- */
 //$Id$
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
+#define T_1  class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
+#define T_2  KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
 
-#define ACE_T1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
-
-#else
-
-#define ACE_T1 class KEY, class VALUE, class MAP, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, CACHING_STRATEGY, ATTRIBUTES
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-template <ACE_T1> ACE_INLINE int
-ACE_Cache_Map_Manager<ACE_T2>::purge (void)
+template <T_1> ACE_INLINE int
+ACE_Cache_Map_Manager<T_2>::purge (void)
 {
-  return this->caching_strategy ().caching_utility ().clear_cache (this->map_,
-                                                                   this->caching_strategy ().purge_percent ());
+  return this->caching_strategy ().clear_cache (this->map_);
 }
 
-template <ACE_T1> ACE_INLINE size_t
-ACE_Cache_Map_Manager<ACE_T2>::current_size (void) const
+template <T_1> ACE_INLINE size_t
+ACE_Cache_Map_Manager<T_2>::current_size (void) const
 {
   return this->map_.current_size ();
 }
 
-template <ACE_T1> ACE_INLINE size_t
-ACE_Cache_Map_Manager<ACE_T2>::total_size (void) const
+template <T_1> ACE_INLINE size_t
+ACE_Cache_Map_Manager<T_2>::total_size (void) const
 {
   return this->map_.total_size ();
 }
 
-template <ACE_T1> ACE_INLINE MAP &
-ACE_Cache_Map_Manager<ACE_T2>::map (void)
+template <T_1> ACE_INLINE MAP &
+ACE_Cache_Map_Manager<T_2>::map (void)
 {
   return this->map_;
 }
 
-template <ACE_T1> ACE_INLINE CACHING_STRATEGY &
-ACE_Cache_Map_Manager<ACE_T2>::caching_strategy (void)
+template <T_1> ACE_INLINE CACHING_STRATEGY &
+ACE_Cache_Map_Manager<T_2>::caching_strategy (void)
 {
   return this->caching_strategy_;
 }
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<ACE_T2>::begin (void)
+template <T_1> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<T_2>::begin (void)
 {
   return ITERATOR (this->map_.begin ());
 }
 
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<ACE_T2>::end (void)
+template <T_1> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<T_2>::end (void)
 {
   return ITERATOR (this->map_.end ());
 }
 
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<ACE_T2>::rbegin (void)
+template <T_1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<T_2>::rbegin (void)
 {
   return REVERSE_ITERATOR (this->map_.rbegin ());
 }
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<ACE_T2>::rend (void)
+template <T_1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<T_2>::rend (void)
 {
   return REVERSE_ITERATOR (this->map_.rend ());
 }
 
-#undef ACE_T1
-#undef ACE_T2
+#undef T_1
+#undef T_2
 
-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define ACE_T1 class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES
+#define T_1 class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES
+#define T_2 KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2>::ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator <ACE_T2> &rhs)
-  : iterator_implementation_ (rhs.iterator_implementation_)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2>::ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator <T_2> &rhs)
+ : iterator_implementation_ (rhs.iterator_implementation_)
 {
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2>::~ACE_Cache_Map_Iterator (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2>::~ACE_Cache_Map_Iterator (void)
 {
 }
 
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Iterator<ACE_T2> &
-ACE_Cache_Map_Iterator<ACE_T2>::operator= (const ACE_Cache_Map_Iterator<ACE_T2> &rhs)
+template <T_1> ACE_INLINE ACE_Cache_Map_Iterator<T_2> &
+ACE_Cache_Map_Iterator<T_2>::operator= (const ACE_Cache_Map_Iterator<T_2> &rhs)
 {
   this->iterator_implementation_ = rhs.iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE int
-ACE_Cache_Map_Iterator<ACE_T2>::operator== (const ACE_Cache_Map_Iterator<ACE_T2> &rhs) const
+template <T_1> ACE_INLINE int
+ACE_Cache_Map_Iterator<T_2>::operator== (const ACE_Cache_Map_Iterator<T_2> &rhs) const
 {
   return this->iterator_implementation_ == rhs.iterator_implementation_;
 }
 
-template <ACE_T1> ACE_INLINE int
-ACE_Cache_Map_Iterator<ACE_T2>::operator!= (const ACE_Cache_Map_Iterator<ACE_T2> &rhs) const
+template <T_1> ACE_INLINE int
+ACE_Cache_Map_Iterator<T_2>::operator!= (const ACE_Cache_Map_Iterator<T_2> &rhs) const
 {
   return this->iterator_implementation_ != rhs.iterator_implementation_;
 }
 
-template <ACE_T1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
-ACE_Cache_Map_Iterator<ACE_T2>::operator* (void) const
+template <T_1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
+ACE_Cache_Map_Iterator<T_2>::operator* (void) const
 {
   value_type retn ((*this->iterator_implementation_).ext_id_,
                    (*this->iterator_implementation_).int_id_.first ());
   return retn;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2> &
-ACE_Cache_Map_Iterator<ACE_T2>::operator++ (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2> &
+ACE_Cache_Map_Iterator<T_2>::operator++ (void)
 {
   ++this->iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2>
-ACE_Cache_Map_Iterator<ACE_T2>::operator++ (int)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2>
+ACE_Cache_Map_Iterator<T_2>::operator++ (int)
 {
-  ACE_Cache_Map_Iterator<ACE_T2> retn = *this;
+  ACE_Cache_Map_Iterator<T_2> retn = *this;
   ++this->iterator_implementation_;
   return retn;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2> &
-ACE_Cache_Map_Iterator<ACE_T2>::operator-- (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2> &
+ACE_Cache_Map_Iterator<T_2>::operator-- (void)
 {
   --this->iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2>
-ACE_Cache_Map_Iterator<ACE_T2>::operator-- (int)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2>
+ACE_Cache_Map_Iterator<T_2>::operator-- (int)
 {
-  ACE_Cache_Map_Iterator<ACE_T2> retn = *this;
+  ACE_Cache_Map_Iterator<T_2> retn = *this;
   --this->iterator_implementation_;
   return retn;
 }
 
 
-template <ACE_T1> ACE_INLINE void
-ACE_Cache_Map_Iterator<ACE_T2>::dump (void) const
+template <T_1> ACE_INLINE void
+ACE_Cache_Map_Iterator<T_2>::dump (void) const
 {
   this->iterator_implementation_.dump ();
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Iterator<ACE_T2>::ACE_Cache_Map_Iterator (const IMPLEMENTATION &iterator_impl)
-  : iterator_implementation_ (iterator_impl)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Iterator<T_2>::ACE_Cache_Map_Iterator (const IMPLEMENTATION &iterator_impl)
+ : iterator_implementation_ (iterator_impl)
 {
 }
 
-template <ACE_T1> ACE_INLINE IMPLEMENTATION &
-ACE_Cache_Map_Iterator<ACE_T2>::iterator_implementation (void)
+template <T_1> ACE_INLINE IMPLEMENTATION &
+ACE_Cache_Map_Iterator<T_2>::iterator_implementation (void)
 {
   return this->iterator_implementation_;
 }
 
-#undef ACE_T1
-#undef ACE_T2
+#undef T_1
+#undef T_2
 
-////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define ACE_T1 class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES
+#define T_1 class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES
+#define T_2 KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator <ACE_T2> &rhs)
-  : reverse_iterator_implementation_ (rhs.reverse_iterator_implementation_)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2>::ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator <T_2> &rhs)
+ : reverse_iterator_implementation_ (rhs.reverse_iterator_implementation_)
 {
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::~ACE_Cache_Map_Reverse_Iterator (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2>::~ACE_Cache_Map_Reverse_Iterator (void)
 {
 }
 
-template <ACE_T1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<ACE_T2> &
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator= (const ACE_Cache_Map_Reverse_Iterator<ACE_T2> &rhs)
+template <T_1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<T_2> &
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator= (const ACE_Cache_Map_Reverse_Iterator<T_2> &rhs)
 {
   this->reverse_iterator_implementation_ = rhs.reverse_iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE int
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator== (const ACE_Cache_Map_Reverse_Iterator<ACE_T2> &rhs) const
+template <T_1> ACE_INLINE int
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator== (const ACE_Cache_Map_Reverse_Iterator<T_2> &rhs) const
 {
   return this->reverse_iterator_implementation_ == rhs.reverse_iterator_implementation_;
 }
 
-template <ACE_T1> ACE_INLINE int
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator!= (const ACE_Cache_Map_Reverse_Iterator<ACE_T2> &rhs) const
+template <T_1> ACE_INLINE int
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator!= (const ACE_Cache_Map_Reverse_Iterator<T_2> &rhs) const
 {
   return this->reverse_iterator_implementation_ != rhs.reverse_iterator_implementation_;
 }
 
-template <ACE_T1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator* (void) const
+template <T_1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator* (void) const
 {
   value_type retv ((*this->reverse_iterator_implementation_).ext_id_,
                    (*this->reverse_iterator_implementation_).int_id_.first ());
   return retv;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2> &
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator++ (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2> &
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator++ (void)
 {
   ++this->reverse_iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator++ (int)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2>
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator++ (int)
 {
-  ACE_Cache_Map_Reverse_Iterator<ACE_T2> retn = *this;
+  ACE_Cache_Map_Reverse_Iterator<T_2> retn = *this;
   ++this->reverse_iterator_implementation_;
   return retn;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2> &
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator-- (void)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2> &
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator-- (void)
 {
   --this->reverse_iterator_implementation_;
   return *this;
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator-- (int)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2>
+ACE_Cache_Map_Reverse_Iterator<T_2>::operator-- (int)
 {
-  ACE_Cache_Map_Reverse_Iterator<ACE_T2> retn = *this;
+  ACE_Cache_Map_Reverse_Iterator<T_2> retn = *this;
   --this->reverse_iterator_implementation_;
   return retn;
 }
 
 
-template <ACE_T1> ACE_INLINE void
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::dump (void) const
+template <T_1> ACE_INLINE void
+ACE_Cache_Map_Reverse_Iterator<T_2>::dump (void) const
 {
   this->reverse_iterator_implementation_.dump ();
 }
 
-template <ACE_T1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::ACE_Cache_Map_Reverse_Iterator (const REVERSE_IMPLEMENTATION &iterator_impl)
-  : reverse_iterator_implementation_(iterator_impl)
+template <T_1> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<T_2>::ACE_Cache_Map_Reverse_Iterator (const REVERSE_IMPLEMENTATION &iterator_impl)
+ : reverse_iterator_implementation_(iterator_impl)
 {
 }
 
-template <ACE_T1> ACE_INLINE REVERSE_IMPLEMENTATION &
-ACE_Cache_Map_Reverse_Iterator<ACE_T2>::iterator_implementation (void)
+template <T_1> ACE_INLINE REVERSE_IMPLEMENTATION &
+ACE_Cache_Map_Reverse_Iterator<T_2>::iterator_implementation (void)
 {
   return this->reverse_iterator_implementation_;
 }
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-#undef ACE_T1
-#undef ACE_T2
+#undef T_1
+#undef T_2
diff --git a/ace/Cached_Connect_Strategy_T.cpp b/ace/Cached_Connect_Strategy_T.cpp
index 9a555c7922a..7fb4e9dacef 100644
--- a/ace/Cached_Connect_Strategy_T.cpp
+++ b/ace/Cached_Connect_Strategy_T.cpp
@@ -25,11 +25,8 @@
 
 ACE_RCSID(ace, Cached_Connect_Strategy_T, "$Id$")
 
-#define ACE_T1 class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX
-#define ACE_T2 SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX
-
-template <ACE_T1>
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::ACE_Cached_Connect_Strategy_Ex
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::ACE_Cached_Connect_Strategy_Ex
 (CACHING_STRATEGY &caching_s,
  ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
  ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
@@ -42,15 +39,14 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::ACE_Cached_Connect_Strategy_Ex
   if (this->open (cre_s, con_s, rec_s) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_Cached_Connect_Strategy_Ex<ACE_T2>\n")));
+                ASYS_TEXT ("ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>\n")));
 }
 
-template <ACE_T1>
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::~ACE_Cached_Connect_Strategy_Ex (void)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Cached_Connect_Strategy_Ex (void)
 {
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
   // Close down all cached service handlers.
-  for (ACE_TYPENAME CONNECTION_CACHE::ITERATOR iter = this->connection_cache_.begin ();
+  for (CONNECTION_CACHE_ITERATOR iter = this->connection_cache_.begin ();
        iter != this->connection_cache_.end ();
        ++iter)
     {
@@ -60,11 +56,30 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::~ACE_Cached_Connect_Strategy_Ex (void)
           (*iter).second ()->close ();
         }
     }
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::open
+(ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
+ ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
+ ACE_Recycling_Strategy<SVC_HANDLER> *rec_s)
+{
+  int result = this->CCSBASE::open (cre_s, con_s, rec_s);
+  if (result == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ASYS_TEXT ("%p\n"),
+                       ASYS_TEXT ("Base initialisation failed\n")),
+                      -1);
+
+  if (this->caching_strategy ().open (&this->svc_cleanup_strategy_,
+                                      0) == -1)
+    return -1;
+
+  return 0;
+}
+
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::check_hint_i
 (SVC_HANDLER *&sh,
  const ACE_PEER_CONNECTOR_ADDR &remote_addr,
  ACE_Time_Value *timeout,
@@ -88,7 +103,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
   CONNECTION_CACHE_ENTRY *possible_entry = (CONNECTION_CACHE_ENTRY *) sh->recycling_act ();
 
   // Check to see if the hint svc_handler has been closed down
-  if (possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED)
+  if (possible_entry->ext_id_.state () == ACE_Recyclable::CLOSED)
     {
       // If close, decrement refcount
       if (possible_entry->ext_id_.decrement () == 0)
@@ -108,9 +123,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
 
   // If hint is not closed, see if it is connected to the correct
   // address and is recyclable
-  else if ((possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_AND_PURGABLE ||
-            possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE) &&
-           possible_entry->ext_id_.subject () == remote_addr)
+  else if (possible_entry->ext_id_ == remote_addr)
     {
       // Hint successful
       found = 1;
@@ -118,20 +131,6 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
       // Tell the <svc_handler> that it should prepare itself for
       // being recycled.
       this->prepare_for_recycling (sh);
-
-      //
-      // Update the caching attributes directly since we don't do a
-      // find() on the cache map.
-      //
-
-      // Indicates successful find.
-      int find_result = 0;
-
-      int result = this->caching_strategy ().notify_find (find_result,
-                                                          possible_entry->int_id_.second ());
-
-      if (result == -1)
-        return result;
     }
   else
     {
@@ -152,8 +151,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
   return 0;
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::find_or_create_svc_handler_i
 (SVC_HANDLER *&sh,
  const ACE_PEER_CONNECTOR_ADDR &remote_addr,
  ACE_Time_Value *timeout,
@@ -168,7 +167,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
 
   // Try to find the address in the cache.  Only if we don't find it
   // do we create a new <SVC_HANDLER> and connect it with the server.
-  if (this->find (search_addr, entry) == -1)
+  if (this->connection_cache_.find (search_addr, entry) == -1)
     {
       // Set the flag
       found = 0;
@@ -179,12 +178,12 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
 
       // Connect using the svc_handler.
       if (this->cached_connect (sh,
-                                remote_addr,
-                                timeout,
-                                local_addr,
-                                reuse_addr,
-                                flags,
-                                perms) == -1)
+                         remote_addr,
+                         timeout,
+                         local_addr,
+                         reuse_addr,
+                         flags,
+                         perms) == -1)
         {
           return -1;
         }
@@ -217,24 +216,24 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
 
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh,
-                                                        const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                                                        ACE_Time_Value *timeout,
-                                                        const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                                                        int reuse_addr,
-                                                        int flags,
-                                                        int perms)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cached_connect (SVC_HANDLER *&sh,
+                                                                                                                 const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                                                                                                                 ACE_Time_Value *timeout,
+                                                                                                                 const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                                                                                                                 int reuse_addr,
+                                                                                                                 int flags,
+                                                                                                                 int perms)
 {
   // Actively establish the connection.  This is a timed blocking
   // connect.
-  if (this->new_connection (sh,
-                            remote_addr,
-                            timeout,
-                            local_addr,
-                            reuse_addr,
-                            flags,
-                            perms) == -1)
+  if (this->CONNECT_STRATEGY::connect_svc_handler (sh,
+                                                   remote_addr,
+                                                   timeout,
+                                                   local_addr,
+                                                   reuse_addr,
+                                                   flags,
+                                                   perms) == -1)
     {
       // If connect() failed because of timeouts, we have to reject
       // the connection entirely. This is necessary since currently
@@ -244,24 +243,24 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh,
 
       if (errno == EWOULDBLOCK)
         errno = ENOTSUP;
-      else if (ACE::out_of_handles (errno))
+      else if (errno == EMFILE)
         {
           // If the connect failed due to the process running out of
           // file descriptors then, auto_purging of some connections
           // are done from the CONNECTION_CACHE. This frees the
           // descriptors which get used in the connect process and
           // hence the same method is called again!
-          if (this->purge_connections () == -1)
+          if (this->purge_connections (this->caching_strategy ().purge_percent ()) == -1)
             return -1;
 
           // Try connecting again.
-          if (this->new_connection (sh,
-                                    remote_addr,
-                                    timeout,
-                                    local_addr,
-                                    reuse_addr,
-                                    flags,
-                                    perms) == -1)
+          if (this->CONNECT_STRATEGY::connect_svc_handler (sh,
+                                                           remote_addr,
+                                                           timeout,
+                                                           local_addr,
+                                                           reuse_addr,
+                                                           flags,
+                                                           perms) == -1)
             {
               if (errno == EWOULDBLOCK)
                 errno = ENOTSUP;
@@ -279,8 +278,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh,
 }
 
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::connect_svc_handler_i
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::connect_svc_handler_i
 (SVC_HANDLER *&sh,
  const ACE_PEER_CONNECTOR_ADDR &remote_addr,
  ACE_Time_Value *timeout,
@@ -329,7 +328,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::connect_svc_handler_i
 
   // For all successful cases: mark the <svc_handler> in the cache
   // as being <in_use>.  Therefore recyclable is BUSY.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_BUSY);
+  entry->ext_id_.state (ACE_Recyclable::BUSY);
 
   // And increment the refcount
   entry->ext_id_.increment ();
@@ -338,46 +337,22 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::connect_svc_handler_i
 }
 
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cache_i (const void *recycling_act)
-{
-  // The wonders and perils of ACT
-  CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
-
-  // Mark the <svc_handler> in the cache as not being <in_use>.
-  // Therefore recyclable is IDLE.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_IDLE_AND_PURGABLE);
-
-  return 0;
-}
-
-template<ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::recycle_state_i (const void *recycling_act,
-                                                         ACE_Recyclable_State new_state)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cache_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
   CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
 
   // Mark the <svc_handler> in the cache as not being <in_use>.
   // Therefore recyclable is IDLE.
-  entry->ext_id_.recycle_state (new_state);
+  entry->ext_id_.state (ACE_Recyclable::IDLE_AND_PURGABLE);
 
   return 0;
 }
 
-template<ACE_T1> ACE_Recyclable_State
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::recycle_state_i (const void *recycling_act) const
-{
-  // The wonders and perils of ACT
-  CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
-
-  // Mark the <svc_handler> in the cache as not being <in_use>.
-  // Therefore recyclable is IDLE.
-  return entry->ext_id_.recycle_state ();
-}
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::purge_i (const void *recycling_act)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
   CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
@@ -386,20 +361,20 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::purge_i (const void *recycling_act)
 }
 
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::mark_as_closed_i (const void *recycling_act)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::mark_as_closed_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
   CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
 
   // Mark the <svc_handler> in the cache as CLOSED.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_CLOSED);
+  entry->ext_id_.state (ACE_Recyclable::CLOSED);
 
   return 0;
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup_hint_i (const void *recycling_act)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cleanup_hint_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
   CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
@@ -409,7 +384,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup_hint_i (const void *recycling_ac
 
   // If the svc_handler state is closed and the refcount == 0, call
   // close() on svc_handler.
-  if (entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED &&
+  if (entry->ext_id_.state () == ACE_Recyclable::CLOSED &&
       refcount == 0)
     {
       entry->int_id_.first ()->recycler (0, 0);
@@ -420,74 +395,20 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup_hint_i (const void *recycling_ac
   return 0;
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::purge_connections (void)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_connections (double percentage)
 {
+  // Set the percentage of entries to remove and then call purge on the cache.
+  this->caching_strategy ().purge_percent (percentage);
   return this->connection_cache_.purge ();
 }
 
-template <ACE_T1> CACHING_STRATEGY &
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::caching_strategy (void)
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> CACHING_STRATEGY &
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::caching_strategy (void)
 {
   return this->connection_cache_.caching_strategy ();
 }
 
-template <ACE_T1> int
-ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
-                                              ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry)
-{
-  typedef ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
-                                       ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,
-                                       ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                       ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                       ACE_Null_Mutex>
-    CONNECTION_CACHE_BUCKET_ITERATOR;
-
-  CONNECTION_CACHE_BUCKET_ITERATOR iterator (this->connection_cache_.map (),
-                                             search_addr);
-
-  CONNECTION_CACHE_BUCKET_ITERATOR end (this->connection_cache_.map (),
-                                        search_addr,
-                                        1);
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      REFCOUNTED_HASH_RECYCLABLE_ADDRESS &addr = (*iterator).ext_id_;
-
-      if (addr.recycle_state () != ACE_RECYCLABLE_IDLE_AND_PURGABLE &&
-          addr.recycle_state () != ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE)
-        continue;
-
-      if (addr.subject () != search_addr.subject ())
-        continue;
-
-      entry = &(*iterator);
-
-      //
-      // Update the caching attributes directly since we don't do a
-      // find() on the cache map.
-      //
-
-      // Indicates successful find.
-      int find_result = 0;
-
-      int result = this->caching_strategy ().notify_find (find_result,
-                                                          entry->int_id_.second ());
-
-      if (result == -1)
-        return result;
-
-      return 0;
-    }
-
-  return -1;
-}
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Cached_Connect_Strategy_Ex)
 
-#undef ACE_T1
-#undef ACE_T2
-
 #endif /* CACHED_CONNECT_STRATEGY_T_C */
diff --git a/ace/Cached_Connect_Strategy_T.h b/ace/Cached_Connect_Strategy_T.h
index 55f1c3dc411..59f070c9a46 100644
--- a/ace/Cached_Connect_Strategy_T.h
+++ b/ace/Cached_Connect_Strategy_T.h
@@ -57,18 +57,34 @@ public:
   virtual ~ACE_Cached_Connect_Strategy_Ex (void);
   // Destructor
 
-  virtual int purge_connections (void);
+  virtual int open (ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
+                    ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
+                    ACE_Recycling_Strategy<SVC_HANDLER> *rec_s);
+  // This methods allow you to change the strategies used by the
+  // cached connector.
+
+  virtual int cached_connect (SVC_HANDLER *&sh,
+                              const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                              ACE_Time_Value *timeout,
+                              const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                              int reuse_addr,
+                              int flags,
+                              int perms);
+  // Connection of the svc_handler with the remote host.
+  // This method also encapsulates the connection done with
+  // auto_purging under the hood. If the connect failed due to the
+  // process running out of file descriptors then, auto_purging of
+  // some connections are done from the CONNECTION_CACHE. This frees
+  // the descriptors which get used in the connect process and hence
+  // the connect operation can succeed.
+
+  virtual int purge_connections (double percentage = 10);
   // Explicit purging of connection entries from the connection cache.
 
   // = Typedefs for managing the map
   typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>
           REFCOUNTED_HASH_RECYCLABLE_ADDRESS;
-  typedef ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
-                                     SVC_HANDLER *,
-                                     ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                     ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                     CACHING_STRATEGY,
-                                     ATTRIBUTES>
+  typedef ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, CACHING_STRATEGY, ATTRIBUTES>
           CONNECTION_CACHE;
   typedef ACE_TYPENAME CONNECTION_CACHE::CACHE_ENTRY
           CONNECTION_CACHE_ENTRY;
@@ -76,16 +92,12 @@ public:
           KEY;
   typedef ACE_TYPENAME CONNECTION_CACHE::mapped_type
           VALUE;
+  typedef ACE_TYPENAME CONNECTION_CACHE::ITERATOR
+          CONNECTION_CACHE_ITERATOR;
 
   // = Cleanup of the svc_handler.
-  typedef ACE_Recyclable_Handler_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
-                                                  ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,
-                                                  ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
-                                                                          ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,
-                                                                          ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                                                          ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                                                          MUTEX> >
-          CLEANUP_STRATEGY;
+  typedef ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, ACE_Pair<SVC_HANDLER *, ATTRIBUTES>, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, MUTEX> >
+          SVC_CLEANUP_STRATEGY;
 
   typedef ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>
           CCSBASE;
@@ -95,21 +107,12 @@ public:
 
 protected:
 
-  int find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
-            ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry);
-  // Find an idle handle.
-
   virtual int purge_i (const void *recycling_act);
   // Remove from cache (non-locking version).
 
   virtual int cache_i (const void *recycling_act);
   // Add to cache (non-locking version).
 
-  virtual int recycle_state_i (const void *recycling_act,
-                               ACE_Recyclable_State new_state);
-  virtual ACE_Recyclable_State recycle_state_i (const void *recycling_act) const;
-  // Get/Set <recycle_state> (non-locking version).
-
   virtual int mark_as_closed_i (const void *recycling_act);
   // Mark as closed (non-locking version).
 
@@ -117,7 +120,8 @@ protected:
   // Cleanup hint.
 
   // = Helpers
-  int check_hint_i (SVC_HANDLER *&sh,
+
+  virtual int check_hint_i (SVC_HANDLER *&sh,
                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                     ACE_Time_Value *timeout,
                     const ACE_PEER_CONNECTOR_ADDR &local_addr,
@@ -127,7 +131,8 @@ protected:
                     ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
                     int &found);
 
-  int find_or_create_svc_handler_i (SVC_HANDLER *&sh,
+
+  virtual int find_or_create_svc_handler_i (SVC_HANDLER *&sh,
                                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                                     ACE_Time_Value *timeout,
                                     const ACE_PEER_CONNECTOR_ADDR &local_addr,
@@ -138,31 +143,20 @@ protected:
                                     int &found);
 
   virtual int connect_svc_handler_i (SVC_HANDLER *&sh,
-                                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                                     ACE_Time_Value *timeout,
-                                     const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                                     int reuse_addr,
-                                     int flags,
-                                     int perms,
-                                     int &found);
-
-  virtual int cached_connect (SVC_HANDLER *&sh,
-                              const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                              ACE_Time_Value *timeout,
-                              const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                              int reuse_addr,
-                              int flags,
-                              int perms);
-  // Connection of the svc_handler with the remote host.  This method
-  // also encapsulates the connection done with auto_purging under the
-  // hood. If the connect failed due to the process running out of
-  // file descriptors then, auto_purging of some connections are done
-  // from the CONNECTION_CACHE. This frees the descriptors which get
-  // used in the connect process and hence the connect operation can
-  // succeed.
+                             const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                             ACE_Time_Value *timeout,
+                             const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                             int reuse_addr,
+                             int flags,
+                             int perms,
+                             int &found);
 
   CONNECTION_CACHE connection_cache_;
   // Table that maintains the cache of connected <SVC_HANDLER>s.
+
+  SVC_CLEANUP_STRATEGY svc_cleanup_strategy_;
+  // The strategy which controls the destruction and closing of the
+  // svc_handler.
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
diff --git a/ace/Caching_Strategies_T.cpp b/ace/Caching_Strategies_T.cpp
index f36d593ad84..532064ae23e 100644
--- a/ace/Caching_Strategies_T.cpp
+++ b/ace/Caching_Strategies_T.cpp
@@ -15,39 +15,367 @@
 
 ACE_RCSID(ace, Caching_Strategies_T, "$Id$")
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::~ACE_Caching_Strategy (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_Caching_Strategy (void)
 {
 }
 
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LRU_Caching_Strategy (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_LRU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                                                 int delete_cleanup_strategy,
+                                                                                                                 CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                                                 int delete_caching_strategy_utility)
   : timer_ (0),
-    purge_percent_ (10)
+    purge_percent_ (10),
+    entries_ (0),
+    cleanup_strategy_ (0),
+    delete_cleanup_strategy_ (1),
+    caching_strategy_utility_ (0),
+    delete_caching_strategy_utility_ (1)
 {
+  if (this->open (cleanup_s,
+                  delete_cleanup_strategy,
+                  utility_s,
+                  delete_caching_strategy_utility) == -1)
+    ACE_ERROR ((LM_ERROR,
+                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("ACE_LRU_Caching_Strategy::ACE_LRU_Caching_Strategy")));
+
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_LRU_Caching_Strategy (void)
+{
+  if (this->delete_cleanup_strategy_ == 1)
+    delete this->cleanup_strategy_;
+  this->delete_cleanup_strategy_ = 0;
+  this->cleanup_strategy_ = 0;
+
+  if (this->delete_caching_strategy_utility_ == 1)
+    delete this->caching_strategy_utility_;
+  this->delete_caching_strategy_utility_ = 0;
+  this->caching_strategy_utility_ = 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                             int delete_cleanup_strategy,
+                                                                                             CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                             int delete_caching_strategy_utility)
+{
+  // Initialise the cleanup strategy.
+
+  // First we decide whether we need to clean up.
+   if (this->cleanup_strategy_ != 0 &&
+      this->delete_cleanup_strategy_ == 1 &&
+      cleanup_s != 0)
+    {
+      delete this->cleanup_strategy_;
+      this->cleanup_strategy_ = 0;
+      this->delete_cleanup_strategy_ = 0;
+    }
+
+  if (cleanup_s != 0)
+    {
+      this->cleanup_strategy_ = cleanup_s;
+      this->delete_cleanup_strategy_ = delete_cleanup_strategy;
+    }
+  else if (this->cleanup_strategy_ == 0)
+    {
+      ACE_NEW_RETURN (this->cleanup_strategy_,
+                      CLEANUP_STRATEGY,
+                      -1);
+
+      this->delete_cleanup_strategy_ = 1;
+    }
+
+  // Initialise the caching strategy utility.
+
+  // First we decide whether we need to clean up.
+  if (this->caching_strategy_utility_ != 0 &&
+      this->delete_caching_strategy_utility_ == 1 &&
+      utility_s != 0)
+    {
+      delete this->caching_strategy_utility_;
+      this->caching_strategy_utility_ = 0;
+      this->delete_caching_strategy_utility_ = 0;
+    }
+
+  if (utility_s != 0)
+    {
+      this->caching_strategy_utility_ = utility_s;
+      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
+    }
+  else if (this->caching_strategy_utility_ == 0)
+    {
+      ACE_NEW_RETURN (this->caching_strategy_utility_,
+                      CACHING_STRATEGY_UTILITY,
+                      -1);
+
+      this->delete_caching_strategy_utility_ = 1;
+    }
+
+  return 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container)
+{
+  return this->caching_strategy_utility_->clear_cache (container,
+                                                       this->cleanup_strategy_,
+                                                       this->purge_percent_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LFU_Caching_Strategy (void)
-  : purge_percent_ (10)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_LFU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                                                 int delete_cleanup_strategy,
+                                                                                                                 CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                                                 int delete_caching_strategy_utility)
+  : purge_percent_ (10),
+    entries_ (0),
+    cleanup_strategy_ (0),
+    delete_cleanup_strategy_ (1),
+    caching_strategy_utility_ (0),
+    delete_caching_strategy_utility_ (1)
+{
+  if (this->open (cleanup_s,
+                  delete_cleanup_strategy,
+                  utility_s,
+                  delete_caching_strategy_utility) == -1)
+    ACE_ERROR ((LM_ERROR,
+                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("ACE_LFU_Caching_Strategy::ACE_LFU_Caching_Strategy")));
+
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_LFU_Caching_Strategy (void)
+{
+  if (this->delete_cleanup_strategy_ == 1)
+    delete this->cleanup_strategy_;
+  this->delete_cleanup_strategy_ = 0;
+  this->cleanup_strategy_ = 0;
+
+  if (this->delete_caching_strategy_utility_ == 1)
+    delete this->caching_strategy_utility_;
+  this->delete_caching_strategy_utility_ = 0;
+  this->caching_strategy_utility_ = 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                             int delete_cleanup_strategy,
+                                                                                             CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                             int delete_caching_strategy_utility)
+{
+  // Initialise the cleanup strategy.
+
+  // First we decide whether we need to clean up.
+  if (this->cleanup_strategy_ != 0 &&
+      this->delete_cleanup_strategy_ == 1 &&
+      cleanup_s != 0)
+    {
+      delete this->cleanup_strategy_;
+      this->cleanup_strategy_ = 0;
+      this->delete_cleanup_strategy_ = delete_cleanup_strategy;
+    }
+
+  if (cleanup_s != 0)
+    this->cleanup_strategy_ = cleanup_s;
+  else if (this->cleanup_strategy_ == 0)
+    {
+      ACE_NEW_RETURN (this->cleanup_strategy_,
+                      CLEANUP_STRATEGY,
+                      -1);
+
+      this->delete_cleanup_strategy_ = 1;
+    }
+
+  // Initialise the caching strategy utility.
+
+  // First we decide whether we need to clean up.
+  if (this->caching_strategy_utility_ != 0 &&
+      this->delete_caching_strategy_utility_ == 1 &&
+      utility_s != 0)
+    {
+      delete this->caching_strategy_utility_;
+      this->caching_strategy_utility_ = 0;
+      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
+    }
+
+  if (utility_s != 0)
+    this->caching_strategy_utility_ = utility_s;
+  else if (this->caching_strategy_utility_ == 0)
+    {
+      ACE_NEW_RETURN (this->caching_strategy_utility_,
+                      CACHING_STRATEGY_UTILITY,
+                      -1);
+
+      this->delete_caching_strategy_utility_ = 1;
+    }
+
+  return 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container)
 {
+  return this->caching_strategy_utility_->clear_cache (container,
+                                                       this->cleanup_strategy_,
+                                                       this->purge_percent_);
 }
 
+
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_FIFO_Caching_Strategy (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_FIFO_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                                                   int delete_cleanup_strategy,
+                                                                                                                   CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                                                   int delete_caching_strategy_utility)
   : order_ (0),
-    purge_percent_ (10)
+    purge_percent_ (10),
+    entries_ (0),
+    cleanup_strategy_ (0),
+    delete_cleanup_strategy_ (1),
+    caching_strategy_utility_ (0),
+    delete_caching_strategy_utility_ (1)
+{
+  if (this->open (cleanup_s,
+                  delete_cleanup_strategy,
+                  utility_s,
+                  delete_caching_strategy_utility) == -1)
+    ACE_ERROR ((LM_ERROR,
+                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("ACE_FIFO_Caching_Strategy::ACE_FIFO_Caching_Strategy")));
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_FIFO_Caching_Strategy (void)
+
 {
+  if (this->delete_cleanup_strategy_ == 1)
+    delete this->cleanup_strategy_;
+  this->delete_cleanup_strategy_ = 0;
+  this->cleanup_strategy_ = 0;
+
+  if (this->delete_caching_strategy_utility_ == 1)
+    delete this->caching_strategy_utility_;
+  this->delete_caching_strategy_utility_ = 0;
+  this->caching_strategy_utility_ = 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                              int delete_cleanup_strategy,
+                                                                                              CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                              int delete_caching_strategy_utility)
+{
+  // Initialise the cleanup strategy.
+
+  // First we decide whether we need to clean up.
+  if (this->cleanup_strategy_ != 0 &&
+      this->delete_cleanup_strategy_ == 1 &&
+      cleanup_s != 0)
+    {
+      delete this->cleanup_strategy_;
+      this->cleanup_strategy_ = 0;
+      this->delete_cleanup_strategy_ = delete_cleanup_strategy;
+    }
+
+  if (cleanup_s != 0)
+    this->cleanup_strategy_ = cleanup_s;
+  else if (this->cleanup_strategy_ == 0)
+    {
+      ACE_NEW_RETURN (this->cleanup_strategy_,
+                      CLEANUP_STRATEGY,
+                      -1);
+
+      this->delete_cleanup_strategy_ = 1;
+    }
+
+  // Initialise the caching strategy utility.
+
+  // First we decide whether we need to clean up.
+  if (this->caching_strategy_utility_ != 0 &&
+      this->delete_caching_strategy_utility_ == 1 &&
+      utility_s != 0)
+    {
+      delete this->caching_strategy_utility_;
+      this->caching_strategy_utility_ = 0;
+      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
+    }
+
+  if (utility_s != 0)
+    this->caching_strategy_utility_ = utility_s;
+  else if (this->caching_strategy_utility_ == 0)
+    {
+      ACE_NEW_RETURN (this->caching_strategy_utility_,
+                      CACHING_STRATEGY_UTILITY,
+                      -1);
+
+      this->delete_caching_strategy_utility_ = 1;
+    }
+
+  return 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container)
+{
+  return this->caching_strategy_utility_->clear_cache (container,
+                                                       this->cleanup_strategy_,
+                                                       this->purge_percent_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_Null_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                                                   int delete_cleanup_strategy,
+                                                                                                                   CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                                                   int delete_caching_strategy_utility)
+{
+  ACE_UNUSED_ARG (cleanup_s);
+  ACE_UNUSED_ARG (delete_cleanup_strategy);
+  ACE_UNUSED_ARG (utility_s);
+  ACE_UNUSED_ARG (delete_caching_strategy_utility);
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                              int delete_cleanup_strategy,
+                                                                                              CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                              int delete_caching_strategy_utility)
+{
+  ACE_UNUSED_ARG (cleanup_s);
+  ACE_UNUSED_ARG (delete_cleanup_strategy);
+  ACE_UNUSED_ARG (utility_s);
+  ACE_UNUSED_ARG (delete_caching_strategy_utility);
+
+  return 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_Null_Caching_Strategy (void)
+{
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container)
+{
+  ACE_UNUSED_ARG (container);
+
+  return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LRU_Caching_Strategy)
 ACE_ALLOC_HOOK_DEFINE(ACE_LFU_Caching_Strategy)
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Caching_Strategy)
diff --git a/ace/Caching_Strategies_T.h b/ace/Caching_Strategies_T.h
index 41966b677f0..44b5e31f096 100644
--- a/ace/Caching_Strategies_T.h
+++ b/ace/Caching_Strategies_T.h
@@ -25,11 +25,9 @@
 #define  ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined(_MSC_VER)
-#pragma warning(disable:4503)
-#endif /* _MSC_VER */
+#include "ace/Cleanup_Strategies_T.h"
 
-template <class ATTRIBUTES, class CACHING_UTILITY>
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 class ACE_Caching_Strategy
 {
   // = TITLE
@@ -44,6 +42,12 @@ public:
   virtual ~ACE_Caching_Strategy (void);
   // Destructor.
 
+  virtual int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+                    int delete_cleanup_strategy = 1,
+                    CACHING_STRATEGY_UTILITY *utility_s = 0,
+                    int delete_caching_strategy_utility = 1) = 0;
+  // This method which does the actual initialisation.
+
   virtual ATTRIBUTES attributes (void) = 0;
   // Accessor method for the timer attributes.
 
@@ -78,8 +82,9 @@ public:
   // This method acts as a notification about the CONTAINERs rebind
   // method call
 
-  virtual CACHING_UTILITY &caching_utility (void) = 0;
-  // Purge the cache.
+  virtual int clear_cache (CONTAINER &container) = 0;
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
 
   virtual void dump (void) const = 0;
   // Dumps the state of the object.
@@ -87,8 +92,8 @@ public:
 
 //////////////////////////////////////////////////////////////////////////
 
-template <class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION>
-class ACE_Caching_Strategy_Adapter : public ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION>
+class ACE_Caching_Strategy_Adapter : public ACE_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>
 {
   // = TITLE
   //     This class follows the Adaptor pattern and is used to provide
@@ -109,6 +114,12 @@ public:
   ~ACE_Caching_Strategy_Adapter (void);
   // Destructor.
 
+  int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1,
+            CACHING_STRATEGY_UTILITY *utility_s = 0,
+            int delete_caching_strategy_utility = 1);
+  // This method which does the actual initialisation.
+
   ATTRIBUTES attributes (void);
   // Accessor method for the timer attributes.
 
@@ -143,12 +154,13 @@ public:
   // This method acts as a notification about the CONTAINERs rebind
   // method call
 
+  int clear_cache (CONTAINER &container);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
+
   IMPLEMENTATION &implementation (void);
   // Accessor to the implementation.
 
-  CACHING_UTILITY &caching_utility (void);
-  // Purge the cache.
-
   void dump (void) const;
   // Dumps the state of the object.
 
@@ -163,7 +175,7 @@ private:
 
 //////////////////////////////////////////////////////////////////////////
 
-template <class ATTRIBUTES, class CACHING_UTILITY>
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 class ACE_LRU_Caching_Strategy
 {
   // = TITLE
@@ -181,7 +193,7 @@ class ACE_LRU_Caching_Strategy
   //     The ATTRIBUTES are the deciding factor for purging of entries
   //     and should logically be included with the VALUE. Some ways of
   //     doing this are: As being a member of the VALUE or VALUE being
-  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_UTILITY is the
+  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the
   //     class which can be plugged in and which decides the entries
   //     to purge.
 
@@ -189,18 +201,37 @@ public:
 
   // Traits.
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
+  typedef CONTAINER CACHE;
 
   // = Initialisation and termination.
 
-  ACE_LRU_Caching_Strategy (void);
-  // The <container> is the map in which the entries reside.  The
-  // timer attribute is initialed to zero in this constructor.  And
-  // the <purge_percent> field denotes the percentage of the entries
+  ACE_LRU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+                            int delete_cleanup_strategy = 1,
+                            CACHING_STRATEGY_UTILITY *utility_s = 0,
+                            int delete_caching_strategy_utility = 1);
+  // The <container> is the map in which the entries reside.
+  // The Cleanup_Strategy is the callback class to which the entries
+  // to be cleaned up will be delegated. The <delete_cleanup_strategy>
+  // flag is needed to decide the ownership of the cleanup strategy.
+  // Also, the timer attribute is initialed to zero in this constructor.
+  // And the <purge_percent> field denotes the percentage of the entries
   // in the cache which can be purged automagically and by default is
-  // set to 10%.
+  // set to 10%. The ultility which helps the caching strategy in the
+  // purging of entries needs to be specified. By default a new one
+  // will be created of type CACHING_STRATEGY_UTILITY and
+  // <delete_caching_strategy_utility> decides whether to destroy the
+  // utility object or not.
+
+  ~ACE_LRU_Caching_Strategy (void);
 
   // = Operations of the strategy.
 
+  int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1,
+            CACHING_STRATEGY_UTILITY *utility_s = 0,
+            int delete_caching_strategy_utility = 1);
+  // This method which does the actual initialisation.
+
   ATTRIBUTES attributes (void);
   // Accessor method for the timer attributes.
 
@@ -237,14 +268,17 @@ public:
   // This method acts as a notification about the CONTAINERs rebind
   // method call
 
-  CACHING_UTILITY &caching_utility (void);
-  // Purge the cache.
+  int clear_cache (CONTAINER &container);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
 
   void dump (void) const;
   // Dumps the state of the object.
 
 private:
 
+  typedef ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
+
   ATTRIBUTES timer_;
   // This element is the one which is the deciding factor for purging
   // of an ITEM.
@@ -252,14 +286,31 @@ private:
   double purge_percent_;
   // The level about which the purging will happen automagically.
 
-  CACHING_UTILITY caching_utility_;
+  unsigned int entries_;
+  // The no of entries bound in the cache.
+
+  ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_;
+  // The cleanup strategy which can be used to destroy the entries of
+  // the container.
+
+  int delete_cleanup_strategy_;
+  // The flag which denotes the ownership of the cleanup strategy.
+  // If 1 then this class itself will destroy the strategy.
+
+  CACHING_STRATEGY_UTILITY *caching_strategy_utility_;
   // This is the helper class which will decide and expunge entries
   // from the cache.
+
+  int delete_caching_strategy_utility_;
+  // The flag which denotes the ownership of the
+  // caching_strategy_utility. If 1 then this class itself will
+  // destroy the strategy utility object.
+
 };
 
 //////////////////////////////////////////////////////////////////////////
 
-template <class ATTRIBUTES, class CACHING_UTILITY>
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 class ACE_LFU_Caching_Strategy
 {
   // = TITLE
@@ -277,7 +328,7 @@ class ACE_LFU_Caching_Strategy
   //     The ATTRIBUTES are the deciding factor for purging of entries
   //     and should logically be included with the VALUE. Some ways of
   //     doing this are: As being a member of the VALUE or VALUE being
-  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_UTILITY is the
+  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the
   //     class which can be plugged in and which decides the entries
   //     to purge.
 
@@ -285,15 +336,34 @@ public:
 
   // Traits.
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
+  typedef CONTAINER CACHE;
 
   // = Initialisation and termination methods.
 
-  ACE_LFU_Caching_Strategy (void);
-  // The <container> is the map in which the entries reside.  The
-  // timer attribute is initialed to zero in this constructor.  And
-  // the <purge_percent> field denotes the percentage of the entries
+  ACE_LFU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+                            int delete_cleanup_strategy = 1,
+                            CACHING_STRATEGY_UTILITY *utility_s = 0,
+                            int delete_caching_strategy_utility = 1);
+  // The <container> is the map in which the entries reside.
+  // The Cleanup_Strategy is the callback class to which the entries
+  // to be cleaned up will be delegated. The <delete_cleanup_strategy>
+  // flag is needed to decide the ownership of the cleanup strategy.
+  // Also, the timer attribute is initialed to zero in this constructor.
+  // And the <purge_percent> field denotes the percentage of the entries
   // in the cache which can be purged automagically and by default is
-  // set to 10%.
+  // set to 10%.The ultility which helps the caching strategy in the
+  // purging of entries will be default be the
+  // ACE_Caching_Strategy_Utility and the
+  // <delete_caching_strategy_utility> decides whether to destroy the
+  // utility or not.
+
+  ~ACE_LFU_Caching_Strategy (void);
+
+  int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1,
+            CACHING_STRATEGY_UTILITY *utility_s = 0,
+            int delete_caching_strategy_utility = 1);
+  // This method which does the actual initialisation.
 
   // = Strategy methods.
 
@@ -331,25 +401,45 @@ public:
   // This method acts as a notification about the CONTAINERs rebind
   // method call
 
-  CACHING_UTILITY &caching_utility (void);
-  // Purge the cache.
+
+  int clear_cache (CONTAINER &container);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
 
   void dump (void) const;
   // Dumps the state of the object.
 
 private:
 
+  typedef ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
+
   double purge_percent_;
   // The level about which the purging will happen automagically.
 
-  CACHING_UTILITY caching_utility_;
+  unsigned int entries_;
+  // The no of entries bound in the cache.
+
+  ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_;
+  // The cleanup strategy which can be used to destroy the entries of
+  // the container.
+
+  int delete_cleanup_strategy_;
+  // The flag which denotes the ownership of the cleanup strategy.
+  // If 1 then this class itself will destroy the strategy.
+
+  CACHING_STRATEGY_UTILITY *caching_strategy_utility_;
   // This is the helper class which will decide and expunge entries
   // from the cache.
+
+  int delete_caching_strategy_utility_;
+  // The flag which denotes the ownership of the
+  // caching_strategy_utility. If 1 then this class itself will
+  // destroy the strategy utility object.
 };
 
 /////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 class ACE_FIFO_Caching_Strategy
 {
   // = TITLE
@@ -365,22 +455,41 @@ class ACE_FIFO_Caching_Strategy
   //     The ATTRIBUTES are the deciding factor for purging of entries
   //     and should logically be included with the VALUE. Some ways of
   //     doing this are: As being a member of the VALUE or VALUE being
-  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_UTILITY is the
+  //     ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the
   //     class which can be plugged in and which decides the entries
   //     to purge.
 
 public:
 
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
+  typedef CONTAINER CACHE;
 
   // = Initialisation and termination.
 
-  ACE_FIFO_Caching_Strategy (void);
-  // The <container> is the map in which the entries reside.  The
-  // timer attribute is initialed to zero in this constructor.  And
-  // the <purge_percent> field denotes the percentage of the entries
+  ACE_FIFO_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+                             int delete_cleanup_strategy = 1,
+                             CACHING_STRATEGY_UTILITY *utility_s = 0,
+                             int delete_caching_strategy_utility = 1);
+  // The <container> is the map in which the entries reside.
+  // The Cleanup_Strategy is the callback class to which the entries
+  // to be cleaned up will be delegated. The <delete_cleanup_strategy>
+  // flag is needed to decide the ownership of the cleanup strategy.
+  // Also, the timer attribute is initialed to zero in this constructor.
+  // And the <purge_percent> field denotes the percentage of the entries
   // in the cache which can be purged automagically and by default is
-  // set to 10%.
+  // set to 10%.The ultility which helps the caching strategy in the
+  // purging of entries will be default be the
+  // ACE_Caching_Strategy_Utility and the
+  // <delete_caching_strategy_utility> decides whether to destroy the
+  // utility or not.
+
+  ~ACE_FIFO_Caching_Strategy (void);
+
+  int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1,
+            CACHING_STRATEGY_UTILITY *utility_s = 0,
+            int delete_caching_strategy_utility = 1);
+  // This method which does the actual initialisation.
 
   // = Strategy methods.
 
@@ -417,14 +526,17 @@ public:
                      const ATTRIBUTES &attr);
   // Notification for an item getting bound again into the cache.
 
-  CACHING_UTILITY &caching_utility (void);
-  // Purge the cache.
+  int clear_cache (CONTAINER &container);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
 
   void dump (void) const;
   // Dumps the state of the object.
 
 private:
 
+  typedef ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
+
   ATTRIBUTES order_;
   // The order is the deciding factor for the item to be removed from
   // the cache.
@@ -432,12 +544,29 @@ private:
   double purge_percent_;
   // The level about which the purging will happen automagically.
 
-  CACHING_UTILITY caching_utility_;
+  unsigned int entries_;
+  // The no of entries bound in the cache.
+
+  ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_;
+  // The cleanup strategy which can be used to destroy the entries of
+  // the container.
+
+  int delete_cleanup_strategy_;
+  // The flag which denotes the ownership of the cleanup strategy.
+  // If 1 then this class itself will destroy the strategy.
+
+  CACHING_STRATEGY_UTILITY *caching_strategy_utility_;
   // This is the helper class which will decide and expunge entries
   // from the cache.
+
+  int delete_caching_strategy_utility_;
+  // The flag which denotes the ownership of the
+  // caching_strategy_utility. If 1 then this class itself will
+  // destroy the strategy utility object.
+
 };
 
-template<class ATTRIBUTES, class CACHING_UTILITY>
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 class ACE_Null_Caching_Strategy
 {
   // = TITLE
@@ -452,6 +581,23 @@ public:
 
   // = Traits.
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
+  typedef CONTAINER CACHE;
+
+  // = Initialisation and termination.
+
+  ACE_Null_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+                             int delete_cleanup_strategy = 1,
+                             CACHING_STRATEGY_UTILITY *utility_s = 0,
+                             int delete_caching_strategy_utility = 1);
+
+  ~ACE_Null_Caching_Strategy (void);
+
+
+  int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1,
+            CACHING_STRATEGY_UTILITY *utility_s = 0,
+            int delete_caching_strategy_utility = 1);
+  // This method which does the actual initialisation.
 
   // = Strategy methods. All are NO_OP methods!!!
 
@@ -488,17 +634,13 @@ public:
                      const ATTRIBUTES &attr);
   // Notification for an item getting bound again into the cache.
 
-  CACHING_UTILITY &caching_utility (void);
-  // Purge the cache.
+  int clear_cache (CONTAINER &container);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove.
 
   void dump (void) const;
   // Dumps the state of the object.
 
-private:
-
-  CACHING_UTILITY caching_utility_;
-  // This is the helper class which will decide and expunge entries
-  // from the cache.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Caching_Strategies_T.i b/ace/Caching_Strategies_T.i
index 8a6e2493b9e..8e114434cf2 100644
--- a/ace/Caching_Strategies_T.i
+++ b/ace/Caching_Strategies_T.i
@@ -3,9 +3,9 @@
 
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation,
-                                                                                                         int delete_implementation)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE 
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation,
+                                                                                                                                         int delete_implementation)
   : implementation_ (implementation),
     delete_implementation_ (delete_implementation)
 {
@@ -17,89 +17,100 @@ ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::ACE_C
     }
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::~ACE_Caching_Strategy_Adapter (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE 
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::~ACE_Caching_Strategy_Adapter (void)
 {
   if (this->delete_implementation_)
-    {
-      delete this->implementation_;
-      this->delete_implementation_ = 0;
-      this->implementation_ = 0;
-    }
+    delete this->implementation_;
+  this->delete_implementation_ = 0;
+  this->implementation_ = 0;
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                                                 int delete_cleanup_strategy,
+                                                                                                                 CACHING_STRATEGY_UTILITY *utility_s,
+                                                                                                                 int delete_caching_strategy_utility)
+{
+  return this->implementation_->open (cleanup_s,
+                                      delete_cleanup_strategy,
+                                      utility_s,
+                                      delete_caching_strategy_utility);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE ATTRIBUTES
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::attributes (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE ATTRIBUTES
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::attributes (void)
 {
   return this->implementation_->attributes ();
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE double
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::purge_percent (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE double
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::purge_percent (void)
 {
   return this->implementation_->purge_percent ();
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE void
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::purge_percent (double percentage)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE void
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::purge_percent (double percentage)
 {
   this->implementation_->purge_percent (percentage);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::notify_bind (int result,
-                                                                                        const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_bind (int result,
+                                                                                                                        const ATTRIBUTES &attr)
 {
   return this->implementation_->notify_bind (result,
                                              attr);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::notify_find (int result,
-                                                                                        ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_find (int result,
+                                                                                                                        ATTRIBUTES &attr)
 {
   return this->implementation_->notify_find (result,
                                              attr);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::notify_unbind (int result,
-                                                                                          const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_unbind (int result,
+                                                                                                                          const ATTRIBUTES &attr)
 {
   return this->implementation_->notify_unbind (result,
                                                attr);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::notify_trybind (int result,
-                                                                                           ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_trybind (int result,
+                                                                                                                           ATTRIBUTES &attr)
 {
   return this->implementation_->notify_trybind (result,
                                                 attr);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::notify_rebind (int result,
-                                                                                          const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_rebind (int result,
+                                                                                                                          const ATTRIBUTES &attr)
 {
   return this->implementation_->notify_rebind (result,
                                                attr);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE IMPLEMENTATION &
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::implementation (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::clear_cache (CONTAINER &container)
 {
-  return *this->implementation_;
+  return this->implementation_->clear_cache (container);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE CACHING_UTILITY &
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::caching_utility (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE IMPLEMENTATION &
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::implementation (void)
 {
-  return this->implementation_->caching_utility ();
+  return *this->implementation_;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE void
-ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::dump (void) const
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE void
+ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::dump (void) const
 {
   ACE_TRACE ("ACE_Caching_Strategy_Adapter::dump");
 
@@ -109,39 +120,42 @@ ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::dump
 
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE ATTRIBUTES
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::attributes (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE ATTRIBUTES
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
 {
   return this->timer_;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE double
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return this->purge_percent_;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (double percentage)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
 {
   this->purge_percent_ = percentage;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (int result,
-                                                                    const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+                                                                                                    const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   if (result == 0)
-    ++this->timer_;
+    {
+      ++this->timer_;
+      ++this->entries_;
+    }
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
-                                                                    ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+                                                                                                    ATTRIBUTES &attr)
 {
   if (result == 0)
     {
@@ -152,26 +166,26 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_unbind (int result,
-                                                                      const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+                                                                                                      const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_trybind (int result,
-                                                                       ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+                                                                                                       ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result,
-                                                                      const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
+                                                                                                      const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
@@ -181,14 +195,8 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE CACHING_UTILITY &
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
-{
-  return this->caching_utility_;
-}
-
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
 {
   ACE_TRACE ("ACE_LRU_Caching_Strategy::dump");
 
@@ -199,78 +207,79 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE ATTRIBUTES
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::attributes (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE ATTRIBUTES
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
 {
   return 0;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE double
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return this->purge_percent_;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (double percentage)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
 {
   this->purge_percent_ = percentage;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (int result,
-                                                                    const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+                                                                                                    const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
+  if (result == 0)
+    ++this->entries_;
+
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
-                                                                    ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+                                                                                                    ATTRIBUTES &attr)
 {
+  ACE_UNUSED_ARG (attr);
+
   if (result == 0)
     ++attr;
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_trybind (int result,
-                                                                       ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+                                                                                                       ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result,
-                                                                      const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
+                                                                                                      const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
+  if (result == 0)
+    ++this->entries_;
+
   return result;
 }
-
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_unbind (int result,
-                                                                      const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+                                                                                                      const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE CACHING_UTILITY &
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
-{
-  return this->caching_utility_;
-}
-
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
 {
   ACE_TRACE ("ACE_LFU_Caching_Strategy::dump");
 
@@ -280,83 +289,84 @@ ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 
 //////////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE ATTRIBUTES
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::attributes (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE ATTRIBUTES
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
 {
   return this->order_;
 }
-
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE double
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return this->purge_percent_;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (double percentage)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
 {
   this->purge_percent_ = percentage;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (int result,
-                                                                     const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+                                                                                                     const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   if (result == 0)
-    ++this->order_;
+    {
+      ++this->order_;
+      ++this->entries_;
+    }
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
-                                                                     ATTRIBUTES &attr)
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+                                                                                                     ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_unbind (int result,
-                                                                       const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+                                                                                                       const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_trybind (int result,
-                                                                        ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+                                                                                                        ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result,
-                                                                       const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
+                                                                                                       const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   if (result == 0)
-    ++this->order_;
+    {
+      ++this->order_;
+      ++this->entries_;
+    }
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE CACHING_UTILITY &
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
-{
-  return this->caching_utility_;
-}
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
 {
   ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump");
 
@@ -367,77 +377,71 @@ ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE ATTRIBUTES
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::attributes (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE ATTRIBUTES
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
 {
   return 0;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE double
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (void)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return 0;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::purge_percent (double percentage)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
 {
   ACE_UNUSED_ARG (percentage);
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_bind (int result,
-                                                                     const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+                                                                                                     const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
-
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_find (int result,
-                                                                     ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+                                                                                                     ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_unbind (int result,
-                                                                       const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+                                                                                                       const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_trybind (int result,
-                                                                        ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+                                                                                                        ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::notify_rebind (int result,
-                                                                       const ATTRIBUTES &attr)
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
+                                                                                                       const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
 
   return result;
 }
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE CACHING_UTILITY &
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
-{
-  return this->caching_utility_;
-}
 
-template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
-ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
 {
   ACE_TRACE ("ACE_Null_Caching_Strategy::dump");
 
diff --git a/ace/Caching_Utility_T.cpp b/ace/Caching_Utility_T.cpp
index 2d9b4c072ef..03a95809c22 100644
--- a/ace/Caching_Utility_T.cpp
+++ b/ace/Caching_Utility_T.cpp
@@ -9,6 +9,7 @@
 #define ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Cleanup_Strategies_T.h"
 #include "ace/Strategies.h"
 
 #if !defined (__ACE_INLINE__)
@@ -19,29 +20,9 @@ ACE_RCSID(ace, Caching_Utility_T, "$Id$")
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
-                                                                                                 int delete_cleanup_strategy)
-  : cleanup_strategy_ (cleanup_strategy),
-    delete_cleanup_strategy_ (delete_cleanup_strategy)
-{
-  if (cleanup_strategy == 0)
-    {
-      ACE_NEW (this->cleanup_strategy_,
-               CLEANUP_STRATEGY);
-      this->delete_cleanup_strategy_ = 1;
-    }
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Pair_Caching_Utility (void)
-{
-  if (this->delete_cleanup_strategy_)
-    delete this->cleanup_strategy_;
-}
-
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int
 ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container,
+                                                                                    ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                                                                                     double purge_percent)
 {
   // Check that the purge_percent is non-zero.
@@ -76,9 +57,9 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cac
       if (key_to_remove == 0)
         return 0;
 
-      if (this->cleanup_strategy_->cleanup (container,
-                                            key_to_remove,
-                                            value_to_remove) == -1)
+      if (cleanup_s->cleanup (container,
+                              key_to_remove,
+                              value_to_remove) == -1)
         return -1;
 
     }
@@ -97,7 +78,7 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (
   ATTRIBUTES min = (*iter).int_id_.second ();
   key_to_remove = &(*iter).ext_id_;
   value_to_remove = &(*iter).int_id_;
-
+  
   // The iterator moves thru the container searching for the entry
   // with the lowest ATTRIBUTES.
   for (++iter;
@@ -116,72 +97,6 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
-                                                                                                                             int delete_cleanup_strategy)
-  : cleanup_strategy_ (cleanup_strategy),
-    delete_cleanup_strategy_ (delete_cleanup_strategy)
-{
-  if (cleanup_strategy == 0)
-    {
-      ACE_NEW (this->cleanup_strategy_,
-               CLEANUP_STRATEGY);
-      this->delete_cleanup_strategy_ = 1;
-    }
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Recyclable_Handler_Caching_Utility (void)
-{
-  if (this->delete_cleanup_strategy_)
-    delete this->cleanup_strategy_;
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int
-ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container,
-                                                                                                  double purge_percent)
-{
-  // Check that the purge_percent is non-zero.
-  if (purge_percent == 0)
-    return 0;
-
-  // Get the number of entries in the container.
-  size_t current_map_size = container.current_size ();
-
-  // Also whether the number of entries in the cache is just one!
-  // Oops! then there is no way out but exiting. So return an error.
-  if (current_map_size <= 1)
-    return 0;
-
-  // Calculate the no of entries to remove from the cache depending
-  // upon the <purge_percent>.
-  size_t entries_to_remove = size_t ((double (purge_percent) / 100 * current_map_size) + 0.5);
-
-  KEY *key_to_remove = 0;
-  VALUE *value_to_remove = 0;
-
-  for (size_t i = 0; i < entries_to_remove ; ++i)
-    {
-      this->minimum (container,
-                     key_to_remove,
-                     value_to_remove);
-
-      // Simply verifying that the key is non-zero.
-      // This is important for strategies where the minimum
-      // entry cant be found due to constraints on the type of entry
-      // to remove.
-      if (key_to_remove == 0)
-        return 0;
-
-      if (this->cleanup_strategy_->cleanup (container,
-                                            key_to_remove,
-                                            value_to_remove) == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> void
 ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (CONTAINER &container,
                                                                                               KEY *&key_to_remove,
@@ -204,56 +119,32 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT
     {
       // If the <min> entry isnt IDLE_AND_PURGABLE continue until you reach
       // the first entry which can be purged. This is the minimum with
-      // which you will compare the rest of the purgable entries.
-      if ((*iter).ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_AND_PURGABLE ||
-          (*iter).ext_id_.recycle_state () == ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE)
+      // which you will compare the rest of the purgable entries.   
+      if ((*iter).ext_id_.state () ==
+          ACE_Recyclable::IDLE_AND_PURGABLE)
         {
           if (found == 0)
             {
               min = (*iter).int_id_.second ();
-              key_to_remove = &(*iter).ext_id_;
-              value_to_remove = &(*iter).int_id_;
               found = 1;
-            }
-          else
+            }          
+          else 
             {
               // Ah! an entry with lower ATTTRIBUTES...
               if (min > (*iter).int_id_.second ())
-                {
-                  min = (*iter).int_id_.second ();
-                  key_to_remove = &(*iter).ext_id_;
-                  value_to_remove = &(*iter).int_id_;
-                }
+                min = (*iter).int_id_.second ();             
             }
+          key_to_remove = &(*iter).ext_id_;
+          value_to_remove = &(*iter).int_id_;  
         }
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
-                                                                                                       int delete_cleanup_strategy)
-  : cleanup_strategy_ (cleanup_strategy),
-    delete_cleanup_strategy_ (delete_cleanup_strategy)
-{
-  if (cleanup_strategy == 0)
-    {
-      ACE_NEW (this->cleanup_strategy_,
-               CLEANUP_STRATEGY);
-      this->delete_cleanup_strategy_ = 1;
-    }
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Handler_Caching_Utility (void)
-{
-  if (this->delete_cleanup_strategy_)
-    delete this->cleanup_strategy_;
-}
-
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int
 ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container,
+                                                                                       ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                                                                                        double purge_percent)
 {
   // Check that the purge_percent is non-zero.
@@ -281,9 +172,9 @@ ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_
                      key_to_remove,
                      value_to_remove);
 
-      if (this->cleanup_strategy_->cleanup (container,
-                                            key_to_remove,
-                                            value_to_remove) == -1)
+      if (cleanup_s->cleanup (container,
+                              key_to_remove,
+                              value_to_remove) == -1)
         return -1;
     }
 
@@ -321,32 +212,13 @@ ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimu
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Null_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
-                                                                                                 int delete_cleanup_strategy)
-  : cleanup_strategy_ (cleanup_strategy),
-    delete_cleanup_strategy_ (delete_cleanup_strategy)
-{
-  if (cleanup_strategy == 0)
-    {
-      ACE_NEW (this->cleanup_strategy_,
-               CLEANUP_STRATEGY);
-      this->delete_cleanup_strategy_ = 1;
-    }
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Null_Caching_Utility (void)
-{
-  if (this->delete_cleanup_strategy_)
-    delete this->cleanup_strategy_;
-}
-
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int
 ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container,
+                                                                                    ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                                                                                     double purge_percent)
 {
   ACE_UNUSED_ARG (container);
+  ACE_UNUSED_ARG (cleanup_s);
   ACE_UNUSED_ARG (purge_percent);
 
   return 0;
diff --git a/ace/Caching_Utility_T.h b/ace/Caching_Utility_T.h
index 966bca32b9f..542aabff285 100644
--- a/ace/Caching_Utility_T.h
+++ b/ace/Caching_Utility_T.h
@@ -23,7 +23,9 @@
 #define  ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Cleanup_Strategies_T.h"
+// Forward declaration
+template <class KEY, class VALUE, class CONTAINER>
+class ACE_Cleanup_Strategy;
 
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
 class ACE_Pair_Caching_Utility
@@ -32,52 +34,34 @@ class ACE_Pair_Caching_Utility
   //    Defines a helper class for the Caching Strategies.
   //
   // = DESCRIPTION
-  //    This class defines the methods commonly used by the different
-  //    caching strategies. For instance: clear_cache () method which
-  //    decides and purges the entry from the container.  Note: This
-  //    class helps in the caching_strategies using a container
-  //    containing entries of <KEY, ACE_Pair<VALUE, attributes>>
-  //    kind. The attributes helps in deciding the entries to be
-  //    purged. The Cleanup_Strategy is the callback class to which
-  //    the entries to be cleaned up will be delegated.
+  //    This class defines the methods commonly used by the
+  //    different caching strategies. For instance: clear_cache ()
+  //    method which decides and purges the entry from the container.
+  //    Note: This class helps in the caching_strategies using a
+  //    container containing entries of <KEY, ACE_Pair<VALUE,
+  //    attributes>> kind. The attributes helps in deciding the
+  //    entries to be purged.
 public:
 
-  typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
-
-  ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
-                            int delete_cleanup_strategy = 0);
-
-  // Constructor.
-
-  ~ACE_Pair_Caching_Utility (void);
-  // Destructor.
-
   int clear_cache (CONTAINER &container,
+                   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                    double purge_percent);
-
   // Purge entries from the <container>. The Cleanup_Strategy will do
   // the actual job of cleanup once the entries to be cleaned up are
   // decided.
 
 protected:
 
-  void minimum (CONTAINER &container,
-                KEY *&key_to_remove,
-                VALUE *&value_to_remove);
+  virtual void minimum (CONTAINER &container,
+                        KEY *&key_to_remove,
+                        VALUE *&value_to_remove);
   // Find the entry with minimum caching attributes.
-
-  CLEANUP_STRATEGY *cleanup_strategy_;
-  // The cleanup strategy which can be used to destroy the entries of
-  // the container.
-
-  int delete_cleanup_strategy_;
-  // Whether the cleanup_strategy should be destroyed or not.
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-class ACE_Recyclable_Handler_Caching_Utility
+class ACE_Recyclable_Handler_Caching_Utility : public ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>
 {
   // = TITLE
   //    Defines a helper class for the Caching Strategies.
@@ -88,42 +72,13 @@ class ACE_Recyclable_Handler_Caching_Utility
   //    decides and purges the entry from the container.  Note: This
   //    class helps in the caching_strategies using a container
   //    containing entries of <KEY, Svc_Handler> kind. The attributes
-  //    helps in deciding the entries to be purged. The
-  //    Cleanup_Strategy is the callback class to which the entries to
-  //    be cleaned up will be delegated.
-
-public:
-
-  typedef ACE_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
-  typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY_BASE;
-
-  ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
-                                          int delete_cleanup_strategy = 0);
-
-  // Constructor.
-
-  ~ACE_Recyclable_Handler_Caching_Utility (void);
-  // Destructor.
-
-  int clear_cache (CONTAINER &container,
-                   double purge_percent);
-  // Purge entries from the <container>. The Cleanup_Strategy will do
-  // the actual job of cleanup once the entries to be cleaned up are
-  // decided.
-
+  //    helps in deciding the entries to be purged.
 protected:
 
-  void minimum (CONTAINER &container,
-                KEY *&key_to_remove,
-                VALUE *&value_to_remove);
+  virtual void minimum (CONTAINER &container,
+                        KEY *&key_to_remove,
+                        VALUE *&value_to_remove);
   // Find the entry with minimum caching attributes.
-
-  CLEANUP_STRATEGY_BASE *cleanup_strategy_;
-  // This is the default Cleanup Strategy for this utility.
-
-  int delete_cleanup_strategy_;
-  // Whether the cleanup_strategy should be destroyed or not.
-
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -135,27 +90,17 @@ class ACE_Handler_Caching_Utility
   //    Defines a helper class for the Caching Strategies.
   //
   // = DESCRIPTION
-  //    This class defines the methods commonly used by the different
-  //    caching strategies. For instance: clear_cache () method which
-  //    decides and purges the entry from the container.  Note: This
-  //    class helps in the caching_strategies using a container
-  //    containing entries of <KEY, HANDLER> kind where the HANDLER
-  //    contains the caching attributes which help in deciding the
-  //    entries to be purged. The Cleanup_Strategy is the callback
-  //    class to which the entries to be cleaned up will be delegated.
+  //    This class defines the methods commonly used by the
+  //    different caching strategies. For instance: clear_cache ()
+  //    method which decides and purges the entry from the container.
+  //    Note: This class helps in the caching_strategies using a
+  //    container containing entries of <KEY, HANDLER> kind where the
+  //    HANDLER contains the caching attributes which help in deciding
+  //    the entries to be purged.
 public:
 
-  typedef ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
-  typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY_BASE;
-
-  ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
-                               int delete_cleanup_strategy = 0);
-  // Constructor.
-
-  ~ACE_Handler_Caching_Utility (void);
-  // Destructor.
-
   int clear_cache (CONTAINER &container,
+                   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                    double purge_percent);
   // Purge entries from the <container>. The Cleanup_Strategy will do
   // the actual job of cleanup once the entries to be cleaned up are
@@ -163,51 +108,32 @@ public:
 
 protected:
 
-  void minimum (CONTAINER &container,
-                KEY *&key_to_remove,
-                VALUE *&value_to_remove);
+  virtual void minimum (CONTAINER &container,
+                        KEY *&key_to_remove,
+                        VALUE *&value_to_remove);
   // Find the entry with minimum caching attributes.  This is handler
   // specific since this utility is to be used very specifically for
   // handler who have caching_attributes for server side acched
   // connection management.
-
-  CLEANUP_STRATEGY_BASE *cleanup_strategy_;
-  // The cleanup strategy which can be used to destroy the entries of
-  // the container.
-
-  int delete_cleanup_strategy_;
-  // Whether the cleanup_strategy should be destroyed or not.
-
 };
 
 ///////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
+template <class KEY, class VALUE, class CONTAINER,  class ITERATOR, class ATTRIBUTES>
 class ACE_Null_Caching_Utility
 {
   // = TITLE
   //    Defines a dummy helper class for the Caching Strategies.
   //
   // = DESCRIPTION
-  //    This class defines the methods commonly used by the different
-  //    caching strategies. For instance: clear_cache () method which
-  //    decides and purges the entry from the container.  Note: This
-  //    class is be used with the Null_Caching_Strategy. The
-  //    Cleanup_Strategy is the callback class to which the entries to
-  //    be cleaned up will be delegated.
+  //    This class defines the methods commonly used by the
+  //    different caching strategies. For instance: clear_cache ()
+  //    method which decides and purges the entry from the container.
+  //    Note: This class is be used with the Null_Caching_Strategy.
 public:
 
-  typedef ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
-  typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY_BASE;
-
-  ACE_Null_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
-                            int delete_cleanup_strategy = 0);
-  // Constructor.
-
-  ~ACE_Null_Caching_Utility (void);
-  // Destructor.
-
   int clear_cache (CONTAINER &container,
+                   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                    double purge_percent);
   // Purge entries from the <container>. The Cleanup_Strategy will do
   // the actual job of cleanup once the entries to be cleaned up are
@@ -215,20 +141,13 @@ public:
 
 protected:
 
-  void minimum (CONTAINER &container,
-                KEY *&key_to_remove,
-                VALUE *&value_to_remove);
+  virtual void minimum (CONTAINER &container,
+                        KEY *&key_to_remove,
+                        VALUE *&value_to_remove);
   // Find the entry with minimum caching attributes.  This is handler
   // specific since this utility is to be used very specifically for
   // handler who have caching_attributes for server side acched
   // connection management.Note: Here it is a no-op.
-
-  CLEANUP_STRATEGY_BASE *cleanup_strategy_;
-  // The cleanup strategy which can be used to destroy the entries of
-  // the container.
-
-  int delete_cleanup_strategy_;
-  // Whether the cleanup_strategy should be destroyed or not.
 };
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/ace/Cleanup_Strategies_T.cpp b/ace/Cleanup_Strategies_T.cpp
index b11d68b78bd..b54db63adf3 100644
--- a/ace/Cleanup_Strategies_T.cpp
+++ b/ace/Cleanup_Strategies_T.cpp
@@ -17,12 +17,17 @@
 
 ACE_RCSID(ace, Cleanup_Strategies_T, "$Id$")
 
+template <class KEY, class VALUE, class CONTAINER>
+ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::~ACE_Cleanup_Strategy (void)
+{
+}
+
 ////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
-                                                      KEY *key,
-                                                      VALUE *value)
+ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                              KEY *key, 
+                                                              VALUE *value)
 {
   ACE_UNUSED_ARG (value);
 
@@ -32,27 +37,24 @@ ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
 ////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
-                                                                         KEY *key,
-                                                                         VALUE *)
+ACE_Svc_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                          KEY *key, 
+                                                          VALUE *value)
 {
-  VALUE value;
+  (value->first ())->recycler (0, 0);
 
-  if (container.unbind (*key, value) == -1)
+  (value->first ())->close ();
+  
+  if (container.unbind (*key) == -1)
     return -1;
-
-  value.first ()->recycler (0, 0);
-
-  value.first ()->close ();
-
-  return 0;
+   
+  return 0; 
 }
 
 /////////////////////////////////////////////////////////////////////////////
-
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
-                                                              KEY *key,
+ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                              KEY *key, 
                                                               VALUE *value)
 {
   // Remove the item from cache only if the handler isnt in use.
@@ -66,15 +68,16 @@ ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &contain
     }
 
   return 0;
+
 }
 
 ////////////////////////////////////////////////////////////////////////////
-
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
-                                                           KEY *key,
+ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
+                                                           KEY *key, 
                                                            VALUE *value)
 {
+
   ACE_UNUSED_ARG (container);
   ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (value);
diff --git a/ace/Cleanup_Strategies_T.h b/ace/Cleanup_Strategies_T.h
index 15c615a9d09..6c266ffc1c5 100644
--- a/ace/Cleanup_Strategies_T.h
+++ b/ace/Cleanup_Strategies_T.h
@@ -27,23 +27,51 @@ template <class KEY, class VALUE, class CONTAINER>
 class ACE_Cleanup_Strategy
 {
   // = TITLE
+  //    Defines a abstract base class which takes care of winding up
+  //    and destroying the entries in the container.
+  //
+  // = DESCRIPTION
+  //    This class is one of the ways to ensure that the cleanup
+  //    can be decoupled from other strategies which need to do it.
+  //    The cleanup method provided needs to be implemented as needed.
+  
+ public:  
+
+  // = Termination.
+
+  virtual ~ACE_Cleanup_Strategy (void);
+  
+  // = The cleanup operation.
+
+  virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value) = 0;
+  // This pure virtual method is to be used to destroy the <KEY,
+  // VALUE> entry.
+  
+};
+
+//////////////////////////////////////////////////////////////////////////
+
+template <class KEY, class VALUE, class CONTAINER>
+class ACE_Default_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
+{
+  // = TITLE
   //     Defines a default strategy to be followed for cleaning up
   //     entries from a map which is the container.
   //
   // = DESCRIPTION
-  //     By default the entry to be cleaned up is removed from the
+  //     By defualt the entry to be cleaned up is removed from the
   //     container.
 
 public:
-
+ 
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
   // The method which will do the cleanup of the entry in the container.
+
 };
 
 //////////////////////////////////////////////////////////////////////
-
 template <class KEY, class VALUE, class CONTAINER>
-class ACE_Recyclable_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
+class ACE_Svc_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
 {
   // = TITLE
   //     Defines a strategy to be followed for cleaning up
@@ -56,19 +84,19 @@ class ACE_Recyclable_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY,
   //     the handler is recyclable.
 
 public:
-
+ 
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
   // The method which will do the cleanup of the entry in the container.
+
 };
 
 //////////////////////////////////////////////////////////////////////
-
 template <class KEY, class VALUE, class CONTAINER>
 class ACE_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
 {
   // = TITLE
   //     Defines a strategy to be followed for cleaning up
-  //     entries which are svc_handlers from a container.
+  //     entries which are svc_handlers from a container. 
   //
   // = DESCRIPTION
   //     The entry to be cleaned up is removed from the container.
@@ -78,13 +106,15 @@ class ACE_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CON
   //     attributes.
 
 public:
-
+  
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
   // The method which will do the cleanup of the entry in the container.
+
 };
 
 //////////////////////////////////////////////////////////////////////
 
+
 template <class KEY, class VALUE, class CONTAINER>
 class ACE_Null_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
 {
@@ -96,9 +126,10 @@ class ACE_Null_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAI
   //     the effect of the Cleanup Strategy.
 
 public:
-
+ 
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
   // The dummy cleanup method.
+
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Codeset_IBM1047.cpp b/ace/Codeset_IBM1047.cpp
index b5ea060f37c..2f80af10b8b 100644
--- a/ace/Codeset_IBM1047.cpp
+++ b/ace/Codeset_IBM1047.cpp
@@ -17,8 +17,6 @@
 //
 // ============================================================================
 
-#if defined(ACE_MVS)
-
 #include "ace/Codeset_IBM1047.h"
 
 ACE_RCSID(ace, Codeset_IBM1047, "$Id$")
@@ -237,7 +235,7 @@ ACE_ISO8859_IBM1047::write_char_array (ACE_OutputCDR &out,
 
 // ****************************************************************
 
-char ACE_to_IBM1047[257] =
+char ACE_to_IBM1047[257] = 
 {
   "\x00\x01\x02\x03\x37\x2D\x2E\x2F\x16\x05\x25\x0B\x0C\x0D\x0E\x0F" // 00-0F
   "\x10\x11\x12\x13\x3C\x3D\x32\x26\x18\x19\x3F\x27\x22\x1D\x35\x1F" // 10-1F
@@ -257,8 +255,8 @@ char ACE_to_IBM1047[257] =
   "\xFC\x9E\xAE\x8C\xDD\xDC\x39\xFB\x80\xAF\xFD\x78\x76\xB2\x9F\xFF" // F0-FF
 };
 
-char ACE_from_IBM1047[257] =
-{
+char ACE_from_IBM1047[257] = 
+{ 
   "\x00\x01\x02\x03\xCF\x09\xD3\x7F\xD4\xD5\xC3\x0B\x0C\x0D\x0E\x0F" // 00-0F
   "\x10\x11\x12\x13\xC7\xB4\x08\xC9\x18\x19\xCC\xCD\x83\x1D\xD2\x1F" // 10-1F
   "\x81\x82\x1C\x84\x86\x0A\x17\x1B\x89\x91\x92\x95\xA2\x05\x06\x07" // 20-2F
@@ -277,4 +275,3 @@ char ACE_from_IBM1047[257] =
   "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\xB3\xF7\xF0\xFA\xA7\xFF" // F0-FF
 };
 
-#endif /* ACE_CODESET_IMB1047_H */
diff --git a/ace/Codeset_IBM1047.h b/ace/Codeset_IBM1047.h
index 1f9d19292b4..5e4aa0151bc 100644
--- a/ace/Codeset_IBM1047.h
+++ b/ace/Codeset_IBM1047.h
@@ -20,8 +20,6 @@
 #ifndef ACE_CODESET_IMB1047_H
 #define ACE_CODESET_IMB1047_H
 
-#if defined(ACE_MVS)
-
 #include "ace/CDR_Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -41,8 +39,8 @@ class ACE_Export ACE_IBM1047_ISO8859 : public ACE_Char_Codeset_Translator
   // = DESCRIPTION
   //     This class performs the codeset translation:
   //
-  //     Native:        IBM_1047 (i.e. EBCDIC)
-  //     Stream:        ISO-8859 (i.e. Latin/1)
+  //     Native:	IBM_1047 (i.e. EBCDIC)
+  //     Stream:	ISO-8859 (i.e. Latin/1)
   //
 public:
   ACE_IBM1047_ISO8859 (void);
@@ -77,8 +75,8 @@ class ACE_Export ACE_ISO8859_IBM1047 : public ACE_Char_Codeset_Translator
   // = DESCRIPTION
   //     This class performs the codeset translation:
   //
-  //     Native:        ISO-8859 (i.e. Latin/1)
-  //     Stream:        IBM-1047 (i.e. EBCDIC)
+  //     Native:	ISO-8859 (i.e. Latin/1)
+  //     Stream:	IBM-1047 (i.e. EBCDIC)
   //
 public:
   ACE_ISO8859_IBM1047 (void);
@@ -105,6 +103,4 @@ public:
                                              ACE_CDR::ULong);
 };
 
-#endif /* ACE_MVS */
-
 #endif /* ACE_CODESET_IMB1047_H */
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index 81e0e07e9c7..acfadb4c9b5 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -976,7 +976,7 @@ public:
   // Delegates to ACE_Double_Linked_List_Iterator.
 
 private:
-  ACE_DLList<T> *list_;
+  ACE_DLList<T> &list_;
 };
 
 template <class T>
@@ -1027,7 +1027,7 @@ public:
   // Delegates to ACE_Double_Linked_List_Iterator.
 
 private:
-  ACE_DLList<T> *list_;
+  ACE_DLList<T> &list_;
 };
 
 template <class T>
diff --git a/ace/Containers_T.i b/ace/Containers_T.i
index e39c2208bf1..b9ef057be2c 100644
--- a/ace/Containers_T.i
+++ b/ace/Containers_T.i
@@ -491,14 +491,14 @@ ACE_DLList_Iterator<T>::remove (void)
 template <class T> ACE_INLINE
 ACE_DLList_Iterator<T>::ACE_DLList_Iterator (ACE_DLList<T> &l)
   : ACE_Double_Linked_List_Iterator <ACE_DLList_Node> ((ACE_DLList_Base &)l),
-    list_ (&l)
+    list_ (l)
 {
 }
 
 template <class T> ACE_INLINE void
 ACE_DLList_Iterator<T>::reset (ACE_DLList<T> &l)
 {
-  list_ = &l;
+  list_ = l;
   this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l); 
 }
 
@@ -543,14 +543,14 @@ ACE_DLList_Reverse_Iterator<T>::remove (void)
 template <class T> ACE_INLINE
 ACE_DLList_Reverse_Iterator<T>::ACE_DLList_Reverse_Iterator (ACE_DLList<T> &l)
   : ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node> ((ACE_DLList_Base &)l),
-    list_ (&l)
+    list_ (l)
 {
 }
 
 template <class T> ACE_INLINE void
 ACE_DLList_Reverse_Iterator<T>::reset (ACE_DLList<T> &l)
 {
-  list_ = &l;
+  list_ = l;
   this->ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l);
 }
 
diff --git a/ace/Containers_bad.i b/ace/Containers_bad.i
deleted file mode 100644
index 471a9d559d5..00000000000
--- a/ace/Containers_bad.i
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_DLList_Node::ACE_DLList_Node (void)
-  : item_ (0),
-    next_ (0),
-    prev_ (0)
-{
-}
-
-ACE_INLINE
-ACE_DLList_Node::ACE_DLList_Node (void *&i,
-                                  ACE_DLList_Node *n,
-                                  ACE_DLList_Node *p)
-  : item_ (i),
-    next_ (n),
-    prev_ (p)
-{
-}
-
-ACE_INLINE
-ACE_DLList_Node::~ACE_DLList_Node (void) 
-{
-}
diff --git a/ace/DLL.cpp b/ace/DLL.cpp
index b4b5a715b21..4e4e81858df 100644
--- a/ace/DLL.cpp
+++ b/ace/DLL.cpp
@@ -21,8 +21,7 @@ ACE_DLL::ACE_DLL (int close_on_destruction)
 ACE_DLL::ACE_DLL (const char *dll_name,
                   int open_mode,
                   int close_on_destruction)
-  : handle_ (ACE_OS::dlopen (ASYS_WIDE_STRING (dll_name),
-                             open_mode)),
+  : handle_ (ACE_OS::dlopen (dll_name, open_mode)),
     close_on_destruction_ (close_on_destruction)
 {
   if (this->handle_ == ACE_SHLIB_INVALID_HANDLE)
@@ -77,7 +76,7 @@ ACE_DLL::open (const char *dll_filename,
     return result;
 
   // The ACE_SHLIB_HANDLE object is obtained.
-  this->handle_ = ACE_OS::dlopen (dll_pathname,
+  this->handle_ = ACE_OS::dlopen (ASYS_ONLY_MULTIBYTE_STRING (dll_pathname),
                                   open_mode);
 
   if (this->handle_ == ACE_SHLIB_INVALID_HANDLE)
diff --git a/ace/Event_Handler_T.i b/ace/Event_Handler_T.i
index 4f2dc0374ae..e048e45931d 100644
--- a/ace/Event_Handler_T.i
+++ b/ace/Event_Handler_T.i
@@ -80,7 +80,7 @@ ACE_Event_Handler_T<T>::handle_get (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::handle_get (ACE_TYPENAME ACE_Event_Handler_T<T>::GET_HANDLE h)
+ACE_Event_Handler_T<T>::handle_get (ACE_Event_Handler_T<T>::GET_HANDLE h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_get");
   this->get_handle_ = h;
@@ -94,7 +94,7 @@ ACE_Event_Handler_T<T>::handle_set (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::handle_set (ACE_TYPENAME ACE_Event_Handler_T<T>::SET_HANDLE h)
+ACE_Event_Handler_T<T>::handle_set (ACE_Event_Handler_T<T>::SET_HANDLE h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_set");
   this->set_handle_ = h;
@@ -108,7 +108,7 @@ ACE_Event_Handler_T<T>::input_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::input_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::input_handler (ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::input_handler");
   this->input_handler_ = h;
@@ -122,7 +122,7 @@ ACE_Event_Handler_T<T>::output_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::output_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::output_handler (ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::output_handler");
   this->output_handler_ = h;
@@ -136,7 +136,7 @@ ACE_Event_Handler_T<T>::except_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::except_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::except_handler (ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::except_handler");
   this->except_handler_ = h;
@@ -150,7 +150,7 @@ ACE_Event_Handler_T<T>::to_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::to_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::TO_HANDLER h)
+ACE_Event_Handler_T<T>::to_handler (ACE_Event_Handler_T<T>::TO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::to_handler");
   this->to_handler_ = h;
@@ -164,7 +164,7 @@ ACE_Event_Handler_T<T>::cl_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::cl_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::CL_HANDLER h)
+ACE_Event_Handler_T<T>::cl_handler (ACE_Event_Handler_T<T>::CL_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::cl_handler");
   this->cl_handler_ = h;
@@ -178,7 +178,7 @@ ACE_Event_Handler_T<T>::sig_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::sig_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::SIG_HANDLER h)
+ACE_Event_Handler_T<T>::sig_handler (ACE_Event_Handler_T<T>::SIG_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::sig_handler");
   this->sig_handler_ = h;
diff --git a/ace/Future.cpp b/ace/Future.cpp
index c38c9af1efc..eb54be3b2fa 100644
--- a/ace/Future.cpp
+++ b/ace/Future.cpp
@@ -5,7 +5,7 @@
 #ifndef ACE_FUTURE_CPP
 #define ACE_FUTURE_CPP
 
-#include /**/ "ace/Future.h"
+#include "ace/Future.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -49,7 +49,7 @@ ACE_Future_Rep<T>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,
               "ref_count_ = %d\n",
- (int) this->ref_count_));
+              (int) this->ref_count_));
   ACE_DEBUG ((LM_INFO,"value_: \n"));
   if (this->value_)
     ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (NON-NULL)\n")));
@@ -67,7 +67,11 @@ template <class T> ACE_Future_Rep<T> *
 ACE_Future_Rep<T>::create (void)
 {
   // Yes set ref count to zero.
-  return new ACE_Future_Rep<T> ();
+  ACE_Future_Rep<T> *t = 0;
+  ACE_NEW_RETURN (t,
+                  ACE_Future_Rep<T>,
+                  0);
+  return t;
 }
 
 template <class T> ACE_Future_Rep<T> *
@@ -269,7 +273,7 @@ ACE_Future<T>::ACE_Future (void)
 
 template <class T>
 ACE_Future<T>::ACE_Future (const ACE_Future<T> &r)
-  : future_rep_ (FUTURE_REP::attach (((ACE_Future<T> &) r).future_rep_))
+  : future_rep_ (FUTURE_REP::attach (( (ACE_Future<T> &) r).future_rep_))
 {
 }
 
diff --git a/ace/Future.h b/ace/Future.h
index 0273775419e..6a001c677ee 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -9,7 +9,7 @@
 // = FILENAME
 //    Future.h
 //
-// = AUTHOR (S)
+// = AUTHOR
 //    Andres Kruse <Andres.Kruse@cern.ch>,
 //    Douglas C. Schmidt <schmidt@cs.wustl.edu>,
 //    Per Andersson <Per.Andersson@hfera.ericsson.se>, and
@@ -20,9 +20,8 @@
 #ifndef ACE_FUTURE_H
 #define ACE_FUTURE_H
 
-#include /**/ "ace/Containers.h"
-#include /**/ "ace/Synch.h"
-#include /**/ "ace/Strategies_T.h"
+#include "ace/Synch.h"
+#include "ace/Strategies_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -62,9 +61,9 @@ class ACE_Future_Observer
   //     ACE_Future_Observer<T>
   //
   // = DESCRIPTION
-  //     An ACE_Future_Observer object implements an object that is
-  //     subscribed with an ACE_Future object so that it may be
-  //     notified when the value of the ACE_Future object is
+  //     An ACE_Future_Observer<T> object implements an object that is
+  //     subscribed with an ACE_Future<T> object so that it may be
+  //     notified when the value of the ACE_Future<T> object is
   //     written to by a writer thread.
   //
   //     It uses the Observer pattern
@@ -72,8 +71,8 @@ public:
   // = Destructor
   virtual ~ACE_Future_Observer (void);
 
-  virtual void update (const ACE_Future<T> &future) = 0;
-  // Called by the ACE_Future in which we are subscribed to when
+  virtual void update(const ACE_Future<T> &future) = 0;
+  // Called by the ACE_Future<T> in which we are subscribed to when
   // its value is written to.
 
   ACE_ALLOC_HOOK_DECLARE;
@@ -98,33 +97,6 @@ class ACE_Future_Rep
 private:
   friend class ACE_Future<T>;
 
-  // Create, attach, detach and assign encapsulates the reference
-  // count handling and the object lifetime of ACE_Future_Rep<T>
-  // instances.
-
-  static ACE_Future_Rep<T> *create (void);
-  // Create a ACE_Future_Rep<T> and initialize the reference count.
-
-  static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep);
-  // Increase the reference count and return argument. Uses the
-  // attribute "value_ready_mutex_" to synchronize reference count
-  // updating.
-  //
-  // Precondition (rep != 0).
-
-  static void detach (ACE_Future_Rep<T> *&rep);
-  // Decreases the reference count and and deletes rep if there are no
-  // more references to rep.
-  //
-  // Precondition (rep != 0)
-
-  static void assign (ACE_Future_Rep<T> *&rep,
-                      ACE_Future_Rep<T> *new_rep);
-  // Decreases the rep's reference count and and deletes rep if there
-  // are no more references to rep. Then assigns new_rep to rep.
-  //
-  // Precondition (rep != 0 && new_rep != 0)
-
   int set (const T &r,
            ACE_Future<T> &caller);
   // Set the result value.  The specified <caller> represents the
@@ -139,8 +111,8 @@ private:
   int attach (ACE_Future_Observer<T> *observer,
                ACE_Future<T> &caller);
   // Attaches the specified observer to a subject (i.e. the
-  // <ACE_Future_Rep>).  The update method of the specified subject will
-  // be invoked with a copy of the written-to <ACE_Future> as input when
+  // ACE_Future_Rep).  The update method of the specified subject will
+  // be invoked with a copy of the written-to ACE_Future as input when
   // the result gets set.
   //
   // Returns 0 if the observer is successfully attached, 1 if the
@@ -148,13 +120,13 @@ private:
 
   int detach (ACE_Future_Observer<T> *observer);
   // Detaches the specified observer from a subject (i.e. the
-  // <ACE_Future_Rep>).  The update method of the specified subject will
-  // not be invoked when the <ACE_Future_Rep>s result gets set.  Returns
+  // ACE_Future_Rep).  The update method of the specified subject will
+  // not be invoked when the ACE_Future_Reps result gets set.  Returns
   // 1 if the specified observer was actually attached to the subject
   // prior to this call and 0 if was not.
   //
-  // Returns 0 if the observer was successfully detached, and -1 if the
-  // observer was not attached in the first place.
+  // Returns 0 if the observer was successfully detached, and -1 if the observer was
+  // not attached in the first place.
 
   operator T ();
   // Type conversion. will block forever until the result is
@@ -178,6 +150,34 @@ private:
   int ready (void);
   // Is result available?
 
+  // = Handle ref counting and object lifetime for ACE_Future_Rep<T>.
+
+  // These methods must go after the others to work around a bug with
+  // Borland's C++ Builder.
+
+  static ACE_Future_Rep<T> *create (void);
+  // Create a ACE_Future_Rep<T> and initialize the reference count.
+
+  static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep);
+  // Increase the reference count and return argument. Uses the
+  // attribute "value_ready_mutex_" to synchronize reference count
+  // updating.
+  //
+  // Precondition(rep != 0).
+
+  static void detach (ACE_Future_Rep<T> *&rep);
+  // Decreases the reference count and and deletes rep if there are no
+  // more references to rep.
+  //
+  // Precondition(rep != 0)
+
+  static void assign (ACE_Future_Rep<T> *&rep,
+                      ACE_Future_Rep<T> *new_rep);
+  // Decreases the rep's reference count and and deletes rep if there
+  // are no more references to rep. Then assigns new_rep to rep.
+  //
+  // Precondition(rep != 0 && new_rep != 0)
+
   T *value_;
   // Pointer to the result.
 
@@ -267,8 +267,8 @@ public:
 
   int attach (ACE_Future_Observer<T> *observer);
   // Attaches the specified observer to a subject (i.e. the
-  // <ACE_Future>).  The update method of the specified subject will be
-  // invoked with a copy of the associated <ACE_Future> as input when
+  // ACE_Future).  The update method of the specified subject will be
+  // invoked with a copy of the associated ACE_Future as input when
   // the result gets set.  If the result is already set when this
   // method gets invoked, then the update method of the specified
   // subject will be invoked immediately.
@@ -278,8 +278,8 @@ public:
 
   int detach (ACE_Future_Observer<T> *observer);
   // Detaches the specified observer from a subject (i.e. the
-  // <ACE_Future_Rep>).  The update method of the specified subject will
-  // not be invoked when the <ACE_Future_Reps> result gets set.  Returns
+  // ACE_Future_Rep).  The update method of the specified subject will
+  // not be invoked when the ACE_Future_Reps result gets set.  Returns
   // 1 if the specified observer was actually attached to the subject
   // prior to this call and 0 if was not.
   //
@@ -289,9 +289,9 @@ public:
   void dump (void) const;
   // Dump the state of an object.
 
-  ACE_Future_Rep<T> *get_rep ();
-  // Get the underlying <ACE_Future_Rep>*. Note that this method should
-  // rarely, if ever, be used and that modifying the undlerlying <ACE_Future_Rep>*
+  ACE_Future_Rep<T> *get_rep();
+  // Get the underlying ACE_Future_Rep<T>*. Note that this method should
+  // rarely, if ever, be used and that modifying the undlerlying ACE_Future_Rep<T>*
   // should be done with extreme caution.
 
   ACE_ALLOC_HOOK_DECLARE;
@@ -304,7 +304,7 @@ private:
   void operator delete (void *);
   // Do not allow delete operator
 
-  void operator & ();
+  void operator &();
   // Do not allow address-of operator.
 
   // the ACE_Future_Rep
diff --git a/ace/Future_Node.cpp b/ace/Future_Node.cpp
new file mode 100644
index 00000000000..79c8706dc7f
--- /dev/null
+++ b/ace/Future_Node.cpp
@@ -0,0 +1,43 @@
+// Future.cpp
+// $Id$
+
+#define ACE_BUILD_DLL
+
+#ifndef ACE_FUTURE_NODE_CPP
+#define ACE_FUTURE_NODE_CPP
+
+#include "ace/OS.h"
+#include "ace/Future_Node.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+ACE_RCSID(ace, Future_Node, "$Id$")
+
+#if defined (ACE_HAS_THREADS)
+
+template <class T>
+ACE_DLList_Future_Node<T>::ACE_DLList_Future_Node (void)
+  : next_ (0),
+    prev_ (0)
+{
+}
+
+template <class T>
+ACE_DLList_Future_Node<T>::ACE_DLList_Future_Node (const ACE_Future<T> &item,
+                                                   ACE_DLList_Future_Node<T> *n,
+                                                   ACE_DLList_Future_Node<T> *p)
+: item_ (item),
+  next_ (n),
+  prev_ (p)
+{
+}
+
+template <class T>
+ACE_DLList_Future_Node<T>::~ACE_DLList_Future_Node (void)
+{
+}
+
+#endif /* ACE_HAS_THREADS */
+#endif /* ACE_FUTURE_NODE_CPP */
diff --git a/ace/Future_Node.h b/ace/Future_Node.h
new file mode 100644
index 00000000000..8590cbaccca
--- /dev/null
+++ b/ace/Future_Node.h
@@ -0,0 +1,72 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    ace
+//
+// = FILENAME
+//    Future_Node.h
+//
+// = AUTHOR
+//    John Tucker <jtucker@infoglide.com>
+//
+// ============================================================================
+
+#ifndef ACE_FUTURE_NODE_H
+#define ACE_FUTURE_NODE_H
+
+#include "ace/Future.h"
+#include "ace/Thread.h"
+#include "ace/Containers_T.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined (ACE_HAS_THREADS)
+
+// Forward decl.
+template <class T> class ACE_Future_Node;
+template <class T> class ACE_DLList_Future_Node;
+
+template <class T>
+class ACE_DLList_Future_Node
+{
+  // = TITLE
+  //     Implementation of element in a ACE_Future list.
+  //     Needed for ACE_Double_Linked_List.
+
+  friend class ACE_Double_Linked_List<ACE_DLList_Future_Node>;
+  friend class ACE_Double_Linked_List_Iterator<ACE_DLList_Future_Node>;
+
+public:
+  // = Initialization
+  ACE_DLList_Future_Node (const ACE_Future<T> &future,
+                          ACE_DLList_Future_Node *n = 0,
+                          ACE_DLList_Future_Node *p = 0);
+  ~ACE_DLList_Future_Node (void);
+
+  ACE_ALLOC_HOOK_DECLARE;
+  // Declare the dynamic allocation hooks.
+
+  ACE_Future<T> item_;
+  ACE_DLList_Future_Node *next_;
+  ACE_DLList_Future_Node *prev_;
+
+protected:
+  ACE_DLList_Future_Node (void);
+};
+
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "ace/Future_Node.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Future_Node.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#endif /* ACE_HAS_THREADS */
+#endif /* ACE_FUTURE_NODE_H */
diff --git a/ace/Future_Set.cpp b/ace/Future_Set.cpp
index c75bb161978..d2872a530a8 100644
--- a/ace/Future_Set.cpp
+++ b/ace/Future_Set.cpp
@@ -6,13 +6,13 @@
 #ifndef ACE_FUTURE_SET_CPP
 #define ACE_FUTURE_SET_CPP
 
-#include /**/ "ace/Future_Set.h"
+#include "ace/Future_Set.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID (ace, Future_Set, "$Id$")
+ACE_RCSID(ace, Future_Set, "$Id$")
 
 #if defined (ACE_HAS_THREADS)
 
@@ -56,7 +56,7 @@ ACE_Future_Set<T>::~ACE_Future_Set (void)
 template <class T> int
 ACE_Future_Set<T>::is_empty () const
 {
-  return (((ACE_Future_Set<T>*)this)->future_map_.current_size () == 0 );
+  return ( ((ACE_Future_Set<T>*)this)->future_map_.current_size () == 0 );
 }
 
 template <class T> int
@@ -71,9 +71,9 @@ ACE_Future_Set<T>::insert (ACE_Future<T> &future)
   int result = this->future_map_.bind (future_rep,
                                        future_holder);
 
-  // If a new map entry was created, then attach to the future,
-  // otherwise we were already attached to the future or some error
-  // occurred so just delete the future holder.
+  // If a new map entry was created, then attach to the future, otherwise
+  // we were already attached to the future or some error occurred so just
+  // delete the future holder.
   if ( result == 0 )
     // Attach ourself to the ACE_Futures list of observer
     future.attach (this);
@@ -87,7 +87,7 @@ template <class T> void
 ACE_Future_Set<T>::update (const ACE_Future<T> &future)
 {
   ACE_Message_Block *mb;
-  FUTURE &local_future = ACE_const_cast (ACE_Future<T> &, future);
+  FUTURE local_future = future;
 
   ACE_NEW (mb,
            ACE_Message_Block ((char *) local_future.get_rep (), 0));
@@ -103,7 +103,7 @@ ACE_Future_Set<T>::next_readable (ACE_Future<T> &future,
   if (this->is_empty ())
     return 0;
 
-  ACE_Message_Block *mb = 0;
+  ACE_Message_Block *mb;
   FUTURE_REP *future_rep = 0;
 
   // Wait for a "readable future" signal from the message queue.
diff --git a/ace/Future_Set.h b/ace/Future_Set.h
index a3187a59312..bd029009a06 100644
--- a/ace/Future_Set.h
+++ b/ace/Future_Set.h
@@ -9,7 +9,7 @@
 // = FILENAME
 //    Future_Set.h
 //
-// = AUTHOR (S)
+// = AUTHOR
 //    John Tucker <jtucker@infoglide.com>
 //
 // ============================================================================
@@ -17,10 +17,10 @@
 #ifndef ACE_FUTURE_SET_H
 #define ACE_FUTURE_SET_H
 
-#include /**/ "ace/Thread.h"
-#include /**/ "ace/Message_Queue.h"
-#include /**/ "ace/Future.h"
-#include /**/ "ace/Hash_Map_Manager.h"
+#include "ace/Thread.h"
+#include "ace/Message_Queue.h"
+#include "ace/Future.h"
+#include "ace/Hash_Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -33,7 +33,7 @@ class ACE_Future_Set : public ACE_Future_Observer<T>
 {
   // = TITLE
   //     This class implements a mechanism which allows the values of
-  //     a collections of <ACE_Future> objects to be accessed by
+  //     a collections of ACE_Future<T> objects to be accessed by
   //     reader threads as they become available.
 public:
   // = Initialization and termination methods.
@@ -45,11 +45,11 @@ public:
   // Destructor.
 
   int is_empty (void) const;
-  // Return 1 if their are no <ACE_Future> objects left on its queue and
+  // Return 1 if their are no ACE_Future objects left on its queue and
   // 0 otherwise
 
   int insert (ACE_Future<T> &future);
-  // Enqueus the given <ACE_Future> into this objects queue when it is
+  // Enqueus the given ACE_Future into this objects queue when it is
   // readable.
   //
   // Returns 0 if the future is successfully inserted, 1 if the
@@ -59,7 +59,7 @@ public:
                      ACE_Time_Value *tv = 0);
   // Wait up to <tv> time to get the <value>.  Note that <tv> must be
   // specified in absolute time rather than relative time.); get the
-  // next <ACE_Future> that is readable.  If <tv> = 0, the will block
+  // next ACE_Future<T> that is readable.  If <tv> = 0, the will block
   // forever.
   //
   // If a readable future becomes available, then the input result
@@ -67,7 +67,7 @@ public:
   // is empty, then 0 is returned.
 
   virtual void update (const ACE_Future<T> &future);
-  // Called by the <ACE_Future> subject in which we are subscribed to
+  // Called by the ACE_Future<T> subject in which we are subscribed to
   // when its value is written to.
 
   ACE_ALLOC_HOOK_DECLARE;
@@ -95,11 +95,11 @@ private:
 			          ACE_Null_Mutex> FUTURE_HASH_MAP;
 
   FUTURE_HASH_MAP future_map_;
-  // Map of <ACE_Futures>, subjects, which have not been written to by
+  // Map of ACE_Futures, subjects, which have not been written to by
   // client's writer thread.
 
   ACE_Message_Queue<ACE_SYNCH> *future_notification_queue_;
-  // Message queue for notifying the reader thread of <ACE_Futures> which
+  // Message queue for notifying the reader thread of ACE_Futures which
   // have been written to by client's writer thread.
 
   int delete_queue_;
diff --git a/ace/Handle_Gobbler.h b/ace/Handle_Gobbler.h
deleted file mode 100644
index a38455faa3e..00000000000
--- a/ace/Handle_Gobbler.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Handle_Gobbler.h
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_HANDLE_GOBBLER_H
-#define ACE_HANDLE_GOBBLER_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Containers_T.h"
-
-class ACE_Handle_Gobbler
-{
-  // = TITLE
-  //     This class gobbles up handles.
-  //
-  // = DESCRIPTION
-  //     This is useful when we need to control the number of handles
-  //     available for a process.  This class is mostly used for
-  //     testing purposes.
-public:
-
-  inline ~ACE_Handle_Gobbler (void);
-  // Destructor.  Cleans up any remaining handles.
-
-  inline int consume_handles (size_t n_handles_to_keep_available);
-  // Handles are opened continously until the process runs out of
-  // them, and then <n_handles_to_keep_available> handles are closed
-  // (freed) thereby making them usable in the future.
-
-  inline int free_handles (size_t n_handles);
-  // Free up <n_handles>.
-
-  inline void close_remaining_handles (void);
-  // All remaining handles are closed.
-
-private:
-
-  typedef ACE_Unbounded_Set<ACE_HANDLE> HANDLE_SET;
-
-  HANDLE_SET handle_set_;
-  // The container which holds the open descriptors.
-};
-
-#include "ace/Handle_Gobbler.i"
-
-#endif /* ACE_HANDLE_GOBBLER_H */
diff --git a/ace/Handle_Gobbler.i b/ace/Handle_Gobbler.i
deleted file mode 100644
index da5a30e697d..00000000000
--- a/ace/Handle_Gobbler.i
+++ /dev/null
@@ -1,81 +0,0 @@
-// $Id$
-
-inline
-ACE_Handle_Gobbler::~ACE_Handle_Gobbler (void)
-{
-  this->close_remaining_handles ();
-}
-
-inline int
-ACE_Handle_Gobbler::consume_handles (size_t n_handles_to_keep_available)
-{
-  int result = 0;
-
-  // On Win32, this style of gobbling doesn't seem to work.
-#if !defined (ACE_WIN32)
-
-  while (1)
-    {
-      ACE_HANDLE handle = ACE_OS::open (ACE_DEV_NULL, O_WRONLY);
-
-      if (handle == ACE_INVALID_HANDLE)
-        {
-          if (ACE::out_of_handles (errno))
-            {
-              result = this->free_handles (n_handles_to_keep_available);
-              break;
-            }
-          else
-            {
-              result = -1;
-              break;
-            }
-        }
-
-      result = this->handle_set_.insert (handle);
-      if (result == -1)
-        break;
-    }
-
-#endif /* ACE_WIN32 */
-
-  return result;
-}
-
-inline int
-ACE_Handle_Gobbler::free_handles (size_t n_handles)
-{
-  HANDLE_SET::iterator iterator =
-    this->handle_set_.begin ();
-
-  HANDLE_SET::iterator end =
-    this->handle_set_.end ();
-
-  for (;
-       iterator != end && n_handles > 0;
-       ++iterator, --n_handles)
-    {
-      int result = ACE_OS::close (*iterator);
-      if (result != 0)
-        return result;
-    }
-
-  return 0;
-}
-
-inline void
-ACE_Handle_Gobbler::close_remaining_handles (void)
-{
-  HANDLE_SET::iterator iterator =
-    this->handle_set_.begin ();
-
-  HANDLE_SET::iterator end =
-    this->handle_set_.end ();
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      ACE_OS::close (*iterator);
-    }
-}
diff --git a/ace/Hash_Cache_Map_Manager_T.cpp b/ace/Hash_Cache_Map_Manager_T.cpp
index 2e535816146..9abe0de904d 100644
--- a/ace/Hash_Cache_Map_Manager_T.cpp
+++ b/ace/Hash_Cache_Map_Manager_T.cpp
@@ -22,7 +22,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Cache_Map_Manager)
 #define T_1 class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES
 #define T_2 KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES
 
-template <T_1>
+  template <T_1>
 ACE_Hash_Cache_Map_Manager<T_2>::ACE_Hash_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
                                                              size_t size,
                                                              ACE_Allocator *alloc)
@@ -181,32 +181,6 @@ ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key,
 }
 
 template <T_1> int
-ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key,
-                                       VALUE &value)
-{
-  CACHE_ENTRY *entry = 0;
-
-  int result = this->find (key,
-                           entry);
-
-  if (result != -1)
-    {
-      value = entry->int_id_.first ();
-    }
-
-  return result;
-}
-
-template <T_1> int
-ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key)
-{
-  CACHE_ENTRY *entry = 0;
-
-  return this->find (key,
-                     entry);
-}
-
-template <T_1> int
 ACE_Hash_Cache_Map_Manager<T_2>::unbind (ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *entry)
 {
   // Remove the entry from the cache.
diff --git a/ace/Hash_Cache_Map_Manager_T.h b/ace/Hash_Cache_Map_Manager_T.h
index e346c36144c..cae1929c0c9 100644
--- a/ace/Hash_Cache_Map_Manager_T.h
+++ b/ace/Hash_Cache_Map_Manager_T.h
@@ -27,26 +27,12 @@
 // Forward declaration.
 class ACE_Allocator;
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-#define ACE_CACHE_MAP_MANAGER \
-        ACE_Cache_Map_Manager<KEY, \
-                              VALUE, \
-                              ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \
-                              ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \
-                              ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \
-                              CACHING_STRATEGY, \
-                              ATTRIBUTES>
-#else
-#define ACE_CACHE_MAP_MANAGER \
-        ACE_Cache_Map_Manager<KEY, \
-                              VALUE, \
-                              ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \
-                              CACHING_STRATEGY, \
-                              ATTRIBUTES>
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES>
-class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
+class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE,
+                                   ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                   ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                   ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                   CACHING_STRATEGY, ATTRIBUTES>
 {
   // = TITLE
   //     Defines a abstraction which will purge entries from a map.
@@ -174,7 +160,12 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
 
 protected:
 
-  typedef ACE_CACHE_MAP_MANAGER ACE_HCMM_BASE;
+  typedef ACE_Cache_Map_Manager<KEY, VALUE,
+                                ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                CACHING_STRATEGY, ATTRIBUTES>
+    ACE_HCMM_BASE;
   // Base class.
 };
 
diff --git a/ace/Hash_Cache_Map_Manager_T.i b/ace/Hash_Cache_Map_Manager_T.i
index f73e2d2aa7d..0b1b691fd2c 100644
--- a/ace/Hash_Cache_Map_Manager_T.i
+++ b/ace/Hash_Cache_Map_Manager_T.i
@@ -8,7 +8,7 @@ template <T_1> ACE_INLINE int
 ACE_Hash_Cache_Map_Manager<T_2>::bind (const KEY &key,
                                        const VALUE &value)
 {
-  return ACE_HCMM_BASE::bind (key,
+  return ACE_HCMM_BASE::bind (key, 
                               value);
 }
 
@@ -16,8 +16,8 @@ template <T_1> ACE_INLINE int
 ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
                                          const VALUE &value)
 {
-  return ACE_HCMM_BASE::rebind (key,
-                                value);
+  return ACE_HCMM_BASE::rebind (key, 
+                                value);                      
 }
 
 template <T_1> ACE_INLINE int
@@ -25,7 +25,7 @@ ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
                                          const VALUE &value,
                                          VALUE &old_value)
 {
-  return ACE_HCMM_BASE::rebind (key,
+  return ACE_HCMM_BASE::rebind (key, 
                                 value,
                                 old_value);
 }
@@ -51,6 +51,20 @@ ACE_Hash_Cache_Map_Manager<T_2>::trybind (const KEY &key,
 }
 
 template <T_1> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key,
+                                       VALUE &value)
+{
+  return ACE_HCMM_BASE::find (key,
+                              value);
+}
+
+template <T_1> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key)
+{
+  return ACE_HCMM_BASE::find (key);
+}
+
+template <T_1> ACE_INLINE int
 ACE_Hash_Cache_Map_Manager<T_2>::unbind (const KEY &key)
 {
   return ACE_HCMM_BASE::unbind (key);
diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h
index fbdeb9f5666..4752511f2d5 100644
--- a/ace/Hash_Map_Manager_T.h
+++ b/ace/Hash_Map_Manager_T.h
@@ -75,10 +75,6 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class
 class ACE_Hash_Map_Reverse_Iterator_Ex;
 
 // Forward decl.
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_Hash_Map_Bucket_Iterator;
-
-// Forward decl.
 class ACE_Allocator;
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
@@ -101,25 +97,24 @@ public:
   friend class ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>;
   friend class ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>;
   friend class ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>;
-  friend class ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>;
 
-  typedef EXT_ID
+  typedef EXT_ID 
           KEY;
-  typedef INT_ID
+  typedef INT_ID 
           VALUE;
-  typedef ACE_Hash_Map_Entry<EXT_ID, INT_ID>
+  typedef ACE_Hash_Map_Entry<EXT_ID, INT_ID> 
           ENTRY;
 
   // = ACE-style iterator typedefs.
-  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
+  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
           ITERATOR;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
+  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
           REVERSE_ITERATOR;
 
   // = STL-style iterator typedefs.
-  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
+  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
           iterator;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
+  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
           reverse_iterator;
 
   // = Initialization and termination methods.
@@ -511,77 +506,6 @@ public:
 };
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_Hash_Map_Bucket_Iterator
-{
-  // = TITLE
-  //     Forward iterator for the <ACE_Hash_Map_Manager_Ex> which only
-  //     traverses a particular bucket.  The particular bucket is
-  //     specified by the <EXT_ID> parameter specified in the
-  //     constructor.
-  //
-  // = DESCRIPTION
-  //     This class does not perform any internal locking of the
-  //     <ACE_Hash_Map_Manager_Ex> it is iterating upon since locking
-  //     is inherently inefficient and/or error-prone within an
-  //     STL-style iterator.  If you require locking, you can
-  //     explicitly use an <ACE_Guard> or <ACE_Read_Guard> on the
-  //     <ACE_Hash_Map_Manager_Ex>'s internal lock, which is
-  //     accessible via its <mutex> method.
-  //
-  //     Note that this iterator cannot be created by calling a method
-  //     on the map, since this would require
-public:
-  // = Initialization method.
-  ACE_Hash_Map_Bucket_Iterator (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &mm,
-                                const EXT_ID &ext_id,
-                                int tail = 0);
-
-  // = STL styled iteration, compare, and reference functions.
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void);
-  // Prefix advance.
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int);
-  // Postfix advance.
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void);
-  // Prefix reverse.
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int);
-  // Postfix reverse.
-
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* (void) const;
-  // Returns a reference to the interal element <this> is pointing to.
-
-  ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void);
-  // Returns reference the Hash_Map_Manager_Ex that is being iterated
-  // over.
-
-  int operator== (const ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const;
-  int operator!= (const ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const;
-  // Check if two iterators point to the same position
-
-protected:
-  int forward_i (void);
-  // Move forward by one element in the set.  Returns 0 when there's
-  // no more item in the set after the current items, else 1.
-
-  int reverse_i (void);
-  // Move backward by one element in the set.  Returns 0 when there's
-  // no more item in the set before the current item, else 1.
-
-  ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_;
-  // Map we are iterating over.
-
-  ssize_t index_;
-  // Keeps track of how far we've advanced in the table.
-
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next_;
-  // Keeps track of how far we've advanced in a linked list in each
-  // table slot.
-};
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
 class ACE_Hash_Map_Reverse_Iterator_Ex : public ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
 {
   // = TITLE
@@ -670,7 +594,7 @@ public:
 
   ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &
   operator= (const ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base);
-  // Assignment from base
+  // Assignment from base 
 };
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK>
@@ -689,7 +613,7 @@ public:
 
   ACE_Hash_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &
   operator= (const ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base);
-  // Assignment from base
+  // Assignment from base 
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Hash_Map_Manager_T.i b/ace/Hash_Map_Manager_T.i
index a257b091f79..f4e86244358 100644
--- a/ace/Hash_Map_Manager_T.i
+++ b/ace/Hash_Map_Manager_T.i
@@ -437,7 +437,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Map_Iterator_Ex)
 
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
+  template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
 ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
@@ -505,119 +505,9 @@ ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::oper
   return retv;
 }
 
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Map_Bucket_Iterator (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &mm,
-                                                                                                              const EXT_ID &ext_id,
-                                                                                                              int tail)
-  : map_man_ (&mm)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Map_Bucket_Iterator");
-
-  this->index_ = this->map_man_->hash (ext_id) % this->map_man_->total_size_;
-  this->next_ = &this->map_man_->table_[this->index_];
-
-  if (tail == 0)
-    this->forward_i ();
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)");
-
-  this->forward_i ();
-  return *this;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (int)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (int)");
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> retv (*this);
-  this->forward_i ();
-  return retv;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)");
-
-  this->reverse_i ();
-  return *this;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (int)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (int)");
-
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> retv (*this);
-  this->reverse_i ();
-  return retv;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i");
-
-  this->next_ = this->next_->next_;
-  return this->next_ != &this->map_man_->table_[this->index_];
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i");
-
-  this->next_ = this->next_->prev_;
-  return this->next_ != &this->map_man_->table_[this->index_];
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Entry<EXT_ID, INT_ID> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* (void) const
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator*");
-
-  return *this->next_;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map (void)
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map");
-  return *this->map_man_;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator== (const ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &rhs) const
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator==");
-  return this->map_man_ == rhs.map_man_
-    && this->index_ == rhs.index_
-    && this->next_ == rhs.next_;
-}
-
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator!= (const ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &rhs) const
-{
-  ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator!=");
-  return this->next_ != rhs.next_
-    || this->index_ != rhs.index_
-    || this->map_man_ != rhs.map_man_;
-}
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Map_Reverse_Iterator_Ex)
 
-template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
+  template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
 ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
   ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
@@ -692,7 +582,7 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Hash_Map_Manager (ACE_Alloca
 template <class EXT_ID, class INT_ID, class ACE_LOCK>
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Hash_Map_Manager (size_t size,
                                                                       ACE_Allocator *alloc)
-  : ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> (size,
+  : ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> (size, 
                                                                                                alloc)
 {
 }
@@ -703,7 +593,7 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::equal (const EXT_ID &id1, const
   return ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK>::equal (id1, id2);
 }
 
-template <class EXT_ID, class INT_ID, class ACE_LOCK> u_long
+template <class EXT_ID, class INT_ID, class ACE_LOCK> u_long 
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::hash (const EXT_ID &ext_id)
 {
   return ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK>::hash (ext_id);
@@ -751,8 +641,9 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_Hash_Map_Reverse_Itera
 ACE_Hash_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator= (const ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &rhs)
 {
   ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base = *this;
-
+  
   base = rhs;
 
   return *this;
 }
+
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index 74c3d5c0640..edd5acbac21 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -45,110 +45,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer)
 /* static */
 int ACE_High_Res_Timer::global_scale_factor_status_ = 0;
 
-#if defined (linux)
-// Determine the apparent CPU clock speed from /proc/cpuinfo
-ACE_UINT32
-ACE_High_Res_Timer::get_cpuinfo (void)
-{
-  ACE_UINT32 scale_factor = 1u;
-
-  // Get the BogoMIPS from /proc/cpuinfo.  It works fine on Alpha and
-  // Pentium Pro.  For other CPUs, it will be necessary to interpret
-  // the BogoMips, as described in the BogoMips mini-HOWTO.  Note that
-  // this code assumes an order to the /proc/cpuinfo contents.  The
-  // BogoMips rating had better come after CPU type and model info.
-#if !defined (__alpha__)
-  int supported = 0;
-#endif /* __alpha__ */
-
-  FILE *cpuinfo = ACE_OS::fopen ("/proc/cpuinfo", "r");
-
-  if (cpuinfo != 0)
-    {
-      char buf[128];
-
-      // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nReading /proc/cpuinfo...")));
-
-      while (ACE_OS::fgets (buf, sizeof buf, cpuinfo))
-        {
-#if defined (__alpha__)
-          ACE_UINT32 whole;
-          ACE_UINT32 fractional;
-          if (::sscanf (buf,
-                        "BogoMIPS : %d.%d\n",
-                        &whole,
-                        &fractional) == 2 
-              || ::sscanf (buf,
-                           "bogomips : %d.%d\n",
-                           &whole,
-                           &fractional) == 2)
-            {
-              scale_factor = whole;
-              break;
-            }
-#else
-          double bmips = 1;
-          char arg[128];
-
-          // CPU type?
-          if (::sscanf (buf, "cpu : %s\n", arg) == 1)
-            {
-              // If this is an Alpha chip, then the BogoMips rating is
-              // usable...
-              if (ACE_OS::strncmp (arg,
-                                   "Alpha",
-                                   5) == 0)
-                {
-                  supported = 1;
-                  // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" recognized Alpha chip...")));
-                }
-            }
-          // Pentium CPU model?
-          else if (supported == 0
-                   && ::sscanf (buf, "model : Pentium %s\n", arg) == 1)
-            {
-              // But if we don't have the right kind of Intel chip,
-              // just quit.
-              if (ACE_OS::strcmp (arg, "II") == 0
-                  || ACE_OS::strcmp (arg, "Pro") == 0)
-                {
-                  supported = 1;
-                  // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" recognized Pentium Pro/II chip...")));
-                }
-            }
-          else if (::sscanf (buf, "bogomips : %lf\n", &bmips) == 1
-                   || ::sscanf (buf, "BogoMIPS : %lf\n", &bmips) == 1)
-            {
-              if (supported)
-                {
-                  scale_factor = (ACE_UINT32) (bmips + 0.5);
-                  // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" setting the clock scale factor to %u"), scale_factor));
-                }
-#if 0
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              ASYS_TEXT ("\nThe BogoMIPS metric is not supported on this platform"
-                                         "\n\tReport the results of the clock calibration and"
-                                         "\n\tthe contents of /proc/cpuinfo to the ace-users mailing list")));
-                }
-#endif /* 0 */
-              break;
-            }
-#endif /* __alpha__ */
-        }
-
-      // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (done)\n")));
-
-      ACE_OS::fclose (cpuinfo);
-    }
-
-  return scale_factor;
-}
-#endif /* linux */
 
 ACE_UINT32
-ACE_High_Res_Timer::global_scale_factor (void)
+ACE_High_Res_Timer::global_scale_factor ()
 {
 #if (defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_POWERPC_TIMER) || \
      defined (ACE_HAS_ALPHA_TIMER)) && \
@@ -179,8 +78,29 @@ ACE_High_Res_Timer::global_scale_factor (void)
 
             return ACE_High_Res_Timer::global_scale_factor_;
 
-#         elif defined (linux)
-            ACE_High_Res_Timer::global_scale_factor (ACE_High_Res_Timer::get_cpuinfo ());
+#         elif defined (linux) && (__alpha__)
+            // Get the BogoMIPS from /proc.  It works fine on Alpha,
+            // only.  For other CPUs, it will be necessary to
+            // interpret the BogoMips, as described in the BogoMips
+            // mini-HOWTO.
+            FILE *cpuinfo;
+            if ((cpuinfo = ACE_OS::fopen ("/proc/cpuinfo", "r")))
+              {
+                char buf[128];
+                while (ACE_OS::fgets (buf, sizeof buf, cpuinfo))
+                  {
+                    ACE_UINT32 whole, fractional;
+                    if (::sscanf (buf, "BogoMIPS : %d.%d\n",
+                                  &whole, &fractional) == 2 ||
+                        ::sscanf (buf, "bogomips : %d.%d\n",
+                                  &whole, &fractional) == 2)
+                      {
+                        ACE_High_Res_Timer::global_scale_factor (whole);
+                        break;
+                      }
+                  }
+                ACE_OS::fclose (cpuinfo);
+              }
 #         endif /* ! ACE_WIN32 && ! (linux && __alpha__) */
 
           if (ACE_High_Res_Timer::global_scale_factor_ == 1u)
@@ -214,20 +134,14 @@ ACE_High_Res_Timer::calibrate (const ACE_UINT32 usec,
 {
   const ACE_Time_Value sleep_time (0, usec);
   ACE_Stats delta_hrtime;
-  // In units of 100 usec, to avoid overflow.
-  ACE_Stats actual_sleeps; 
+  ACE_Stats actual_sleeps; /* In units of 100 usec, to avoid overflow. */
 
-  for (u_int i = 0;
-       i < iterations;
-       ++i)
+  for (u_int i = 0; i < iterations; ++i)
     {
-      const ACE_Time_Value actual_start =
-        ACE_OS::gettimeofday ();
-      const ACE_hrtime_t start =
-        ACE_OS::gethrtime ();
+      const ACE_Time_Value actual_start = ACE_OS::gettimeofday ();
+      const ACE_hrtime_t start = ACE_OS::gethrtime ();
       ACE_OS::sleep (sleep_time);
-      const ACE_hrtime_t stop =
-        ACE_OS::gethrtime ();
+      const ACE_hrtime_t stop = ACE_OS::gethrtime ();
       const ACE_Time_Value actual_delta =
         ACE_OS::gettimeofday () - actual_start;
 
@@ -348,8 +262,8 @@ void
 ACE_High_Res_Timer::elapsed_time (ACE_hrtime_t &nanoseconds) const
 {
   // Please do _not_ rearrange this equation.  It is carefully
-  // designed and tested to avoid overflow on machines that don't have
-  // native 64-bit ints.
+  // designed and tested to avoid overflow on machines that
+  // don't have native 64-bit ints.
   nanoseconds = (this->end_ - this->start_) * (1000u / this->global_scale_factor ());
 }
 
@@ -384,25 +298,16 @@ ACE_High_Res_Timer::print_ave (const char *str,
   if (count > 1)
     {
       ACE_hrtime_t avg_nsecs = total_nanoseconds / (ACE_UINT32) count;
-      ACE_OS::sprintf (buf,
-                       " count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n",
-                       count,
-                       total_secs,
-                       (extra_nsecs + 500u) / 1000u,
-                       (u_long) ((avg_nsecs + 500u) / 1000u));
+      ACE_OS::sprintf (buf, " count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n",
+             count, total_secs, (extra_nsecs + 500u) / 1000u,
+             (u_long) ((avg_nsecs + 500u) / 1000u));
     }
   else
-    ACE_OS::sprintf (buf,
-                     " total %3lu.%06lu secs\n",
-                     total_secs,
-                     (extra_nsecs + 500lu) / 1000lu);
-
-  ACE_OS::write (handle,
-                 str,
-                 ACE_OS::strlen (str));
-  ACE_OS::write (handle,
-                 buf,
-                 ACE_OS::strlen (buf));
+    ACE_OS::sprintf (buf, " total %3lu.%06lu secs\n",
+             total_secs, (extra_nsecs + 500u) / 1000u);
+
+  ACE_OS::write (handle, str, ACE_OS::strlen (str));
+  ACE_OS::write (handle, buf, ACE_OS::strlen (buf));
 }
 
 void
@@ -417,35 +322,23 @@ ACE_High_Res_Timer::print_total (const char *str,
   this->elapsed_time (total_nanoseconds);
 
   // Separate to seconds and nanoseconds.
-  u_long total_secs =
-    (u_long) (total_nanoseconds / (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS);
-  ACE_UINT32 extra_nsecs =
-    (ACE_UINT32) (total_nanoseconds % (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS);
+  u_long total_secs  = (u_long) (total_nanoseconds / (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS);
+  ACE_UINT32 extra_nsecs = (ACE_UINT32) (total_nanoseconds % (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS);
 
   char buf[100];
   if (count > 1)
     {
-      ACE_hrtime_t avg_nsecs = this->total_ / (ACE_UINT32) count;
-
-      ACE_OS::sprintf (buf, 
-                       " count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n",
-                       count,
-                       total_secs,
-                       (extra_nsecs + 500u) / 1000u,
-                       (u_long) ((avg_nsecs + 500u) / 1000u));
+      ACE_hrtime_t avg_nsecs   = this->total_ / (ACE_UINT32) count;
+      ACE_OS::sprintf (buf, " count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n",
+             count, total_secs, (extra_nsecs + 500u) / 1000u,
+             (u_long) ((avg_nsecs + 500u) / 1000u));
     }
   else
-    ACE_OS::sprintf (buf,
-                     " total %3lu.%06u secs\n",
-                     total_secs,
-                     (extra_nsecs + 500u) / 1000u);
-
-  ACE_OS::write (handle,
-                 str,
-                 ACE_OS::strlen (str));
-  ACE_OS::write (handle,
-                 buf,
-                 ACE_OS::strlen (buf));
+    ACE_OS::sprintf (buf, " total %3lu.%06u secs\n",
+             total_secs, (extra_nsecs + 500u) / 1000u);
+
+  ACE_OS::write (handle, str, ACE_OS::strlen (str));
+  ACE_OS::write (handle, buf, ACE_OS::strlen (buf));
 }
 #endif /* !ACE_HAS_WINCE */
 
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 4a591b56503..676e47f24cb 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -77,8 +77,8 @@ public:
   // not be set.  Careful, a <scale_factor> of 0 will cause division
   // by zero exceptions.
 
-  static ACE_UINT32 global_scale_factor (void);
-  // Returns the global_scale_factor.
+  static ACE_UINT32 global_scale_factor ();
+  // Accesses the global_scale_factor.
 
   static int get_env_global_scale_factor (const char *env = "ACE_SCALE_FACTOR");
   // Sets the global_scale_factor to the value in the <env>
@@ -135,12 +135,12 @@ public:
   // Stop incremental timing.
 
   void elapsed_time_incr (ACE_Time_Value &tv) const;
-  // Set <tv> to the number of microseconds elapsed between all calls
-  // to start_incr and stop_incr.
+  // Set <tv> to the number of microseconds elapsed between all
+  // calls to start_incr and stop_incr.
 
   void elapsed_time_incr (ACE_hrtime_t &nanoseconds) const;
-  // Set <nsec> to the number of nanoseconds elapsed between all calls
-  // to start_incr and stop_incr.
+  // Set <nsec> to the number of nanoseconds elapsed between all
+  // calls to start_incr and stop_incr.
 
 #if !defined (ACE_HAS_WINCE)
   // @@ These two functions are currently not supported on Windows CE.
@@ -182,21 +182,14 @@ public:
                             const ACE_hrtime_t hrt);
   // Converts an <hrt> to <tv> using global_scale_factor_.
 
-#if defined (linux)
-  static ACE_UINT32 get_cpuinfo (void);
-  // This is used to find out the Mhz of the machine for the scale
-  // factor.  If there are any problems getting it, we just return 1
-  // (the default).
-#endif /* defined (linux) */
-
 private:
   static ACE_hrtime_t gettime (const ACE_OS::ACE_HRTimer_Op =
                                  ACE_OS::ACE_HRTIMER_GETTIME);
-  // For internal use: gets the high-resolution time using
-  // ACE_OS::gethrtime ().  Except on platforms that require that the
-  // global_scale_factor_ be set, such as ACE_WIN32, uses the
-  // low-resolution clock if the global_scale_factor_ has not been
-  // set.
+  // For internal use:  gets the high-resolution time using
+  // ACE_OS::gethrtime ().  Except on platforms that require
+  // that the global_scale_factor_ be set, such as ACE_WIN32,
+  // uses the low-resolution clock if the global_scale_factor_
+  // has not been set.
 
   ACE_hrtime_t start_;
   // Starting time.
diff --git a/ace/LSOCK_Connector.cpp b/ace/LSOCK_Connector.cpp
index ec68fe8292d..79e12d73b34 100644
--- a/ace/LSOCK_Connector.cpp
+++ b/ace/LSOCK_Connector.cpp
@@ -1,6 +1,9 @@
 // LSOCK_Connector.cpp
 // $Id$
 
+/* Defines the format and interface for the connector side of the
+   local ACE_SOCK ACE_Stream. */
+
 #define ACE_BUILD_DLL
 #include "ace/LSOCK_Connector.h"
 
@@ -39,15 +42,9 @@ ACE_LSOCK_Connector::ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream,
 					  int perms,
 					  int protocol_family, 
 					  int protocol)
-  : ACE_SOCK_Connector (new_stream,
-                        remote_sap,
-                        timeout,
-			local_sap,
-                        reuse_addr,
-                        flags,
-                        perms,
-                        protocol_family,
-                        protocol)
+  : ACE_SOCK_Connector (new_stream, remote_sap, timeout,
+			local_sap, reuse_addr, flags, perms,
+			protocol_family, protocol)
 {
   ACE_TRACE ("ACE_LSOCK_Connector::ACE_LSOCK_Connector");
   // This is necessary due to the weird inheritance relationships of
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index 3b1c7201851..041e1cf1045 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -1112,8 +1112,7 @@ ACE_Token_Proxy::open (const ASYS_TCHAR *token_name,
   // We must have a name.
   if (token_name == 0)
     {
-      ACE_OS::sprintf (name, ASYS_TEXT ("token %x"),
-                       ACE_reinterpret_cast (ptr_arith_t, this));
+      ACE_OS::sprintf (name, ASYS_TEXT ("token %d"), this);
       token_name = name;
     }
 
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 84ed0583f92..1283afde735 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -730,8 +730,8 @@ ACE_Log_Msg::log (const ASYS_TCHAR *format_str,
                   type = SKIP_SPRINTF;
                   abort_prog = 1;
                   exit_value = va_arg (argp, int);
-                  ACE_OS::sprintf (bp, ASYS_TEXT ("Aborting..."));
-                  // Make sure to NULL terminate this...
+                  ACE_OS::sprintf (bp, ASYS_TEXT ("")); // Make sure to
+                                                        // NUL-terminate this...
                   break;
                 case 'l':
                   ACE_OS::sprintf (bp, ASYS_TEXT ("%d"), this->linenum ());
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index 94eeb04f96b..fd611eadb37 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -1,13 +1,12 @@
+// Log_Record.cpp
 // $Id$
 
 #define ACE_BUILD_DLL
 #include "ace/Log_Record.h"
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-# include "ace/streams.h"
-#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
+#include "ace/streams.h"
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-# include "ace/Log_Record.i"
+#include "ace/Log_Record.i"
 #endif
 
 ACE_RCSID(ace, Log_Record, "$Id$")
@@ -121,14 +120,7 @@ ACE_Log_Record::format_msg (const ASYS_TCHAR *host_name,
                             u_long verbose_flag,
                             ASYS_TCHAR *verbose_msg)
 {
-  /* 0123456789012345678901234     */
-  /* Oct 18 14:25:36.000 1989<nul> */
-  ASYS_TCHAR timestamp[26]; // Only used by VERBOSE and VERBOSE_LITE.
-
-  if (ACE_BIT_ENABLED (verbose_flag,
-                       ACE_Log_Msg::VERBOSE)
-      || ACE_BIT_ENABLED (verbose_flag,
-                          ACE_Log_Msg::VERBOSE_LITE))
+  if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE))
     {
       time_t now = this->time_stamp_.sec ();
       ASYS_TCHAR ctp[26]; // 26 is a magic number...
@@ -142,43 +134,38 @@ ACE_Log_Record::format_msg (const ASYS_TCHAR *host_name,
       ctp[19] = '\0'; // NUL-terminate after the time.
       ctp[24] = '\0'; // NUL-terminate after the date.
 
-      ACE_OS::sprintf (timestamp,
-                       ASYS_TEXT ("%s.%03d %s"),
-                       ctp + 4,
-                       this->time_stamp_.usec () / 1000,
-                       ctp + 20);
-    }
-
-  if (ACE_BIT_ENABLED (verbose_flag,
-                       ACE_Log_Msg::VERBOSE))
-    {
 # if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
       const ASYS_TCHAR *lhost_name =  (const ASYS_TCHAR *) ((host_name == 0)
-                                                            ? ((char *) ASYS_TEXT ("<local_host>"))
-                                                            : ((char *) host_name));
+        ? ((char *) ASYS_TEXT ("<local_host>")) : ((char *) host_name));
 # else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
       const ASYS_TCHAR *lhost_name = ((host_name == 0)
-                                      ? ASYS_TEXT ("<local_host>")
-                                      : host_name);
+        ? ASYS_TEXT ("<local_host>") : host_name);
 # endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
+
       ACE_OS::sprintf (verbose_msg,
-                       ASYS_TEXT ("%s@%s@%d@%s@%s"),
-                       timestamp,
+                       ASYS_TEXT ("%s.%03d %s@%s@%d@%s@%s"),
+                       ctp + 4,
+                       this->time_stamp_.usec () / 1000,
+                       ctp + 20,
                        lhost_name,
                        this->pid_,
                        ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)),
                        this->msg_data_);
     }
   else if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE_LITE))
-    ACE_OS::sprintf (verbose_msg,
-                     ASYS_TEXT ("%s@%s@%s"),
-                     timestamp,
-                     ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)),
-                     this->msg_data_);
+    {
+      ACE_OS::sprintf (verbose_msg,
+                       ASYS_TEXT ("%s@%s"),
+                       ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)),
+                       this->msg_data_);
+    }
   else
-    ACE_OS::sprintf (verbose_msg,
-                     ASYS_TEXT ("%s"),
-                     this->msg_data_);
+    {
+      ACE_OS::sprintf (verbose_msg,
+                       ASYS_TEXT ("%s"),
+                       this->msg_data_);
+    }
+
   return 0;
 }
 
@@ -239,7 +226,7 @@ ACE_Log_Record::print (const ASYS_TCHAR *host_name,
   return result;
 }
 
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
+#if ! defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
 int
 ACE_Log_Record::print (const ASYS_TCHAR *host_name,
diff --git a/ace/Makefile b/ace/Makefile
index 39035761cfa..9cfb79633d5 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -596,18 +596,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -623,6 +611,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -683,10 +676,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -701,16 +692,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -719,6 +700,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -744,10 +730,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -762,16 +746,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -780,6 +754,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i
@@ -876,18 +855,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -898,6 +865,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -997,18 +969,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1021,6 +981,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -1058,10 +1023,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -1076,16 +1039,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -1094,6 +1047,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1152,13 +1110,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1273,10 +1224,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -1291,16 +1240,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -1314,6 +1253,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1360,10 +1304,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -1378,16 +1320,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -1396,6 +1328,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1438,18 +1375,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1458,6 +1383,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i
@@ -1538,18 +1468,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -1559,6 +1477,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Hash_T.cpp \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
@@ -1610,18 +1533,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -1631,6 +1542,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Heap_T.cpp
 .obj/Timer_List.o .obj/Timer_List.so .shobj/Timer_List.o .shobj/Timer_List.so: Timer_List.cpp \
  $(ACE_ROOT)/ace/Timer_List.h \
@@ -1676,18 +1592,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -1697,6 +1601,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_List_T.cpp
 .obj/Timer_Queue.o .obj/Timer_Queue.so .shobj/Timer_Queue.o .shobj/Timer_Queue.so: Timer_Queue.cpp \
  $(ACE_ROOT)/ace/Containers.h \
@@ -1719,10 +1628,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -1737,16 +1644,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -1755,6 +1652,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1806,18 +1708,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -1827,6 +1717,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i
@@ -1902,18 +1797,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1924,6 +1807,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2003,18 +1891,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -2030,6 +1906,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2113,10 +1994,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2131,16 +2010,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -2149,6 +2018,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2289,18 +2163,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -2311,11 +2173,19 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
@@ -2369,10 +2239,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2385,16 +2253,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -2408,6 +2266,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2466,18 +2329,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -2490,6 +2341,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -2564,18 +2420,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -2588,6 +2432,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -2680,10 +2529,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2698,16 +2545,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -2716,6 +2553,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2769,10 +2611,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2787,11 +2627,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -2916,18 +2751,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -2937,6 +2760,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -3041,18 +2869,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3065,6 +2881,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3122,18 +2943,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3146,6 +2955,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3220,18 +3034,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3244,6 +3046,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3322,18 +3129,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3346,6 +3141,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3403,18 +3203,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3427,6 +3215,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3540,18 +3333,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -3564,6 +3345,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -3675,18 +3461,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Malloc_T.i \
@@ -3696,6 +3470,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -4665,18 +4444,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -4688,7 +4455,12 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp
 .obj/SPIPE_Addr.o .obj/SPIPE_Addr.so .shobj/SPIPE_Addr.o .shobj/SPIPE_Addr.so: SPIPE_Addr.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -5070,10 +4842,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -5088,16 +4858,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -5111,6 +4871,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5215,10 +4980,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -5233,16 +4996,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -5256,6 +5009,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5358,10 +5116,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -5376,16 +5132,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -5399,6 +5145,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5533,18 +5284,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -5557,6 +5296,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -5637,10 +5381,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -5655,16 +5397,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -5678,6 +5410,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5780,18 +5517,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -5804,6 +5529,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -5985,18 +5715,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -6007,6 +5725,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6104,10 +5827,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Obstack.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6122,16 +5843,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6145,6 +5856,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6193,10 +5909,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6211,16 +5925,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6229,6 +5933,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6325,10 +6034,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6343,16 +6050,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6366,6 +6063,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6395,10 +6097,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6413,16 +6113,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6436,6 +6126,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6463,10 +6158,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6481,16 +6174,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6504,6 +6187,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6530,10 +6218,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6548,16 +6234,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6571,6 +6247,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6667,18 +6348,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -6689,6 +6358,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6752,7 +6426,10 @@ endif # GHS
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp
 .obj/Based_Pointer_Repository.o .obj/Based_Pointer_Repository.so .shobj/Based_Pointer_Repository.o .shobj/Based_Pointer_Repository.so: Based_Pointer_Repository.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -6762,11 +6439,9 @@ endif # GHS
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -6780,14 +6455,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -6795,7 +6462,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -6848,10 +6519,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6866,16 +6535,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6889,6 +6548,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i
@@ -6945,18 +6609,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -6965,6 +6617,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6988,10 +6645,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -7006,16 +6661,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -7029,6 +6674,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7050,10 +6700,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -7068,16 +6716,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -7091,6 +6729,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7202,18 +6845,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7224,6 +6855,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7307,18 +6943,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7329,6 +6953,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7356,7 +6985,10 @@ endif # GHS
  $(ACE_ROOT)/ace/Local_Tokens.i \
  $(ACE_ROOT)/ace/Token_Request_Reply.h \
  $(ACE_ROOT)/ace/Token_Request_Reply.i \
- $(ACE_ROOT)/ace/Remote_Tokens.i
+ $(ACE_ROOT)/ace/Remote_Tokens.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp
 .obj/Token_Collection.o .obj/Token_Collection.so .shobj/Token_Collection.o .shobj/Token_Collection.so: Token_Collection.cpp \
  $(ACE_ROOT)/ace/Token_Collection.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
@@ -7391,18 +7023,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7418,6 +7038,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7478,18 +7103,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7505,6 +7118,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7565,18 +7183,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7592,6 +7198,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7655,18 +7266,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7677,6 +7276,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7748,18 +7352,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7772,6 +7364,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -7830,10 +7427,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -7848,16 +7443,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -7866,6 +7451,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7975,18 +7565,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -7999,6 +7577,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -8058,10 +7641,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -8076,16 +7657,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -8094,6 +7665,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -8158,10 +7734,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -8176,16 +7750,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -8194,6 +7758,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -8287,10 +7856,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -8305,16 +7872,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -8323,6 +7880,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 9aa14849752..98677f3160e 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -286,7 +286,6 @@ libACE_Streams_la_SOURCES = \
         Task.cpp
 
 libACE_Memory_la_SOURCES = \
-	Based_Pointer_Repository.cpp \
         Malloc.cpp \
         Mem_Map.cpp \
         Memory_Pool.cpp \
@@ -384,7 +383,6 @@ ACE_TEMPLATE_FILES = \
         Active_Map_Manager_T.cpp \
         Asynch_Acceptor.cpp \
         Auto_Ptr.cpp \
-	Based_Pointer_T.cpp \
         Connector.cpp \
         Containers_T.cpp \
 	Cache_Map_Manager_T.cpp \
@@ -471,9 +469,6 @@ pkginclude_HEADERS = \
         Atomic_Op.i \
         Auto_Ptr.h \
         Auto_Ptr.i \
-        Based_Pointer_Repository.h \
-        Based_Pointer_T.h \
-        Based_Pointer_T.i \
         Basic_Types.h \
         Basic_Types.i \
         CDR_Stream.h \
@@ -565,6 +560,8 @@ pkginclude_HEADERS = \
         Hash_Map_Manager.i \
         Hash_Map_Manager_T.h \
         Hash_Map_Manager_T.i \
+        Hash_Purgable_Map_Manager_T.h \
+        Hash_Purgable_Map_Manager_T.i \
         High_Res_Timer.h \
         High_Res_Timer.i \
         INET_Addr.h \
diff --git a/ace/Makefile.bor b/ace/Makefile.bor
index 06ae7ecba94..1f40409661a 100644
--- a/ace/Makefile.bor
+++ b/ace/Makefile.bor
@@ -188,8 +188,6 @@ OBJFILES = \
 	$(OBJDIR)\WIN32_Proactor.obj \
 	$(OBJDIR)\XtReactor.obj
 
-RESOURCE = $(OBJDIR)\ace.res
-
 CFLAGS = $(ACE_CFLAGS)
 
 CPPDIR = .
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index 6989ce2a4f6..54b2ccbe390 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -29,8 +29,8 @@ ACE_Control_Block::dump (void) const
   ACE_TRACE ("ACE_Control_Block::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_POINTER_CAST (this->name_head_)->dump ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("freep_ = %x"), ACE_POINTER_CAST (this->freep_)));
+  this->name_head_->dump ();
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("freep_ = %x"), (void *) this->freep_));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
@@ -41,31 +41,13 @@ ACE_Name_Node::ACE_Name_Node (void)
 }
 
 ACE_Name_Node::ACE_Name_Node (const char *name,
-                              char *ptr,
+                              void *ptr,
                               ACE_Name_Node *next)
   : pointer_ (ptr),
     next_ (next)
 {
   ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
-  ACE_OS::strcpy (ACE_POINTER_CAST (this->name_), name);
-}
-
-ACE_Name_Node::ACE_Name_Node (const ACE_Name_Node &)
-{
-  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
-  ACE_ASSERT (!"not implemented!");
-}
-
-const char *
-ACE_Name_Node::name (void) const
-{
-  return ACE_POINTER_CAST (this->name_);
-}
-
-void
-ACE_Name_Node::name (const char *)
-{
-  ACE_ASSERT (!"not implemented yet");
+  ACE_OS::strcpy (this->name_, name);
 }
 
 void
@@ -74,9 +56,9 @@ ACE_Name_Node::dump (void) const
   ACE_TRACE ("ACE_Name_Node");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("pointer = %x"), ACE_POINTER_CAST (this->pointer_)));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\nnext_ = %x"), ACE_POINTER_CAST (this->next_)));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\nname_ = %s"), ACE_POINTER_CAST (this->name_)));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("pointer = %x"), this->pointer_));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\nnext_ = %x"), this->next_));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\nname_ = %s"), this->name_));
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
@@ -110,9 +92,9 @@ ACE_Allocator::instance (void)
           // destroy it.
           static void *allocator_instance = 0;
 
-          // Check this critical assumption.  We put it in a variable
-          // first to avoid stupid compiler warnings that the
-          // condition may always be true/false.
+          // Check this critical assumption.
+          // We put it in a variable first to avoid stupid compiler
+          // warnings that the condition may always be true/false.
 #         if !defined (ACE_NDEBUG)
           int assertion = (sizeof allocator_instance ==
                            sizeof (ACE_New_Allocator));
@@ -230,17 +212,11 @@ template class ACE_Atomic_Op<ACE_PROCESS_MUTEX, int>;
 
 #if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Based_Pointer_Basic<ACE_Malloc_Header>;
-template class ACE_Based_Pointer_Basic<ACE_Name_Node>;
-template class ACE_Based_Pointer_Basic<char>;
 template class ACE_Based_Pointer<ACE_Malloc_Header>;
-template class ACE_Based_Pointer<ACE_Name_Node>;
+template ACE_Based_Pointer<ACE_Malloc_Header> operator+ (const ACE_Based_Pointer<ACE_Malloc_Header> &lhs, long increment);
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Based_Pointer_Basic<ACE_Malloc_Header>
-#pragma instantiate ACE_Based_Pointer_Basic<ACE_Name_Node>
-#pragma instantiate ACE_Based_Pointer_Basic<char>
 #pragma instantiate ACE_Based_Pointer<ACE_Malloc_Header>
-#pragma instantiate ACE_Based_Pointer<ACE_Name_Node>
+#pragma instantiate ACE_Based_Pointer<ACE_Malloc_Header> operator+ (const ACE_Based_Pointer<ACE_Malloc_Header> &lhs, long increment)
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
 
diff --git a/ace/Malloc.h b/ace/Malloc.h
index 7844a8079a3..4c78cd702f3 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -84,12 +84,11 @@ class ACE_Export ACE_Malloc_Header
   //    This is the control block header.  It's used by <ACE_Malloc>
   //    to keep track of each chunk of data when it's in the free
   //    list or in use.
+
 public:
 #if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
-# define ACE_POINTER_CAST(PTR) ((PTR).addr ())
   typedef ACE_Based_Pointer<ACE_Malloc_Header> HEADER_PTR;
 #else 
-# define ACE_POINTER_CAST(PTR) ((PTR))
   typedef ACE_Malloc_Header *HEADER_PTR;
 #endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
 
@@ -113,52 +112,22 @@ public:
 class ACE_Export ACE_Name_Node
 {
   // = TITLE
-  //    This class supports "named memory regions" within <ACE_Malloc>.
-  //
-  // = DESCRIPTION
-  //   Internally, the named memory regions are stored as a linked
-  //   list within the <Memory_Pool>.
+  //    This is stored as a linked list within the Memory_Pool
+  //    to allow "named memory chunks."
 public:
   // = Initialization methods.
-  ACE_Name_Node (const char *name,
-                 char *,
-                 ACE_Name_Node *);
-  // Constructor.
-
-  ACE_Name_Node (const ACE_Name_Node &);
-  // Copy constructor.
-
+  ACE_Name_Node (const char *name, void *, ACE_Name_Node *);
   ACE_Name_Node (void);
-  // Constructor.
-
   ~ACE_Name_Node (void);
-  // Constructor.
-
-  const char *name (void) const;
-  // Return a pointer to the name of this node.
-
-  void name (const char *);
-  // Assign a name;
-
-#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
-  ACE_Based_Pointer_Basic<char> name_;
-  // Name of the Node.
-
-  ACE_Based_Pointer_Basic<char> pointer_;
-  // Pointer to the contents.
 
-  ACE_Based_Pointer<ACE_Name_Node> next_;
-  // Pointer to the next node in the chain.
-#else
   char *name_;
   // Name of the Node.
 
-  char *pointer_;
+  void *pointer_;
   // Pointer to the contents.
 
   ACE_Name_Node *next_;
   // Pointer to the next node in the chain.
-#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
 
   void dump (void) const;
   // Dump the state of the object.
@@ -167,19 +136,14 @@ public:
 class ACE_Export ACE_Control_Block
 {
   // = TITLE
-  //    This information is stored in memory allocated by the <Memory_Pool>.
+  //    This information is stored in memory allocated by the MEMORY_POOL.
   //
   // = DESCRIPTION
   //    This class should be local to class ACE_Malloc, but some older
   //    C++ compilers don't like nested classes in templates...
 public:
-#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
-  ACE_Based_Pointer<ACE_Name_Node> name_head_;
-  // Head of the linked list of Name Nodes.
-#else
   ACE_Name_Node *name_head_;
   // Head of the linked list of Name Nodes.
-#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
 
   ACE_Malloc_Header::HEADER_PTR freep_;
   // Current head of the freelist.
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp
index 8d3ba28d10f..946e026b256 100644
--- a/ace/Malloc_T.cpp
+++ b/ace/Malloc_T.cpp
@@ -101,18 +101,17 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::print_stats (void) const
     return;
   this->cb_ptr_->malloc_stats_.dump ();
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) contents of freelist:\n")));
+              ASYS_TEXT (" (%P|%t) contents of freelist:\n")));
 
-  for (ACE_Malloc_Header *currp = ACE_POINTER_CAST (this->cb_ptr_->freep_->s_.next_block_);
+  for (ACE_Malloc_Header::HEADER_PTR currp = this->cb_ptr_->freep_->s_.next_block_;
        ;
-       currp = ACE_POINTER_CAST (currp->s_.next_block_))
+       currp = currp->s_.next_block_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) ptr = %u, ACE_Malloc_Header units = %d, byte units = %d\n"),
-                  currp,
-                  currp->s_.size_,
+                  ASYS_TEXT (" (%P|%t) ptr = %u, ACE_Malloc_Header units = %d, byte units = %d\n"),
+                  currp, currp->s_.size_,
                   currp->s_.size_ * sizeof (ACE_Malloc_Header)));
-      if (currp == ACE_POINTER_CAST (this->cb_ptr_->freep_))
+      if (currp == this->cb_ptr_->freep_)
         break;
     }
 }
@@ -151,12 +150,12 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void)
                                      first_time);
   if (this->cb_ptr_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) %p\n"),
+                       ASYS_TEXT (" (%P|%t) %p\n"),
                        ASYS_TEXT ("init_acquire failed")),
                       -1);
   else if (first_time)
     {
-      // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) first time in, control block = %u\n"), this->cb_ptr_));
+      // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%P|%t) first time in, control block = %u\n"), this->cb_ptr_));
 
 #if defined (ACE_HAS_MALLOC_STATS)
       // Call the constructor on the ACE_LOCK, using the placement
@@ -164,30 +163,23 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void)
       new ((void *) &this->cb_ptr_->malloc_stats_) ACE_Malloc_Stats;
 #endif /* ACE_HAS_MALLOC_STATS */
 
-#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
       // Initialize the freelist pointer to point to the dummy
-      // <ACE_Malloc_Header>.
-      new ((void *) &this->cb_ptr_->freep_) ACE_Malloc_Header::HEADER_PTR (&this->cb_ptr_->base_);
-      new ((void *) &this->cb_ptr_->name_head_) ACE_Based_Pointer<ACE_Name_Node>;
-#else
-      // Initialize the freelist pointer to point to the dummy
-      // <ACE_Malloc_Header>.
+      // ACE_Malloc_Header.
       this->cb_ptr_->freep_ = &this->cb_ptr_->base_;
-      // initialize the name list to 0
-#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
 
-      this->cb_ptr_->name_head_ = (ACE_Name_Node *) 0;
-
-      // Initialize the dummy <ACE_Malloc_Header> to point to itself.
+      // Initialize the dummy ACE_Malloc_Header to point to itself.
       this->cb_ptr_->freep_->s_.size_ = 0;
-      this->cb_ptr_->freep_->s_.next_block_ = ACE_POINTER_CAST (this->cb_ptr_->freep_);
+      this->cb_ptr_->freep_->s_.next_block_ = this->cb_ptr_->freep_;
+
+      // initialize the name list to 0
+      this->cb_ptr_->name_head_ = 0;
 
       if (rounded_bytes > (sizeof *this->cb_ptr_ + sizeof (ACE_Malloc_Header)))
         {
           // If we've got any extra space at the end of the control
           // block, then skip past the dummy ACE_Malloc_Header to
           // point at the first free block.
-          ACE_Malloc_Header *p = ACE_POINTER_CAST (this->cb_ptr_->freep_) + 1;
+          ACE_Malloc_Header::HEADER_PTR p (this->cb_ptr_->freep_ + 1);
 
           // Why aC++ in 64-bit mode can't grok this, I have no
           // idea... but it ends up with an extra bit set which makes
@@ -205,10 +197,12 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void)
           AMS (++this->cb_ptr_->malloc_stats_.nblocks_);
           AMS (++this->cb_ptr_->malloc_stats_.ninuse_);
 
+          // Skip over the ACE_Malloc_Header when returning pointer.
+          ACE_Malloc_Header::HEADER_PTR tmp (p + 1);
           // Insert the newly allocated chunk of memory into the free
-          // list.  Skip over the ACE_Malloc_Header when returning
-          // pointer.
-          this->shared_free (p + 1);
+          // list.  Note that this triggers operator void *() if we're
+          // using the ACE_POSITION_INDEPENDENT_MALLOC configuration.
+          this->shared_free ((void *) tmp);
         }
     }
   return 0;
@@ -223,7 +217,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc (LPCTSTR pool_name)
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc");
   if (this->open () == -1)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("%p"),
                 ASYS_TEXT ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc")));
 }
 
@@ -271,7 +265,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::remove (void)
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::remove");
-  // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) destroying ACE_Malloc\n")));
+  // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%P|%t) destroying ACE_Malloc\n")));
   int result = 0;
 
 #if defined (ACE_HAS_MALLOC_STATS)
@@ -304,20 +298,20 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes)
 
   // Begin the search starting at the place in the freelist where the
   // last block was found.
-  ACE_Malloc_Header *prevp = ACE_POINTER_CAST (this->cb_ptr_->freep_);
-  ACE_Malloc_Header *currp = ACE_POINTER_CAST (prevp->s_.next_block_);
+  ACE_Malloc_Header::HEADER_PTR prevp = this->cb_ptr_->freep_;
+  ACE_Malloc_Header::HEADER_PTR currp = prevp->s_.next_block_;
 
   // Search the freelist to locate a block of the appropriate size.
 
   for (int i = 0;
-       ; i++, prevp = currp, currp = ACE_POINTER_CAST (currp->s_.next_block_))
+       ; i++, prevp = currp, currp = currp->s_.next_block_)
     {
       if (currp->s_.size_ >= nunits) // Big enough
         {
           AMS (++this->cb_ptr_->malloc_stats_.ninuse_);
           if (currp->s_.size_ == nunits)
             // Exact size, just update the pointers.
-            prevp->s_.next_block_ = ACE_POINTER_CAST (currp->s_.next_block_);
+            prevp->s_.next_block_ = currp->s_.next_block_;
           else
             {
               // Remaining chunk is larger than requested block, so
@@ -330,9 +324,13 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes)
           this->cb_ptr_->freep_ = prevp;
 
           // Skip over the ACE_Malloc_Header when returning pointer.
-          return currp + 1;
+          ACE_Malloc_Header::HEADER_PTR tmp (currp + 1);
+          // Insert the newly allocated chunk of memory into the free
+          // list.  Note that this triggers operator void *() if we're
+          // using the ACE_POSITION_INDEPENDENT_MALLOC configuration.
+          return (void *) tmp;
         }
-      else if (currp == ACE_POINTER_CAST (this->cb_ptr_->freep_))
+      else if (currp == this->cb_ptr_->freep_)
         {
           // We've wrapped around freelist without finding a block.
           // Therefore, we need to ask the memory pool for a new chunk
@@ -340,11 +338,9 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes)
 
           size_t chunk_bytes = 0;
 
-          currp = (ACE_Malloc_Header *)
-            this->memory_pool_.acquire (nunits * sizeof (ACE_Malloc_Header),
-                                        chunk_bytes);
-
-          if (currp != 0)
+          if ((currp = (ACE_Malloc_Header *)
+               this->memory_pool_.acquire (nunits * sizeof (ACE_Malloc_Header),
+                                           chunk_bytes)) != 0)
             {
               AMS (++this->cb_ptr_->malloc_stats_.nblocks_);
               AMS (++this->cb_ptr_->malloc_stats_.nchunks_);
@@ -353,15 +349,17 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes)
               // Compute the chunk size in ACE_Malloc_Header units.
               currp->s_.size_ = chunk_bytes / sizeof (ACE_Malloc_Header);
 
-              // Insert the newly allocated chunk of memory into the
-              // free list.  Skip over the ACE_Malloc_Header when
-              // returning pointer.
-              this->shared_free (currp + 1);
-              currp = ACE_POINTER_CAST (this->cb_ptr_->freep_);
+              // Skip over the ACE_Malloc_Header when returning pointer.
+              ACE_Malloc_Header::HEADER_PTR tmp (currp + 1);
+              // Insert the newly allocated chunk of memory into the free
+              // list.  Note that this triggers operator void *() if we're
+              // using the ACE_POSITION_INDEPENDENT_MALLOC configuration.
+              this->shared_free ((void *) tmp);
+              currp = this->cb_ptr_->freep_;
             }
           else
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ASYS_TEXT ("(%P|%t) %p\n"),
+                               ASYS_TEXT (" (%P|%t) %p\n"),
                                ASYS_TEXT ("malloc")),
                               0);
         }
@@ -405,38 +403,37 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_free (void *ap)
     return;
 
   // Adjust AP to point to the block ACE_Malloc_Header
-  ACE_Malloc_Header *blockp = (ACE_Malloc_Header *) ap - 1;
-  ACE_Malloc_Header *currp = ACE_POINTER_CAST (this->cb_ptr_->freep_);
+  ACE_Malloc_Header::HEADER_PTR blockp ((ACE_Malloc_Header *) ap - 1);
+  ACE_Malloc_Header::HEADER_PTR currp = this->cb_ptr_->freep_;
 
   // Search until we find the location where the blocks belongs.  Note
   // that addresses are kept in sorted order.
 
   for (;
-       blockp <= currp || blockp >= ACE_POINTER_CAST (currp->s_.next_block_);
-       currp = ACE_POINTER_CAST (currp->s_.next_block_))
+       blockp <= currp || blockp >= currp->s_.next_block_;
+       currp = currp->s_.next_block_)
     {
-      if (currp >= ACE_POINTER_CAST (currp->s_.next_block_)
-          && (blockp > currp || blockp < ACE_POINTER_CAST (currp->s_.next_block_)))
-        // Freed block at the start or the end of the memory pool.
+      if (currp >= currp->s_.next_block_
+          && (blockp > currp || blockp < currp->s_.next_block_))
+        // Freed block at the start or the end of the memory pool
         break;
     }
 
-  // Join to upper neighbor.
-  if (blockp + blockp->s_.size_ == ACE_POINTER_CAST (currp->s_.next_block_))
+  // Join to upper neighbor
+  if (blockp + blockp->s_.size_ == currp->s_.next_block_)
     {
       AMS (--this->cb_ptr_->malloc_stats_.nblocks_);
       blockp->s_.size_ += currp->s_.next_block_->s_.size_;
-      blockp->s_.next_block_ = ACE_POINTER_CAST (currp->s_.next_block_->s_.next_block_);
+      blockp->s_.next_block_ = currp->s_.next_block_->s_.next_block_;
     }
   else
-    blockp->s_.next_block_ = ACE_POINTER_CAST (currp->s_.next_block_);
+    blockp->s_.next_block_ = currp->s_.next_block_;
 
-  // Join to lower neighbor.
-  if (currp + currp->s_.size_ == blockp) 
+  if (currp + currp->s_.size_ == blockp) // Join to lower neighbor
     {
       AMS (--this->cb_ptr_->malloc_stats_.nblocks_);
       currp->s_.size_ += blockp->s_.size_;
-      currp->s_.next_block_ = ACE_POINTER_CAST (blockp->s_.next_block_);
+      currp->s_.next_block_ = blockp->s_.next_block_;
     }
   else
     currp->s_.next_block_ = blockp;
@@ -455,10 +452,10 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_find (const char *name)
   if (this->cb_ptr_ == 0)
     return 0;
 
-  for (ACE_Name_Node *node = ACE_POINTER_CAST (this->cb_ptr_->name_head_);
+  for (ACE_Name_Node *node = this->cb_ptr_->name_head_;
        node != 0;
-       node = ACE_POINTER_CAST (node->next_))
-    if (ACE_OS::strcmp (node->name (),
+       node = node->next_)
+    if (ACE_OS::strcmp (node->name_,
                         name) == 0)
       return node;
 
@@ -473,31 +470,28 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_bind (const char *name,
     return -1;
 
   // Combine the two allocations into one to avoid overhead...
-  ACE_Name_Node *new_node = 0;
+  ACE_Name_Node *new_node;
 
   ACE_ALLOCATOR_RETURN (new_node,
                         (ACE_Name_Node *)
                         this->shared_malloc (sizeof (ACE_Name_Node) + ACE_OS::strlen (name) + 1),
                         -1);
 
-  // This is a clever trick that skips over the <ACE_Name_Node> chunk
-  // and points to where the string name goes.
+  // This is a clever trick ;-)
   new_node->name_ = (char *) (new_node + 1);
 
   // Insert new node at the head of the list.  Note that (new_node) is
   // *not* a cast, it's operator placement new.
   ACE_NEW_RETURN (this->cb_ptr_->name_head_,
-                  (new_node) ACE_Name_Node (name,
-                                            ACE_reinterpret_cast (char *,
-                                                                  pointer),
-                                            ACE_POINTER_CAST (this->cb_ptr_->name_head_)),
+                  (new_node) ACE_Name_Node (name, pointer,
+                                            this->cb_ptr_->name_head_),
                   -1);
   return 0;
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::trybind (const char *name,
-                                               void *&pointer)
+                                     void *&pointer)
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::trybind");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
@@ -509,16 +503,15 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::trybind (const char *name,
   else
     {
       // Found it, so return a copy of the current entry.
-      pointer = ACE_reinterpret_cast (void *,
-                                      ACE_POINTER_CAST (node->pointer_));
+      pointer = node->pointer_;
       return 1;
     }
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::bind (const char *name,
-                                            void *pointer,
-                                            int duplicates)
+                                        void *pointer,
+                                        int duplicates)
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::bind");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
@@ -535,8 +528,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::bind (const char *name,
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
-ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::find (const char *name,
-                                            void *&pointer)
+ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::find (const char *name, void *&pointer)
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::find");
 
@@ -548,8 +540,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::find (const char *name,
     return -1;
   else
     {
-      pointer = ACE_reinterpret_cast (void *,
-                                      ACE_POINTER_CAST (node->pointer_));
+      pointer = node->pointer_;
       return 0;
     }
 }
@@ -576,10 +567,10 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::avail_chunks (size_t size) const
   // Avoid dividing by 0...
   size = size == 0 ? 1 : size;
 
-  for (ACE_Malloc_Header *currp = ACE_POINTER_CAST (this->cb_ptr_->freep_->s_.next_block_);
-       currp != ACE_POINTER_CAST (this->cb_ptr_->freep_);
-       currp = ACE_POINTER_CAST (currp->s_.next_block_))
-    // Calculate how many will fit in this block.
+  for (ACE_Malloc_Header::HEADER_PTR currp = this->cb_ptr_->freep_->s_.next_block_;
+       currp != this->cb_ptr_->freep_;
+       currp = currp->s_.next_block_)
+    // calculate how many will fit in this block.
     if (currp->s_.size_ * sizeof (ACE_Malloc_Header) >= size)
       count += currp->s_.size_ * sizeof (ACE_Malloc_Header) / size;
 
@@ -606,18 +597,18 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::unbind (const char *name, void *&pointer)
 
   ACE_Name_Node *prev = 0;
 
-  for (ACE_Name_Node *curr = ACE_POINTER_CAST (this->cb_ptr_->name_head_);
+  for (ACE_Name_Node *curr = this->cb_ptr_->name_head_;
        curr != 0;
-       curr = ACE_POINTER_CAST (curr->next_))
+       curr = curr->next_)
     {
-      if (ACE_OS::strcmp (curr->name (), name) == 0)
+      if (ACE_OS::strcmp (curr->name_, name) == 0)
         {
-          pointer = ACE_POINTER_CAST (curr->pointer_);
+          pointer = curr->pointer_;
 
           if (prev == 0)
-            this->cb_ptr_->name_head_ = ACE_POINTER_CAST (curr->next_);
+            this->cb_ptr_->name_head_ = curr->next_;
           else
-            prev->next_ = ACE_POINTER_CAST (curr->next_);
+            prev->next_ = curr->next_;
 
           // This will free up both the node and the name due to our
           // clever trick in <bind>!
@@ -663,10 +654,9 @@ ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc_Iterator (ACE_Malloc<A
 {
   ACE_TRACE ("ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc_Iterator");
   // Cheap trick to make code simple.
-  // @@ Doug, this looks like trouble...
   ACE_Name_Node temp;
   this->curr_ = &temp;
-  this->curr_->next_ = ACE_POINTER_CAST (malloc_.cb_ptr_->name_head_);
+  this->curr_->next_ = malloc_.cb_ptr_->name_head_;
 
   this->advance ();
 }
@@ -679,14 +669,14 @@ ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::~ACE_Malloc_Iterator (void)
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::next (void *&next_entry,
-                                                     const char *&name)
+                                                 char *&name)
 {
   ACE_TRACE ("ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::next");
 
   if (this->curr_ != 0)
     {
-      next_entry = ACE_POINTER_CAST (this->curr_->pointer_);
-      name = this->curr_->name ();
+      next_entry = this->curr_->pointer_;
+      name = this->curr_->name_;
       return 1;
     }
   else
@@ -700,7 +690,7 @@ ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::next (void *&next_entry)
 
   if (this->curr_ != 0)
     {
-      next_entry = ACE_POINTER_CAST (this->curr_->pointer_);
+      next_entry = this->curr_->pointer_;
       return 1;
     }
   else
@@ -720,14 +710,14 @@ ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::advance (void)
 {
   ACE_TRACE ("ACE_Malloc_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::advance");
 
-  this->curr_ = ACE_POINTER_CAST (this->curr_->next_);
+  this->curr_ = this->curr_->next_;
 
   if (this->name_ == 0)
     return this->curr_ != 0;
 
   while (this->curr_ != 0
-         && ACE_OS::strcmp (this->name_, this->curr_->name ()) != 0)
-    this->curr_ = ACE_POINTER_CAST (this->curr_->next_);
+         && ACE_OS::strcmp (this->name_, this->curr_->name_) != 0)
+    this->curr_ = this->curr_->next_;
 
   return this->curr_ != 0;
 }
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index 7fba59d0436..fcfbb414ce1 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -386,8 +386,7 @@ private:
   int open (void);
   // Initialize the Malloc pool.
 
-  int shared_bind (const char *name,
-                   void *pointer);
+  int shared_bind (const char *name, void *pointer);
   // Associate <name> with <pointer>.  Assumes that locks are held by
   // callers.
 
@@ -403,14 +402,14 @@ private:
   // Deallocate memory.  Assumes that locks are held by callers.
 
   ACE_Control_Block *cb_ptr_;
-  // Pointer to the control block that is stored in memory controlled
-  // by <MEMORY_POOL>.
+  // Pointer to the control block (stored in memory controlled by
+  // MEMORY_POOL).
 
   MEMORY_POOL memory_pool_;
-  // Pool of memory used by <ACE_Malloc> to manage its freestore.
+  // Pool of memory used by ACE_Malloc
 
   ACE_LOCK lock_;
-  // Lock that ensures mutual exclusion for the <MEMORY_POOL>.
+  // Local that ensures mutual exclusion.
 };
 
 template <ACE_MEM_POOL_1, class ACE_LOCK>
@@ -439,8 +438,7 @@ public:
   int done (void) const;
   // Returns 1 when all items have been seen, else 0.
 
-  int next (void *&next_entry, 
-            const char *&name);
+  int next (void *&next_entry, char *&name);
   // Pass back the next <entry> (and the <name> associated with it) in
   // the set that hasn't yet been visited.  Returns 0 when all items
   // have been seen, else 1.
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index 8f7e01fa33d..785c52b50d8 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -843,10 +843,9 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes,
       // want...
       this->base_addr_ = 
         ACE_OS::shmat (shmid,
-                       ACE_reinterpret_cast (char *,
-                                             this->base_addr_),
-                       0);
-      if (this->base_addr_ == ACE_reinterpret_cast (void *, -1))
+                       (char *) this->base_addr_, 0);
+
+      if (this->base_addr_ == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) %p, base_addr = %u\n",
                            "shmat",
@@ -861,10 +860,9 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes,
       // want...
       this->base_addr_ = 
         ACE_OS::shmat (shmid,
-                       ACE_reinterpret_cast (char *,
-                                             this->base_addr_),
-                       0);
-      if (this->base_addr_ == ACE_reinterpret_cast (char *, -1))
+                       (char *) this->base_addr_, 0);
+
+      if (this->base_addr_ == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) %p, base_addr = %u\n",
                            "shmat",
diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h
index b251e62cd0d..01328a6655b 100644
--- a/ace/Message_Queue.h
+++ b/ace/Message_Queue.h
@@ -133,9 +133,6 @@ private:
 // Include the templates here.
 #include "ace/Message_Queue_T.h"
 
-// This typedef is used to get around a compiler bug in g++/vxworks.
-typedef ACE_Message_Queue<ACE_SYNCH> ACE_DEFAULT_MESSAGE_QUEUE_TYPE;
-
 #if defined (VXWORKS)
 # include /**/ <msgQLib.h>
 
@@ -153,22 +150,22 @@ class ACE_Message_Queue_Vx : public ACE_Message_Queue<ACE_NULL_SYNCH>
   //
   //     NOTE: *Many* ACE_Message_Queue features are not supported with
   //     this specialization, including:
-  //     * The two size arguments to the constructor and <open> are
+  //     * The two size arguments to the constructor and open () are
   //       interpreted differently.  The first is interpreted as the
   //       maximum number of bytes in a message.  The second is
   //       interpreted as the maximum number of messages that can be
   //       queued.
-  //     * <dequeue_head> *requires* that the ACE_Message_Block
+  //     * dequeue_head () *requires* that the ACE_Message_Block
   //       pointer argument point to an ACE_Message_Block that was
   //       allocated by the caller.  It must be big enough to support
   //       the received message, without using continutation.  The
   //       pointer argument is not modified.
   //     * Message priority.  MSG_Q_FIFO is hard-coded.
   //     * enqueue method timeouts.
-  //     * <peek_dequeue_head>.
-  //     * <ACE_Message_Queue_Iterators>.
+  //     * peek_dequeue_head ().
+  //     * ACE_Message_Queue_Iterators.
   //     * The ability to change low and high water marks after creation.
-  //     * <Message_Block> chains.  The continuation field of <ACE_Message_Block>
+  //     * Message_Block chains.  The continuation field of ACE_Message_Block
   //     *   is ignored; only the first block of a fragment chain is
   //     *   recognized.
 public:
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index 46b14d8978e..e77eef128ba 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -705,53 +705,58 @@ ACE_Message_Queue<ACE_SYNCH_USE>::notify (void)
 }
 
 
-// = Initialization and termination methods.
+/////////////////////////////////////
+// class ACE_Dynamic_Message_Queue //
+/////////////////////////////////////
+
+  // = Initialization and termination methods.
 template <ACE_SYNCH_DECL>
-ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::ACE_Dynamic_Message_Queue (ACE_Dynamic_Message_Strategy & message_strategy,
-                                                                     size_t hwm,
-                                                                     size_t lwm,
-                                                                     ACE_Notification_Strategy *ns)
-  : ACE_Message_Queue<ACE_SYNCH_USE> (hwm, lwm, ns),
-    pending_head_ (0),
-    pending_tail_ (0),
-    late_head_ (0),
-    late_tail_ (0),
-    beyond_late_head_ (0),
-    beyond_late_tail_ (0),
-    message_strategy_ (message_strategy)
+ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::ACE_Dynamic_Message_Queue (
+                                                      ACE_Dynamic_Message_Strategy & message_strategy,
+                                                      size_t hwm,
+                                                      size_t lwm,
+                                                      ACE_Notification_Strategy *ns)
+  : ACE_Message_Queue<ACE_SYNCH_USE> (hwm, lwm, ns)
+  , pending_head_ (0)
+  , pending_tail_ (0)
+  , late_head_ (0)
+  , late_tail_ (0)
+  , beyond_late_head_ (0)
+  , beyond_late_tail_ (0)
+  , message_strategy_ (message_strategy)
 {
-  // Note, the ACE_Dynamic_Message_Queue assumes full responsibility
-  // for the passed ACE_Dynamic_Message_Strategy object, and deletes
-  // it in its own dtor
+  // note, the ACE_Dynamic_Message_Queue assumes full responsibility for the
+  // passed ACE_Dynamic_Message_Strategy object, and deletes it in its own dtor
 }
 
-// dtor: free message strategy and let base class dtor do the rest.
-
 template <ACE_SYNCH_DECL>
 ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::~ACE_Dynamic_Message_Queue (void)
 {
-  delete &this->message_strategy_;
+  delete &(this->message_strategy_);
 }
+// dtor: free message strategy and let base class dtor do the rest
 
 template <ACE_SYNCH_DECL> int
 ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&list_head,
                                                            ACE_Message_Block *&list_tail,
                                                            u_int status_flags)
 {
+  int result = 0;
+
   // start with an empty list
   list_head = 0;
   list_tail = 0;
 
-  // Get the current time
+
+  // get the current time
   ACE_Time_Value current_time = ACE_OS::gettimeofday ();
 
-  // Refresh priority status boundaries in the queue.
-  int result = this->refresh_queue (current_time);
+  // refresh priority status boundaries in the queue
+  result = this->refresh_queue (current_time);
   if (result < 0)
     return result;
 
-  if (ACE_BIT_ENABLED (status_flags,
-                       (u_int) ACE_Dynamic_Message_Strategy::PENDING)
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::PENDING)
       && this->pending_head_
       && this->pending_tail_)
     {
@@ -778,8 +783,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l
       this->pending_tail_ = 0;
     }
 
-  if (ACE_BIT_ENABLED (status_flags,
-                       (u_int) ACE_Dynamic_Message_Strategy::LATE)
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::LATE)
       && this->late_head_
       && this->late_tail_)
     {
@@ -809,8 +813,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l
       this->late_tail_ = 0;
     }
 
-  if (ACE_BIT_ENABLED (status_flags,
-      (u_int) ACE_Dynamic_Message_Strategy::BEYOND_LATE)
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::BEYOND_LATE)
       && this->beyond_late_head_
       && this->beyond_late_tail_)
     {
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index bbf0a4cd182..90484d98a28 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -106,13 +106,10 @@ public:
 
   virtual int peek_dequeue_head (ACE_Message_Block *&first_item,
                                  ACE_Time_Value *timeout = 0);
-  // Retrieve the first <ACE_Message_Block> without removing it.  Note
-  // that <timeout> uses <{absolute}> time rather than <{relative}>
-  // time.  If the <timeout> elapses without receiving a message -1 is
-  // returned and <errno> is set to <EWOULDBLOCK>.  If the queue is
-  // deactivated -1 is returned and <errno> is set to <ESHUTDOWN>.
-  // Otherwise, returns -1 on failure, else the number of items still
-  // on the queue.
+  // Retrieve the first <ACE_Message_Block> without removing it.
+  // Returns -1 on failure, else the number of items still on the
+  // queue.  Note that <timeout> uses <{absolute}> time rather than
+  // <{relative}> time.
 
   virtual int enqueue_prio (ACE_Message_Block *new_item,
                             ACE_Time_Value *timeout = 0);
@@ -120,11 +117,8 @@ public:
   // accordance with its <msg_priority> (0 is lowest priority).  FIFO
   // order is maintained when messages of the same priority are
   // inserted consecutively.  Note that <timeout> uses <{absolute}>
-  // time rather than <{relative}> time.  If the <timeout> elapses
-  // without receiving a message -1 is returned and <errno> is set to
-  // <EWOULDBLOCK>.  If the queue is deactivated -1 is returned and
-  // <errno> is set to <ESHUTDOWN>.  Otherwise, returns -1 on failure,
-  // else the number of items still on the queue.
+  // time rather than <{relative}> time.  Returns -1 on failure, else
+  // the number of items still on the queue.
 
   virtual int enqueue (ACE_Message_Block *new_item,
                        ACE_Time_Value *timeout = 0);
@@ -137,35 +131,25 @@ public:
                             ACE_Time_Value *timeout = 0);
   // Enqueue an <ACE_Message_Block *> at the end of the queue.  Note
   // that <timeout> uses <{absolute}> time rather than <{relative}>
-  // time.  If the <timeout> elapses without receiving a message -1 is
-  // returned and <errno> is set to <EWOULDBLOCK>.  If the queue is
-  // deactivated -1 is returned and <errno> is set to <ESHUTDOWN>.
-  // Otherwise, returns -1 on failure, else the number of items still
-  // on the queue.
+  // time.  Returns -1 on failure, else the number of items still on
+  // the queue.
 
   virtual int enqueue_head (ACE_Message_Block *new_item,
                             ACE_Time_Value *timeout = 0);
   // Enqueue an <ACE_Message_Block *> at the head of the queue.  Note
   // that <timeout> uses <{absolute}> time rather than <{relative}>
-  // time.  If the <timeout> elapses without receiving a message -1 is
-  // returned and <errno> is set to <EWOULDBLOCK>.  If the queue is
-  // deactivated -1 is returned and <errno> is set to <ESHUTDOWN>.
-  // Otherwise, returns -1 on failure, else the number of items still
-  // on the queue.
+  // time.  Returns -1 on failure, else the number of items still on
+  // the queue.
 
   virtual int dequeue (ACE_Message_Block *&first_item,
                        ACE_Time_Value *timeout = 0);
-  // This method is an alias for the following <dequeue_head> method.
-
+  // This method is an alias for the following method:
   virtual int dequeue_head (ACE_Message_Block *&first_item,
                             ACE_Time_Value *timeout = 0);
   // Dequeue and return the <ACE_Message_Block *> at the head of the
   // queue.  Note that <timeout> uses <{absolute}> time rather than
-  // <{relative}> time.  If the <timeout> elapses without receiving a
-  // message -1 is returned and <errno> is set to <EWOULDBLOCK>.  If
-  // the queue is deactivated -1 is returned and <errno> is set to
-  // <ESHUTDOWN>.  Otherwise, returns -1 on failure, else the number
-  // of items still on the queue.
+  // <{relative}> time.  Returns -1 on failure, else the number of
+  // items still on the queue.
 
   // = Check if queue is full/empty.
   virtual int is_full (void);
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index d2d2e8f22eb..0d133a37ba4 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -637,7 +637,7 @@ ACE_Name_Options::parse_args (int argc, ASYS_TCHAR *argv[])
                          "\t[-p nameserver port]\n"
                          "\t[-s database name]\n"
                          "\t[-b base address]\n"
-                         "\t[-v] (verbose) \n"
+                         "\t[-v] (verbose) \n",
                          "\t[-r] (use Win32 Registry) \n",
                          argv[0]);
         /* NOTREACHED */
diff --git a/ace/OS.cpp b/ace/OS.cpp
index f1dd9c50071..d0a6c362715 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -346,6 +346,44 @@ ACE_Time_Value::normalize (void)
     }
 }
 
+int
+ACE_Countdown_Time::start (void)
+{
+  if (this->max_wait_time_ != 0)
+    {
+      this->start_time_ = ACE_OS::gettimeofday ();
+      this->stopped_ = 0;
+    }
+  return 0;
+}
+
+int
+ACE_Countdown_Time::update (void)
+{
+  return (this->stop () == 0) && this->start ();
+}
+
+int
+ACE_Countdown_Time::stop (void)
+{
+  if (this->max_wait_time_ != 0 && this->stopped_ == 0)
+    {
+      ACE_Time_Value elapsed_time =
+        ACE_OS::gettimeofday () - this->start_time_;
+
+      if (*this->max_wait_time_ > elapsed_time)
+        *this->max_wait_time_ -= elapsed_time;
+      else
+        {
+          // Used all of timeout.
+          *this->max_wait_time_ = ACE_Time_Value::zero;
+          // errno = ETIME;
+        }
+      this->stopped_ = 1;
+    }
+  return 0;
+}
+
 ACE_Countdown_Time::ACE_Countdown_Time (ACE_Time_Value *max_wait_time)
   : max_wait_time_ (max_wait_time),
     stopped_ (0)
@@ -1277,7 +1315,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
       int result = ::sched_setscheduler (0, // this process
                                          sched_params.policy (),
                                          &param) == -1 ? -1 : 0;
-#   if defined (DIGITAL_UNIX)
+#   if defined DIGITAL_UNIX
         return result == 0
           ? // Use priocntl (2) to set the process in the RT class,
             // if using an RT policy.
@@ -2010,7 +2048,7 @@ ACE_TSS_Emulation_cleanup (void *ptr)
 }
 
 void **
-ACE_TSS_Emulation::tss_base (void* ts_storage[], u_int *ts_created)
+ACE_TSS_Emulation::tss_base (void* ts_storage[])
 {
   // TSS Singleton implementation.
 
@@ -2025,9 +2063,9 @@ ACE_TSS_Emulation::tss_base (void* ts_storage[], u_int *ts_created)
           ACE_NO_HEAP_CHECK;
           if (ACE_OS::thr_keycreate (&native_tss_key_,
                                      &ACE_TSS_Emulation_cleanup) != 0)
-            {
+           {
               return 0; // Major problems, this should *never* happen!
-            }
+           }
           key_created_ = 1;
         }
     }
@@ -2044,86 +2082,42 @@ ACE_TSS_Emulation::tss_base (void* ts_storage[], u_int *ts_created)
   // at least on Pthreads Draft 4 platforms.
   if (old_ts_storage == 0)
     {
-      if (ts_created)
-        *ts_created = 1u;
-
       // Use the ts_storage passed as argument, if non-zero.  It is
       // possible that this has been implemented in the stack. At the
       // moment, this is unknown.  The cleanup must not do nothing.
       // If ts_storage is zero, allocate (and eventually leak) the
       // storage array.
       if (ts_storage == 0)
-        {
-          ACE_NO_HEAP_CHECK;
+      {
+        ACE_NO_HEAP_CHECK;
 
-          ACE_NEW_RETURN (ts_storage,
-                          void*[ACE_TSS_THREAD_KEYS_MAX],
-                          0);
+        ACE_NEW_RETURN (ts_storage,
+                        void*[ACE_TSS_THREAD_KEYS_MAX],
+                        0);
 
-          // Zero the entire TSS array.  Do it manually instead of
-          // using memset, for optimum speed.  Though, memset may be
-          // faster :-)
-          void **tss_base_p = ts_storage;
+        // Zero the entire TSS array.  Do it manually instead of using
+        // memset, for optimum speed.  Though, memset may be faster
+        // :-)
+        void **tss_base_p = ts_storage;
 
-          for (u_int i = 0;
-               i < ACE_TSS_THREAD_KEYS_MAX;
-               ++i)
-            *tss_base_p++ = 0;
-        }
+        for (u_int i = 0;
+             i < ACE_TSS_THREAD_KEYS_MAX;
+             ++i)
+          *tss_base_p++ = 0;
+      }
 
-       // Store the pointer in thread-specific storage.  It gets
-       // deleted via the ACE_TSS_Emulation_cleanup function when the
-       // thread terminates.
-       if (ACE_OS::thr_setspecific (native_tss_key_,
-                                    (void *) ts_storage) != 0)
+     // Store the pointer in thread-specific storage.  It gets deleted
+     // via the ACE_TSS_Emulation_cleanup function when the thread
+     // terminates.
+     if (ACE_OS::thr_setspecific (native_tss_key_,
+                                 (void *) ts_storage) != 0)
           return 0; // Major problems, this should *never* happen!
     }
-  else
-    if (ts_created)
-      ts_created = 0;
 
-  return ts_storage  ?  ts_storage  :  old_ts_storage;
+  return old_ts_storage;
 }
 #endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
-u_int
-ACE_TSS_Emulation::total_keys ()
-{
-  ACE_OS_Recursive_Thread_Mutex_Guard (
-    *ACE_static_cast (ACE_recursive_thread_mutex_t *,
-                      ACE_OS_Object_Manager::preallocated_object[
-                        ACE_OS_Object_Manager::ACE_TSS_KEY_LOCK]));
-
-  return total_keys_;
-}
-
-int
-ACE_TSS_Emulation::next_key (ACE_thread_key_t &key)
-{
-  ACE_OS_Recursive_Thread_Mutex_Guard (
-    *ACE_static_cast (ACE_recursive_thread_mutex_t *,
-                      ACE_OS_Object_Manager::preallocated_object[
-                        ACE_OS_Object_Manager::ACE_TSS_KEY_LOCK]));
-
-  if (total_keys_ < ACE_TSS_THREAD_KEYS_MAX)
-    {
-# if defined (ACE_HAS_NONSCALAR_THREAD_KEY_T)
-      ACE_OS::memset (&key, 0, sizeof (ACE_thread_key_t));
-      ACE_OS::memcpy (&key, &total_keys_, sizeof (u_int));
-# else
-      key = total_keys_;
-# endif /* ACE_HAS_NONSCALAR_THREAD_KEY_T */
-
-      ++total_keys_;
-      return 0;
-    }
-  else
-    {
-      key = ACE_OS::NULL_key;
-      return -1;
-    }
-}
-
 void *
 ACE_TSS_Emulation::tss_open (void *ts_storage[ACE_TSS_THREAD_KEYS_MAX])
 {
@@ -2137,9 +2131,9 @@ ACE_TSS_Emulation::tss_open (void *ts_storage[ACE_TSS_THREAD_KEYS_MAX])
   // Zero the entire TSS array.
   void **tss_base_p = ts_storage;
   for (u_int i = 0; i < ACE_TSS_THREAD_KEYS_MAX; ++i, ++tss_base_p)
-    {
-      *tss_base_p = 0;
-    }
+  {
+    *tss_base_p = 0;
+  }
 
   return (void *) tss_base;
 #   else  /* ! ACE_PSOS */
@@ -2149,9 +2143,7 @@ ACE_TSS_Emulation::tss_open (void *ts_storage[ACE_TSS_THREAD_KEYS_MAX])
         // directly by the shell (without spawning a new task) after
         // another program has been run.
 
-  u_int ts_created = 0;
-  tss_base (ts_storage, &ts_created);
-  if (ts_created)
+  if (tss_base (ts_storage) == 0)
     {
 #     else  /* ! ACE_HAS_THREAD_SPECIFIC_STORAGE */
       tss_base () = ts_storage;
@@ -3798,8 +3790,8 @@ ACE_OS::thr_key_detach (void *inst)
 
 void
 ACE_OS::unique_name (const void *object,
-                     LPTSTR name,
-                     size_t length)
+                  LPTSTR name,
+                  size_t length)
 {
   // The process ID will provide uniqueness between processes on the
   // same machine. The "this" pointer of the <object> will provide
@@ -3809,7 +3801,7 @@ ACE_OS::unique_name (const void *object,
   TCHAR temp_name[ACE_UNIQUE_NAME_LEN];
   ACE_OS::sprintf (temp_name,
                    ACE_TEXT ("%x%d"),
-                   ACE_reinterpret_cast (ptr_arith_t, object),
+                   object,
                    ACE_OS::getpid ());
   ACE_OS::strncpy (name,
                    temp_name,
@@ -4469,7 +4461,7 @@ spa (FUNCPTR entry, ...)
   const int ret = ::taskSpawn (argv[0],    // task name
                                100,        // task priority
                                VX_FP_TASK, // task options
-                               ACE_NEEDS_HUGE_THREAD_STACKSIZE, // stack size
+                               1000000,    // stack size
                                entry,      // entry point
                                argc,       // first argument to main ()
                                (int) argv, // second argument to main ()
@@ -5195,16 +5187,14 @@ ACE_OS::difftime (time_t t1, time_t t0)
 # endif /* ACE_LACKS_DIFFTIME */
 
 # if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
+#   if defined (ACE_HAS_WINCE)
 wchar_t *
 ACE_OS::ctime (const time_t *t)
 {
-#if defined (ACE_HAS_WINCE)
   wchar_t buf[26];              // 26 is a "magic number" ;)
   return ACE_OS::ctime_r (t, buf, 26);
-#else
-  ACE_OSCALL_RETURN (::_wctime (t), wchar_t *, 0);
-#endif /* ACE_HAS_WINCE */
 }
+#   endif /* ACE_HAS_WINCE */
 
 wchar_t *
 ACE_OS::ctime_r (const time_t *clock,
@@ -6335,43 +6325,31 @@ ACE_OS_Object_Manager::init (void)
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
           ACE_OS_PREALLOCATE_OBJECT (ACE_thread_mutex_t, ACE_OS_MONITOR_LOCK)
           if (ACE_OS::thread_mutex_init (ACE_reinterpret_cast (
-            ACE_thread_mutex_t *,
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_OS_MONITOR_LOCK])) != 0)
+        ACE_thread_mutex_t *,
+        ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0)
             ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::init, ACE_OS_MONITOR_LOCK")));
+                        ASYS_TEXT("%p\n"),
+                        ASYS_TEXT("ACE_OS_Object_Manager::init (1)")));
           ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t,
                                      ACE_TSS_CLEANUP_LOCK)
           if (ACE_OS::recursive_mutex_init (ACE_reinterpret_cast (
-            ACE_recursive_thread_mutex_t *,
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_TSS_CLEANUP_LOCK])) != 0)
+        ACE_recursive_thread_mutex_t *,
+        ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) !=
+        0)
             ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::init, ACE_TSS_CLEANUP_LOCK")));
-#   if defined (ACE_HAS_TSS_EMULATION)
-          ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t,
-                                     ACE_TSS_KEY_LOCK)
-          if (ACE_OS::recursive_mutex_init (ACE_reinterpret_cast (
-            ACE_recursive_thread_mutex_t *,
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_TSS_KEY_LOCK])) != 0)
-            ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::init, ACE_TSS_KEY_LOCK")));
-#     if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+                        ASYS_TEXT("%p\n"),
+                        ASYS_TEXT("ACE_OS_Object_Manager::init (2)")));
+#   if defined (ACE_HAS_TSS_EMULATION) && \
+       defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
           ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t,
                                      ACE_TSS_BASE_LOCK)
           if (ACE_OS::recursive_mutex_init (ACE_reinterpret_cast (
-            ACE_recursive_thread_mutex_t *,
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_TSS_BASE_LOCK])) != 0)
+          ACE_recursive_thread_mutex_t *,
+          ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0)
             ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::init, ACE_TSS_BASE_LOCK")));
-#     endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
-#   endif /* ACE_HAS_TSS_EMULATION */
+                        ASYS_TEXT("%p\n"),
+                        ASYS_TEXT("ACE_OS_Object_Manager::init (3)")));
+#   endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
 # endif /* ACE_MT_SAFE */
 
           // Open Winsock (no-op on other platforms).
@@ -6435,8 +6413,8 @@ ACE_OS_Object_Manager::fini (void)
         ACE_thread_mutex_t *,
         ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0)
           ACE_ERROR ((LM_ERROR,
-            ASYS_TEXT("%p\n"),
-            ASYS_TEXT("ACE_OS_Object_Manager::fini, ACE_OS_MONITOR_LOCK")));
+                      ASYS_TEXT("%p\n"),
+                      ASYS_TEXT("ACE_OS_Object_Manager::fini (1)")));
 #   endif /* ! __Lynx__ */
       ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_thread_mutex_t,
                                          ACE_OS_MONITOR_LOCK)
@@ -6446,39 +6424,25 @@ ACE_OS_Object_Manager::fini (void)
        ACE_recursive_thread_mutex_t *,
        ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0)
           ACE_ERROR ((LM_ERROR,
-            ASYS_TEXT("%p\n"),
-            ASYS_TEXT("ACE_OS_Object_Manager::fini, ACE_TSS_CLEANUP_LOCK")));
+                      ASYS_TEXT("%p\n"),
+                      ASYS_TEXT("ACE_OS_Object_Manager::fini (2)")));
 #   endif /* ! __Lynx__ */
       ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t,
                                          ACE_TSS_CLEANUP_LOCK)
-#   if defined (ACE_HAS_TSS_EMULATION)
-#     if !defined (__Lynx__)
-        // LynxOS 3.0.0 has problems with this after fork.
-        if (ACE_OS::recursive_mutex_destroy (ACE_reinterpret_cast (
-          ACE_recursive_thread_mutex_t *,
-          ACE_OS_Object_Manager::preallocated_object[
-            ACE_TSS_KEY_LOCK])) != 0)
+#   if defined (ACE_HAS_TSS_EMULATION) && \
+       defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+#   if !defined (__Lynx__)
+      // LynxOS 3.0.0 has problems with this after fork.
+      if (ACE_OS::recursive_mutex_destroy (ACE_reinterpret_cast (
+        ACE_recursive_thread_mutex_t *,
+        ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0)
           ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::fini, ACE_TSS_KEY_LOCK")));
-#     endif /* ! __Lynx__ */
-      ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t,
-                                         ACE_TSS_KEY_LOCK)
-#     if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
-#       if !defined (__Lynx__)
-          // LynxOS 3.0.0 has problems with this after fork.
-          if (ACE_OS::recursive_mutex_destroy (ACE_reinterpret_cast (
-            ACE_recursive_thread_mutex_t *,
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_TSS_BASE_LOCK])) != 0)
-            ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT("%p\n"),
-              ASYS_TEXT("ACE_OS_Object_Manager::fini, ACE_TSS_BASE_LOCK")));
-#       endif /* ! __Lynx__ */
+                      ASYS_TEXT("%p\n"),
+                      ASYS_TEXT("ACE_OS_Object_Manager::fini (3)")));
+#   endif /* ! __Lynx__ */
       ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t,
                                          ACE_TSS_BASE_LOCK)
-#     endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
-#   endif /* ACE_HAS_TSS_EMULATION */
+#   endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
 # endif /* ACE_MT_SAFE */
 #endif /* ! ACE_HAS_STATIC_PREALLOCATION */
     }
diff --git a/ace/OS.h b/ace/OS.h
index 1a116d4ee98..18bc743262a 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -30,28 +30,6 @@
 #define ACE_MALLOC_ALIGN ((int) sizeof (long))
 #endif /* ACE_MALLOC_ALIGN */
 
-// States of a recyclable object.
-enum ACE_Recyclable_State
-{
-  ACE_RECYCLABLE_IDLE_AND_PURGABLE,
-  // Idle and can be purged.
-
-  ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE,
-  // Idle but cannot be purged.
-
-  ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE,
-  // Can be purged, but is not idle (mostly for debugging).
-
-  ACE_RECYCLABLE_BUSY = 2,
-  // Busy (i.e., cannot be recycled or purged).
-
-  ACE_RECYCLABLE_CLOSED = 3,
-  // Closed.
-
-  ACE_RECYCLABLE_UNKNOWN = 4
-  // Unknown state.
-};
-
 // Do not change these values wantonly since GPERF depends on them..
 #define ACE_ASCII_SIZE 128
 #define ACE_EBCDIC_SIZE 256
@@ -84,111 +62,40 @@ enum ACE_Recyclable_State
 # endif /* defined (ACE_LACKS_INLINE_FUNCTIONS) && !defined (ACE_NO_INLINE) */
 
 # if defined (ACE_HAS_ANSI_CASTS)
-
 #   define ACE_sap_any_cast(TYPE)                                      reinterpret_cast<TYPE> (const_cast<ACE_Addr &> (ACE_Addr::sap_any))
-
 #   define ACE_static_cast(TYPE, EXPR)                                 static_cast<TYPE> (EXPR)
-#   define ACE_static_cast_1_ptr(TYPE, T1, EXPR)                       static_cast<TYPE<T1> *> (EXPR)
-#   define ACE_static_cast_2_ptr(TYPE, T1, T2, EXPR)                   static_cast<TYPE<T1, T2> *> (EXPR)
-#   define ACE_static_cast_3_ptr(TYPE, T1, T2, T3, EXPR)               static_cast<TYPE<T1, T2, T3> *> (EXPR)
-#   define ACE_static_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)           static_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-#   define ACE_static_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)       static_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-#   define ACE_static_cast_1_ref(TYPE, T1, EXPR)                       static_cast<TYPE<T1> &> (EXPR)
-#   define ACE_static_cast_2_ref(TYPE, T1, T2, EXPR)                   static_cast<TYPE<T1, T2> &> (EXPR)
-#   define ACE_static_cast_3_ref(TYPE, T1, T2, T3, EXPR)               static_cast<TYPE<T1, T2, T3> &> (EXPR)
-#   define ACE_static_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)           static_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-#   define ACE_static_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)       static_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
-
 #   define ACE_const_cast(TYPE, EXPR)                                  const_cast<TYPE> (EXPR)
-#   define ACE_const_cast_1_ptr(TYPE, T1, EXPR)                        const_cast<TYPE<T1> *> (EXPR)
-#   define ACE_const_cast_2_ptr(TYPE, T1, T2, EXPR)                    const_cast<TYPE<T1, T2> *> (EXPR)
-#   define ACE_const_cast_3_ptr(TYPE, T1, T2, T3, EXPR)                const_cast<TYPE<T1, T2, T3> *> (EXPR)
-#   define ACE_const_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)            const_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-#   define ACE_const_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)        const_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-#   define ACE_const_cast_1_ref(TYPE, T1, EXPR)                        const_cast<TYPE<T1> &> (EXPR)
-#   define ACE_const_cast_2_ref(TYPE, T1, T2, EXPR)                    const_cast<TYPE<T1, T2> &> (EXPR)
-#   define ACE_const_cast_3_ref(TYPE, T1, T2, T3, EXPR)                const_cast<TYPE<T1, T2, T3> &> (EXPR)
-#   define ACE_const_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)            const_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-#   define ACE_const_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)        const_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
-
 #   define ACE_reinterpret_cast(TYPE, EXPR)                            reinterpret_cast<TYPE> (EXPR)
-#   define ACE_reinterpret_cast_1_ptr(TYPE, T1, EXPR)                  reinterpret_cast<TYPE<T1> *> (EXPR)
-#   define ACE_reinterpret_cast_2_ptr(TYPE, T1, T2, EXPR)              reinterpret_cast<TYPE<T1, T2> *> (EXPR)
-#   define ACE_reinterpret_cast_3_ptr(TYPE, T1, T2, T3, EXPR)          reinterpret_cast<TYPE<T1, T2, T3> *> (EXPR)
-#   define ACE_reinterpret_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)      reinterpret_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-#   define ACE_reinterpret_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)  reinterpret_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-#   define ACE_reinterpret_cast_1_ref(TYPE, T1, EXPR)                  reinterpret_cast<TYPE<T1> &> (EXPR)
-#   define ACE_reinterpret_cast_2_ref(TYPE, T1, T2, EXPR)              reinterpret_cast<TYPE<T1, T2> &> (EXPR)
-#   define ACE_reinterpret_cast_3_ref(TYPE, T1, T2, T3, EXPR)          reinterpret_cast<TYPE<T1, T2, T3> &> (EXPR)
-#   define ACE_reinterpret_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)      reinterpret_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-#   define ACE_reinterpret_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)  reinterpret_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
-
 #   if defined (ACE_LACKS_RTTI)
-#     define ACE_dynamic_cast(TYPE, EXPR)                              static_cast<TYPE> (EXPR)
-#     define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                    static_cast<TYPE<T1> *> (EXPR)
-#     define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                static_cast<TYPE<T1, T2> *> (EXPR)
-#     define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)            static_cast<TYPE<T1, T2, T3> *> (EXPR)
-#     define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)        static_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-#     define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)    static_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-#     define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR)                    static_cast<TYPE<T1> &> (EXPR)
-#     define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR)                static_cast<TYPE<T1, T2> &> (EXPR)
-#     define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)            static_cast<TYPE<T1, T2, T3> &> (EXPR)
-#     define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)        static_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-#     define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)    static_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
+#     define ACE_dynamic_cast(TYPE, EXPR)                              static_cast< TYPE > (EXPR)
+#     define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                    static_cast< TYPE<T1> *> (EXPR)
+#     define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                static_cast< TYPE<T1, T2> *> (EXPR)
+#     define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)            static_cast< TYPE<T1, T2, T3> *> (EXPR)
+#     define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)        static_cast< TYPE<T1, T2, T3, T4> *> (EXPR)
+#     define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)    static_cast< TYPE<T1, T2, T3, T4, T5> *> (EXPR)
+#     define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR)                    static_cast< TYPE<T1> &> (EXPR)
+#     define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR)                static_cast< TYPE<T1, T2> &> (EXPR)
+#     define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)            static_cast< TYPE<T1, T2, T3> &> (EXPR)
+#     define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)        static_cast< TYPE<T1, T2, T3, T4> &> (EXPR)
+#     define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)    static_cast< TYPE<T1, T2, T3, T4, T5> &> (EXPR)
 #   else  /* ! ACE_LACKS_RTTI */
-#     define ACE_dynamic_cast(TYPE, EXPR)                              dynamic_cast<TYPE> (EXPR)
-#     define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                    dynamic_cast<TYPE<T1> *> (EXPR)
-#     define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                dynamic_cast<TYPE<T1, T2> *> (EXPR)
-#     define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)            dynamic_cast<TYPE<T1, T2, T3> *> (EXPR)
-#     define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)        dynamic_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-#     define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)    dynamic_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-#     define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR)                    dynamic_cast<TYPE<T1> &> (EXPR)
-#     define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR)                dynamic_cast<TYPE<T1, T2> &> (EXPR)
-#     define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)            dynamic_cast<TYPE<T1, T2, T3> &> (EXPR)
-#     define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)        dynamic_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-#     define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)    dynamic_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
+#     define ACE_dynamic_cast(TYPE, EXPR)                              dynamic_cast< TYPE > (EXPR)
+#     define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                    dynamic_cast< TYPE<T1> *> (EXPR)
+#     define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                dynamic_cast< TYPE<T1, T2> *> (EXPR)
+#     define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)            dynamic_cast< TYPE<T1, T2, T3> *> (EXPR)
+#     define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)        dynamic_cast< TYPE<T1, T2, T3, T4> *> (EXPR)
+#     define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)    dynamic_cast< TYPE<T1, T2, T3, T4, T5> *> (EXPR)
+#     define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR)                    dynamic_cast< TYPE<T1> &> (EXPR)
+#     define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR)                dynamic_cast< TYPE<T1, T2> &> (EXPR)
+#     define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)            dynamic_cast< TYPE<T1, T2, T3> &> (EXPR)
+#     define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)        dynamic_cast< TYPE<T1, T2, T3, T4> &> (EXPR)
+#     define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)    dynamic_cast< TYPE<T1, T2, T3, T4, T5> &> (EXPR)
 #   endif /* ! ACE_LACKS_RTTI */
-
 # else
-
 #   define ACE_sap_any_cast(TYPE)                                      ((TYPE) (ACE_Addr::sap_any))
-
 #   define ACE_static_cast(TYPE, EXPR)                                 ((TYPE) (EXPR))
-#   define ACE_static_cast_1_ptr(TYPE, T1, EXPR)                       ((TYPE<T1> *) (EXPR))
-#   define ACE_static_cast_2_ptr(TYPE, T1, T2, EXPR)                   ((TYPE<T1, T2> *) (EXPR))
-#   define ACE_static_cast_3_ptr(TYPE, T1, T2, T3, EXPR)               ((TYPE<T1, T2, T3> *) (EXPR))
-#   define ACE_static_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)           ((TYPE<T1, T2, T3, T4> *) (EXPR))
-#   define ACE_static_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)       ((TYPE<T1, T2, T3, T4, T5> *) (EXPR))
-#   define ACE_static_cast_1_ref(TYPE, T1, EXPR)                       ((TYPE<T1> &) (EXPR))
-#   define ACE_static_cast_2_ref(TYPE, T1, T2, EXPR)                   ((TYPE<T1, T2> &) (EXPR))
-#   define ACE_static_cast_3_ref(TYPE, T1, T2, T3, EXPR)               ((TYPE<T1, T2, T3> &) (EXPR))
-#   define ACE_static_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)           ((TYPE<T1, T2, T3, T4> &) (EXPR))
-#   define ACE_static_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)       ((TYPE<T1, T2, T3, T4, T5> &) (EXPR))
-
 #   define ACE_const_cast(TYPE, EXPR)                                  ((TYPE) (EXPR))
-#   define ACE_const_cast_1_ptr(TYPE, T1, EXPR)                        ((TYPE<T1> *) (EXPR))
-#   define ACE_const_cast_2_ptr(TYPE, T1, T2, EXPR)                    ((TYPE<T1, T2> *) (EXPR))
-#   define ACE_const_cast_3_ptr(TYPE, T1, T2, T3, EXPR)                ((TYPE<T1, T2, T3> *) (EXPR))
-#   define ACE_const_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)            ((TYPE<T1, T2, T3, T4> *) (EXPR))
-#   define ACE_const_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)        ((TYPE<T1, T2, T3, T4, T5> *) (EXPR))
-#   define ACE_const_cast_1_ref(TYPE, T1, EXPR)                        ((TYPE<T1> &) (EXPR))
-#   define ACE_const_cast_2_ref(TYPE, T1, T2, EXPR)                    ((TYPE<T1, T2> &) (EXPR))
-#   define ACE_const_cast_3_ref(TYPE, T1, T2, T3, EXPR)                ((TYPE<T1, T2, T3> &) (EXPR))
-#   define ACE_const_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)            ((TYPE<T1, T2, T3, T4> &) (EXPR))
-#   define ACE_const_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)        ((TYPE<T1, T2, T3, T4, T5> &) (EXPR))
-
 #   define ACE_reinterpret_cast(TYPE, EXPR)                            ((TYPE) (EXPR))
-#   define ACE_reinterpret_cast_1_ptr(TYPE, T1, EXPR)                  ((TYPE<T1> *) (EXPR))
-#   define ACE_reinterpret_cast_2_ptr(TYPE, T1, T2, EXPR)              ((TYPE<T1, T2> *) (EXPR))
-#   define ACE_reinterpret_cast_3_ptr(TYPE, T1, T2, T3, EXPR)          ((TYPE<T1, T2, T3> *) (EXPR))
-#   define ACE_reinterpret_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)      ((TYPE<T1, T2, T3, T4> *) (EXPR))
-#   define ACE_reinterpret_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)  ((TYPE<T1, T2, T3, T4, T5> *) (EXPR))
-#   define ACE_reinterpret_cast_1_ref(TYPE, T1, EXPR)                  ((TYPE<T1> &) (EXPR))
-#   define ACE_reinterpret_cast_2_ref(TYPE, T1, T2, EXPR)              ((TYPE<T1, T2> &) (EXPR))
-#   define ACE_reinterpret_cast_3_ref(TYPE, T1, T2, T3, EXPR)          ((TYPE<T1, T2, T3> &) (EXPR))
-#   define ACE_reinterpret_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)      ((TYPE<T1, T2, T3, T4> &) (EXPR))
-#   define ACE_reinterpret_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)  ((TYPE<T1, T2, T3, T4, T5> &) (EXPR))
-
 #   define ACE_dynamic_cast(TYPE, EXPR)                                ((TYPE) (EXPR))
 #   define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                      ((TYPE<T1> *) (EXPR))
 #   define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                  ((TYPE<T1, T2> *) (EXPR))
@@ -2054,13 +1961,13 @@ struct stat
 #       define ACE_THR_PRI_OTHER_MAX ACE_PROC_PRI_OTHER_MAX
 #     endif
 #     if !defined(ACE_THR_PRI_FIFO_DEF)
-#       define ACE_THR_PRI_FIFO_DEF  ((ACE_THR_PRI_FIFO_MIN + ACE_THR_PRI_FIFO_MAX)/2)
+#       define ACE_THR_PRI_FIFO_DEF  (ACE_THR_PRI_FIFO_MIN + (ACE_THR_PRI_FIFO_MAX - ACE_THR_PRI_FIFO_MIN)/2)
 #     endif
 #     if !defined(ACE_THR_PRI_RR_DEF)
-#       define ACE_THR_PRI_RR_DEF ((ACE_THR_PRI_RR_MIN + ACE_THR_PRI_RR_MAX)/2)
+#       define ACE_THR_PRI_RR_DEF (ACE_THR_PRI_RR_MIN + (ACE_THR_PRI_RR_MAX - ACE_THR_PRI_RR_MIN)/2)
 #     endif
 #     if !defined(ACE_THR_PRI_OTHER_DEF)
-#       define ACE_THR_PRI_OTHER_DEF ((ACE_THR_PRI_OTHER_MIN + ACE_THR_PRI_OTHER_MAX)/2)
+#       define ACE_THR_PRI_OTHER_DEF (ACE_THR_PRI_OTHER_MIN + (ACE_THR_PRI_OTHER_MAX - ACE_THR_PRI_OTHER_MIN)/2)
 #     endif
 
       // Typedefs to help compatibility with Windows NT and Pthreads.
@@ -2777,14 +2684,14 @@ typedef unsigned int size_t;
 
 // Define some helpful constants.
 // Not type-safe, and signed.  For backward compatibility.
-#define ACE_ONE_SECOND_IN_MSECS 1000L
-#define ACE_ONE_SECOND_IN_USECS 1000000L
-#define ACE_ONE_SECOND_IN_NSECS 1000000000L
+#define ACE_ONE_SECOND_IN_MSECS 1000l
+#define ACE_ONE_SECOND_IN_USECS 1000000l
+#define ACE_ONE_SECOND_IN_NSECS 1000000000l
 
 // Type-safe, and unsigned.
-static const ACE_UINT32 ACE_U_ONE_SECOND_IN_MSECS = 1000U;
-static const ACE_UINT32 ACE_U_ONE_SECOND_IN_USECS = 1000000U;
-static const ACE_UINT32 ACE_U_ONE_SECOND_IN_NSECS = 1000000000U;
+static const ACE_UINT32 ACE_U_ONE_SECOND_IN_MSECS = 1000u;
+static const ACE_UINT32 ACE_U_ONE_SECOND_IN_USECS = 1000000u;
+static const ACE_UINT32 ACE_U_ONE_SECOND_IN_NSECS = 1000000000u;
 
 # if defined (ACE_HAS_SIG_MACROS)
 #   undef sigemptyset
@@ -3702,12 +3609,11 @@ extern int t_errno;
   // trouble when introducing member functions with the same name.
   // Thanks to Thilo Kielmann" <kielmann@informatik.uni-siegen.de> for
   // this fix.
+#     undef sigwait
 #     if defined  (__DECCXX_VER)
-#       undef sigwait
-        // cxx on Digital Unix 4.0 needs this declaration.  With it,
-        // ::_Psigwait () works with cxx -pthread.  g++ does _not_
-        // need it.
-        extern "C" int _Psigwait __((const sigset_t *set, int *sig));
+    // cxx on Digital Unix 4.0 needs this declaration.  With it,
+    // ::_Psigwait () works with cxx -pthread.  g++ does _not_ need it.
+    extern "C" int _Psigwait __((const sigset_t *set, int *sig));
 #     endif /* __DECCXX_VER */
 #   elif !defined (ACE_HAS_SIGWAIT)
   extern "C" int sigwait (sigset_t *set);
@@ -4193,10 +4099,6 @@ struct sigaction
 #   define ENOSYS EFAULT /* Operation not supported or unknown error. */
 # endif /* !ENOSYS */
 
-# if !defined (ENFILE)
-#   define ENFILE EMFILE /* No more socket descriptors are available. */
-# endif /* !ENOSYS */
-
 # if !defined (ENOTSUP)
 #   define ENOTSUP ENOSYS  /* Operation not supported. */
 # endif /* !ENOTSUP */
@@ -4981,10 +4883,9 @@ public:
   void ttl (int t);
 };
 
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-class ACE_Export ACE_QoS : public QOS
-#else
 class ACE_Export ACE_QoS
+#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+  : public QOS
 #endif /* ACE_HAS_WINSOCK2 */
 {
   // = TITLE
@@ -5011,10 +4912,10 @@ class ACE_Export ACE_QoS_Params
   //   enabled <ACE_OS::connect> and <ACE_OS::join_leaf> methods.
 public:
   ACE_QoS_Params (iovec *caller_data = 0,
-                  iovec *callee_data = 0,
-                  ACE_QoS *socket_qos = 0,
-                  ACE_QoS *group_socket_qos = 0,
-                  u_long flags = 0);
+                          iovec *callee_data = 0,
+                          ACE_QoS *socket_qos = 0,
+                          ACE_QoS *group_socket_qos = 0,
+                          u_long flags = 0);
   // Initialize the data members.  The <caller_data> is a pointer to
   // the user data that is to be transferred to the peer during
   // connection establishment.  The <callee_data> is a pointer to the
@@ -6654,12 +6555,10 @@ public:
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
       ACE_OS_MONITOR_LOCK,
       ACE_TSS_CLEANUP_LOCK,
-#   if defined (ACE_HAS_TSS_EMULATION)
-      ACE_TSS_KEY_LOCK,
-#     if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+#   if defined (ACE_HAS_TSS_EMULATION) && \
+       defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
       ACE_TSS_BASE_LOCK,
-#     endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
-#   endif /* ACE_HAS_TSS_EMULATION */
+#   endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
 # else
       // Without ACE_MT_SAFE, There are no preallocated objects.  Make
       // sure that the preallocated_array size is at least one by
@@ -6820,14 +6719,9 @@ public:
   // Does _not_ check for a valid key.
 
   static void *tss_open (void *ts_storage[ACE_TSS_THREAD_KEYS_MAX]);
-  // Setup an array to be used for local TSS.  Returns the array
-  // address on success.  Returns 0 if local TSS had already been
-  // setup for this thread.  There is no corresponding tss_close ()
-  // because it is not needed.
-  // NOTE: tss_open () is called by ACE for threads that it spawns.
-  // If your application spawns threads without using ACE, and it uses
-  // ACE's TSS emulation, each of those threads should call tss_open
-  // ().  See the ace_thread_adapter () implementaiton for an example.
+  // Setup an array to be used for local TSS.  Returns the array address on
+  // success.  Returns 0 if local TSS had already been setup for this thread.
+  // There is no corresponding tss_close () because it is not needed.
 
   static void tss_close ();
   // Shutdown TSS emulation.  For use only by ACE_OS::cleanup_tss ().
@@ -6842,7 +6736,7 @@ private:
   // key (that has one) when the thread exits.
 
 #   if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
-  static void **tss_base (void* ts_storage[] = 0, u_int *ts_created = 0);
+  static void **tss_base (void* ts_storage[] = 0);
   // Location of current thread's TSS array.
 #   else  /* ! ACE_HAS_THREAD_SPECIFIC_STORAGE */
   static void **&tss_base ();
@@ -7653,8 +7547,7 @@ private:
 #   define ACE_INLINE_FOR_GNUC
 # endif /* ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS */
 
-# if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE) \
-                         && ! defined (ACE_HAS_PHARLAP)
+# if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE)
 typedef TRANSMIT_FILE_BUFFERS ACE_TRANSMIT_FILE_BUFFERS;
 typedef LPTRANSMIT_FILE_BUFFERS ACE_LPTRANSMIT_FILE_BUFFERS;
 typedef PTRANSMIT_FILE_BUFFERS ACE_PTRANSMIT_FILE_BUFFERS;
diff --git a/ace/OS.i b/ace/OS.i
index b1876068615..37c397fba89 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -72,13 +72,6 @@ typedef char *ACE_MMAP_TYPE;
 # include /**/ <xliuser.h>
 #endif /* ACE_HAS_XLI */
 
-#if defined (_M_UNIX)
-extern "C" int _dlclose (void *);
-extern "C" char *_dlerror (void);
-extern "C" void *_dlopen (const char *, int);
-extern "C" void * _dlsym (void *, const char *);
-#endif /* _M_UNIX */
-
 #if !defined (ACE_HAS_CPLUSPLUS_HEADERS)
 # include /**/ <libc.h>
 # include /**/ <osfcn.h>
@@ -4582,10 +4575,10 @@ ACE_QoS::provider_specific (const iovec &ps)
 
 ACE_INLINE
 ACE_QoS_Params::ACE_QoS_Params (iovec *caller_data,
-                                iovec *callee_data,
-                                ACE_QoS *socket_qos,
-                                ACE_QoS *group_socket_qos,
-                                u_long flags)
+                                                iovec *callee_data,
+                                                ACE_QoS *socket_qos,
+                                                ACE_QoS *group_socket_qos,
+                                                u_long flags)
   : caller_data_ (caller_data),
     callee_data_ (callee_data),
     socket_qos_ (socket_qos),
@@ -4841,14 +4834,11 @@ ACE_OS::bind (ACE_HANDLE handle, struct sockaddr *addr, int addrlen)
 {
   ACE_TRACE ("ACE_OS::bind");
 #if defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC)
-  ACE_SOCKCALL_RETURN (::bind ((ACE_SOCKET) handle,
-                               (struct sockaddr_in *) addr,
+  ACE_SOCKCALL_RETURN (::bind ((ACE_SOCKET) handle,  (struct sockaddr_in *) addr,
                                (ACE_SOCKET_LEN) addrlen),
                        int, -1);
 #else /* !defined (ACE_PSOS) || defined (ACE_PSOS_DIAB_PPC) */
-  ACE_SOCKCALL_RETURN (::bind ((ACE_SOCKET) handle,
-                               addr,
-                               (ACE_SOCKET_LEN) addrlen), int, -1);
+  ACE_SOCKCALL_RETURN (::bind ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN) addrlen), int, -1);
 #endif /* defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC) */
 }
 
@@ -4859,14 +4849,11 @@ ACE_OS::connect (ACE_HANDLE handle,
 {
   ACE_TRACE ("ACE_OS::connect");
 #if defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC)
-  ACE_SOCKCALL_RETURN (::connect ((ACE_SOCKET) handle,
-                                  (struct sockaddr_in *) addr,
+  ACE_SOCKCALL_RETURN (::connect ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
                                   (ACE_SOCKET_LEN) addrlen),
                        int, -1);
 #else  /* !defined (ACE_PSOS) || defined (ACE_PSOS_DIAB_PPC) */
-  ACE_SOCKCALL_RETURN (::connect ((ACE_SOCKET) handle,
-                                  addr,
-                                  (ACE_SOCKET_LEN) addrlen), int, -1);
+  ACE_SOCKCALL_RETURN (::connect ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN) addrlen), int, -1);
 #endif /* defined (ACE_PSOS)  && !defined (ACE_PSOS_DIAB_PPC) */
 }
 
@@ -4926,7 +4913,9 @@ ACE_OS::gethostbyname2 (const char *name, int family)
 # else
   // IPv4-only implementation
   if (family == AF_INET)
-    return ACE_OS::gethostbyname (name);
+    {
+      return ACE_OS::gethostbyname (name);
+    }
 
   ACE_NOTSUP_RETURN (0);
 # endif /* ACE_PSOS */
@@ -5009,15 +4998,16 @@ ACE_OS::recv (ACE_HANDLE handle, char *buf, int len, int flags)
 {
   ACE_TRACE ("ACE_OS::recv");
 
-  // On UNIX, a non-blocking socket with no data to receive, this
-  // system call will return EWOULDBLOCK or EAGAIN, depending on the
-  // platform.  UNIX 98 allows either errno, and they may be the same
-  // numeric value.  So to make life easier for upper ACE layers as
-  // well as application programmers, always change EAGAIN to
-  // EWOULDBLOCK.  Rather than hack the ACE_OSCALL_RETURN macro, it's
-  // handled explicitly here.  If the ACE_OSCALL macro ever changes,
-  // this function needs to be reviewed.  On Win32, the regular macros
-  // can be used, as this is not an issue.
+
+  // On UNIX, a non-blocking socket with no data to receive, this system
+  // call will return EWOULDBLOCK or EAGAIN, depending on the platform.
+  // UNIX 98 allows either errno, and they may be the same numeric value.
+  // So to make life easier for upper ACE layers as well as application
+  // programmers, always change EAGAIN to EWOULDBLOCK.  Rather than hack the
+  // ACE_OSCALL_RETURN macro, it's handled explicitly here.  If the ACE_OSCALL
+  // macro ever changes, this function needs to be reviewed.
+  // On Win32, the regular macros can be used, as this is not an issue.
+
 #if defined (ACE_WIN32)
   ACE_SOCKCALL_RETURN (::recv ((ACE_SOCKET) handle, buf, len, flags), int, -1);
 #else
@@ -5112,7 +5102,7 @@ ACE_OS::recvfrom (ACE_HANDLE handle,
                               overlapped,
                               func);
   flags = the_flags;
-  number_of_bytes_recvd = ACE_static_cast (size_t, bytes_recvd);
+  number_of_bytes_recvd = ACE_static_cast(size_t,bytes_recvd);
   return result;
 #else
   ACE_UNUSED_ARG (handle);
@@ -5181,7 +5171,7 @@ ACE_OS::sendto (ACE_HANDLE handle,
                             addrlen,
                             overlapped,
                             func);
-  number_of_bytes_sent = ACE_static_cast (size_t, bytes_sent);
+  number_of_bytes_sent = ACE_static_cast(size_t, bytes_sent);
   return result;
 #else
   ACE_UNUSED_ARG (overlapped);
@@ -5194,8 +5184,8 @@ ACE_OS::sendto (ACE_HANDLE handle,
   for (int i = 0; i < buffer_count; i++)
     {
        result = ACE_OS::sendto (handle,
-                                ACE_reinterpret_cast (char *ACE_CAST_CONST,
-                                                      buffers[i].iov_base),
+                                ACE_reinterpret_cast(char* ACE_CAST_CONST,
+                                                     buffers[i].iov_base),
                                 buffers[i].iov_len,
                                 flags,
                                 addr,
@@ -5215,14 +5205,11 @@ ACE_OS::getpeername (ACE_HANDLE handle, struct sockaddr *addr,
 {
   ACE_TRACE ("ACE_OS::getpeername");
 #if defined (ACE_PSOS) && !defined ACE_PSOS_DIAB_PPC
-  ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle,
-                                      (struct sockaddr_in *) addr,
+  ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
                                       (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
 #else
-  ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle,
-                                      addr,
-                                      (ACE_SOCKET_LEN *) addrlen),
+  ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
 #endif /* defined (ACE_PSOS) */
 }
@@ -6113,7 +6100,7 @@ ACE_OS::last_error (void)
   return lerrno == 0 ? lerror : lerrno;
 #else
   return errno;
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32 */
 }
 
 ACE_INLINE void
@@ -6124,7 +6111,7 @@ ACE_OS::last_error (int error)
   ::SetLastError (error);
 #else
   errno = error;
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32 */
 }
 
 #if !defined (ACE_HAS_WINCE)
@@ -6401,6 +6388,37 @@ ACE_TSS_Emulation::tss_base ()
 #endif /* ! ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
 ACE_INLINE
+u_int
+ACE_TSS_Emulation::total_keys ()
+{
+  return total_keys_;
+}
+
+
+ACE_INLINE
+int
+ACE_TSS_Emulation::next_key (ACE_thread_key_t &key)
+{
+  if (total_keys_ < ACE_TSS_THREAD_KEYS_MAX)
+    {
+# if defined (ACE_HAS_NONSCALAR_THREAD_KEY_T)
+      ACE_OS::memset (&key, 0, sizeof (ACE_thread_key_t));
+      ACE_OS::memcpy (&key, &total_keys_, sizeof (u_int));
+# else
+      key = total_keys_;
+# endif /* ACE_HAS_NONSCALAR_THREAD_KEY_T */
+
+      ++total_keys_;
+      return 0;
+    }
+  else
+    {
+      key = ACE_OS::NULL_key;
+      return -1;
+    }
+}
+
+ACE_INLINE
 ACE_TSS_Emulation::ACE_TSS_DESTRUCTOR
 ACE_TSS_Emulation::tss_destructor (const ACE_thread_key_t key)
 {
@@ -6722,15 +6740,20 @@ ACE_OS::sigwait (sigset_t *set, int *sig)
     // signal number is returned).
     *sig = ::sigwait (set, 0);
     return *sig;
-#   elif defined (DIGITAL_UNIX)  &&  defined (__DECCXX_VER)
-      // DEC cxx (but not g++) needs this direct call to its internal
-      // sigwait ().  This allows us to #undef sigwait, so that we can
-      // have ACE_OS::sigwait.  cxx gets confused by ACE_OS::sigwait
-      // if sigwait is _not_ #undef'ed.
-      errno = ::_Psigwait (set, sig);
-      return errno == 0  ?  *sig  :  -1;
-#   else /* ! __Lynx __ && ! (DIGITAL_UNIX && __DECCXX_VER) */
-#     if (defined (ACE_HAS_PTHREADS_DRAFT4) || (defined (ACE_HAS_PTHREADS_DRAFT6)) && !defined(ACE_HAS_FSU_PTHREADS)) || (defined (_UNICOS) && _UNICOS == 9)
+#   elif defined (DIGITAL_UNIX)
+#     if defined (__DECCXX_VER)
+        // DEC cxx (but not g++) needs this direct call to its internal
+        // sigwait ().  This allows us to #undef sigwait, so that we can
+        // have ACE_OS::sigwait.  cxx gets confused by ACE_OS::sigwait if
+        // sigwait is _not_ #undef'ed.
+        errno = ::_Psigwait (set, sig);
+        return errno == 0  ?  *sig  :  -1;
+#     else  /* g++, for example, on DIGITAL_UNIX */
+        *sig = ::__sigwaitd10 (set, sig);
+        return errno == 0  ?  *sig  :  -1;
+#     endif /* g++, for example, on DIGITAL_UNIX */
+#   else /* ! __Lynx __ && ! DIGITAL_UNIX */
+#     if (defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)) && !defined(ACE_HAS_FSU_PTHREADS)
         *sig = ::sigwait (set);
         return *sig;
 #     elif defined(ACE_HAS_FSU_PTHREADS)
@@ -6805,8 +6828,7 @@ ACE_OS::thr_sigsetmask (int how,
   // Draft 4 and 6 implementations will sometimes have a sigprocmask () that
   // modifies the calling thread's mask only.  If this is not so for your
   // platform, define ACE_LACKS_PTHREAD_THR_SIGSETMASK.
-#   elif defined(ACE_HAS_PTHREADS_DRAFT4) || \
-    defined (ACE_HAS_PTHREADS_DRAFT6) || (defined (_UNICOS) && _UNICOS == 9)
+#   elif defined(ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
   ACE_OSCALL_RETURN (::sigprocmask (how, nsm, osm), int, -1);
 #   else
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsm, osm),
@@ -7953,32 +7975,28 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle)
   if (ptr != 0)
     (*((int (*)(void)) ptr)) (); // Call _fini hook explicitly.
 # endif /* ACE_HAS_AUTOMATIC_INIT_FINI */
-#if defined (_M_UNIX)
-  ACE_OSCALL_RETURN (::_dlclose (handle), int, -1);
-#else /* _MUNIX */
-    ACE_OSCALL_RETURN (::dlclose (handle), int, -1);
-#endif /* _M_UNIX */
+  ACE_OSCALL_RETURN (::dlclose (handle), int, -1);
 #elif defined (ACE_WIN32)
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FreeLibrary (handle), ace_result_), int, -1);
 #elif defined (__hpux)
-  // HP-UX 10.x and 32-bit 11.00 do not pay attention to the ref count
-  // when unloading a dynamic lib.  So, if the ref count is more than
-  // 1, do not unload the lib.  This will cause a library loaded more
-  // than once to not be unloaded until the process runs down, but
-  // that's life.  It's better than unloading a library that's in use.
-  // So far as I know, there's no way to decrement the refcnt that the
-  // kernel is looking at - the shl_descriptor is a copy of what the
-  // kernel has, not the actual struct.  On 64-bit HP-UX using dlopen,
-  // this problem has been fixed.
+  // HP-UX 10.x and 32-bit 11.00 do not pay attention to the ref count when
+  // unloading a dynamic lib.  So, if the ref count is more than 1, do not
+  // unload the lib.  This will cause a library loaded more than once to
+  // not be unloaded until the process runs down, but that's life.  It's
+  // better than unloading a library that's in use.
+  // So far as I know, there's no way to decrement the refcnt that the kernel
+  // is looking at - the shl_descriptor is a copy of what the kernel has, not
+  // the actual struct.
+  // On 64-bit HP-UX using dlopen, this problem has been fixed.
   struct shl_descriptor  desc;
-  if (shl_gethandle_r (handle, &desc) == -1)
+  if (shl_gethandle_r(handle, &desc) == -1)
     return -1;
   if (desc.ref_count > 1)
     return 0;
 # if defined(__GNUC__) || __cplusplus >= 199707L
-  ACE_OSCALL_RETURN (::shl_unload (handle), int, -1);
+  ACE_OSCALL_RETURN (::shl_unload(handle), int, -1);
 # else
-  ACE_OSCALL_RETURN (::cxxshl_unload (handle), int, -1);
+  ACE_OSCALL_RETURN (::cxxshl_unload(handle), int, -1);
 # endif  /* aC++ vs. Hp C++ */
 #else
   ACE_UNUSED_ARG (handle);
@@ -7991,11 +8009,7 @@ ACE_OS::dlerror (void)
 {
   ACE_TRACE ("ACE_OS::dlerror");
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
-#if defined(_M_UNIX)
-  ACE_OSCALL_RETURN ((char *)::_dlerror (), char *, 0);
-#else /* _M_UNIX */
   ACE_OSCALL_RETURN ((char *)::dlerror (), char *, 0);
-#endif /* _M_UNIX */
 # elif defined (__hpux)
   ACE_OSCALL_RETURN (::strerror(errno), char *, 0);
 # elif defined (ACE_WIN32)
@@ -8040,8 +8054,6 @@ ACE_OS::dlopen (const ASYS_TCHAR *fname,
   void *handle;
 #   if defined (ACE_HAS_SGIDLADD)
   ACE_OSCALL (::sgidladd (filename, mode), void *, 0, handle);
-#   elif defined (_M_UNIX)
-  ACE_OSCALL (::_dlopen (filename, mode), void *, 0, handle);
 #   else
   ACE_OSCALL (::dlopen (filename, mode), void *, 0, handle);
 #   endif /* ACE_HAS_SGIDLADD */
@@ -8099,29 +8111,21 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
 #   if defined (ACE_LACKS_POSIX_PROTOTYPES)
   ACE_OSCALL_RETURN (::dlsym (handle, (char*) symbolname), void *, 0);
 #   elif defined (ACE_USES_ASM_SYMBOL_IN_DLSYM)
-  int l = ACE_OS::strlen (symbolname) + 2;
-  char *asm_symbolname = 0;
-  ACE_NEW_RETURN (asm_symbolname,
-                  char[l],
-                  0);
-  ACE_OS::strcpy (asm_symbolname,
-                  "_") ;
-  ACE_OS::strcpy (asm_symbolname + 1,
-                  symbolname) ;
-  void *ace_result;
+  int l = strlen(symbolname) + 2;
+  char* asm_symbolname;
+  ACE_NEW_RETURN(asm_symbolname, char[l], 0);
+  ACE_OS::strcpy (asm_symbolname, "_") ;
+  ACE_OS::strcpy (asm_symbolname + 1, symbolname) ;
+  void* ace_result;
   ACE_OSCALL (::dlsym (handle, asm_symbolname), void *, 0,
               ace_result);
-  delete [] asm_symbolname;
+  delete[] asm_symbolname;
   return ace_result;
-#   elif defined (_M_UNIX)
-  ACE_OSCALL_RETURN (::_dlsym (handle, symbolname), void *, 0);
 #   else
   ACE_OSCALL_RETURN (::dlsym (handle, symbolname), void *, 0);
 #   endif /* ACE_LACKS_POSIX_PROTOTYPES */
 # elif defined (ACE_WIN32)
-  ACE_WIN32CALL_RETURN (::GetProcAddress (handle,
-                                          ASYS_ONLY_MULTIBYTE_STRING (symbolname)),
-                        void *, 0);
+  ACE_WIN32CALL_RETURN (::GetProcAddress (handle, symbolname), void *, 0);
 # elif defined (__hpux)
 
   void *value;
@@ -8247,18 +8251,11 @@ ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len)
     }
 # endif /* defined (ACE_PSOS_LACKS_PHILE */
 #else
-
-  int result;
-
 # if defined (ACE_LACKS_POSIX_PROTOTYPES) || defined (ACE_HAS_CHARPTR_SOCKOPT)
-  ACE_OSCALL (::read (handle, (char *) buf, len), ssize_t, -1, result);
+  ACE_OSCALL_RETURN (::read (handle, (char *) buf, len), ssize_t, -1);
 # else
-  ACE_OSCALL (::read (handle, buf, len), ssize_t, -1, result);
+  ACE_OSCALL_RETURN (::read (handle, buf, len), ssize_t, -1);
 # endif /* ACE_LACKS_POSIX_PROTOTYPES */
-  if (result == -1 && errno == EAGAIN)
-    errno = EWOULDBLOCK;
-  return result;
-
 #endif /* ACE_WIN32 */
 }
 
@@ -8850,7 +8847,7 @@ ACE_OS::difftime (time_t t1, time_t t0)
 }
 #endif /* ! ACE_LACKS_DIFFTIME */
 
-#if !defined (ACE_HAS_MOSTLY_UNICODE_APIS)
+#if !defined (ACE_HAS_WINCE)
 ACE_INLINE char *
 ACE_OS::ctime (const time_t *t)
 {
@@ -8863,9 +8860,7 @@ ACE_OS::ctime (const time_t *t)
   ACE_OSCALL_RETURN (::ctime (t), char *, 0);
 # endif    /* ACE_HAS_BROKEN_CTIME) */
 }
-#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
 
-#if !defined (ACE_HAS_WINCE)
 ACE_INLINE char *
 ACE_OS::ctime_r (const time_t *t, char *buf, int buflen)
 {
@@ -11939,41 +11934,3 @@ ACE_OS_CString::wchar_rep (void)
 {
   return this->rep_;
 }
-
-ACE_INLINE int
-ACE_Countdown_Time::start (void)
-{
-  if (this->max_wait_time_ != 0)
-    {
-      this->start_time_ = ACE_OS::gettimeofday ();
-      this->stopped_ = 0;
-    }
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Countdown_Time::stop (void)
-{
-  if (this->max_wait_time_ != 0 && this->stopped_ == 0)
-    {
-      ACE_Time_Value elapsed_time =
-        ACE_OS::gettimeofday () - this->start_time_;
-
-      if (*this->max_wait_time_ > elapsed_time)
-        *this->max_wait_time_ -= elapsed_time;
-      else
-        {
-          // Used all of timeout.
-          *this->max_wait_time_ = ACE_Time_Value::zero;
-          // errno = ETIME;
-        }
-      this->stopped_ = 1;
-    }
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Countdown_Time::update (void)
-{
-  return (this->stop () == 0) && this->start ();
-}
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 6d0134f0dea..cacc50b5faa 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -173,15 +173,11 @@ class ACE_Export ACE_Object_Manager : public ACE_Object_Manager_Base
   //     doesn't destroy automatic objects, and for developing the
   //     recommendations in this paragraph.
   //
-  //     Instead of creating a static ACE_Object_Manager, or letting
-  //     ACE create it on the stack of main () for you, another
-  //     alternative is to #define
+  //     Instead of creating a static ACE_Object_Manager, or creating
+  //     it on the stack of main (), another alternative is to #define
   //     ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER.  With that
-  //     #define, the application must create the ACE_Object_Manager.
-  //     The recommended way is to call ACE::init () at the start of
-  //     the program, and call ACE::fini () at the end.
-  //     Alternatively, the application could explicity construct an
-  //     ACE_Object_Manager.
+  //     #define, the application _must_ call ACE::init () at the
+  //     start of the program, and call ACE::fini () at the end.
 
 public:
   virtual int init (void);
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index d741da94a98..53f5212e0e6 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -58,9 +58,9 @@ ACE_Pipe::open (void)
   if (result == -1)
     return -1;
 
-#if !defined (ACE_LACKS_TCP_NODELAY)
   int one = 1;
 
+#ifndef ACE_LACKS_TCP_NODELAY
   // Make sure that the TCP stack doesn't try to buffer small writes.
   // Since this communication is purely local to the host it doesn't
   // affect network performance.
@@ -72,7 +72,7 @@ ACE_Pipe::open (void)
   if (writer.set_option (level, TCP_NODELAY,
                          &one, sizeof one) == -1)
     return -1;
-#endif /* ! ACE_LACKS_TCP_NODELAY */
+#endif /* ACE_LACKS_TCP_NODELAY */
 
   this->handles_[0] = reader.get_handle ();
   this->handles_[1] = writer.get_handle ();
diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 96a895de393..5abb8601885 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -139,8 +139,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tre
   if (! x)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("\nerror: x is a null pointer in ")
-                ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
+                ASYS_TEXT ("\nerror: x is a null pointer in "
+                           "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
   else if (! (x->left()))
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
@@ -178,8 +178,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree
   if (! x)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("\nerror: x is a null pointer in ")
-                ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+                ASYS_TEXT ("\nerror: x is a null pointer in "
+                           "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
   else if (! (x->right()))
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index 61f4be62e7d..ebf860d9786 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -37,7 +37,7 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl,
   #if defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL)
       ACE_NEW (impl,
                ACE_TP_Reactor);
-  #else
+  #else  
       ACE_NEW (impl,
                ACE_Select_Reactor);
   #endif /* ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL */
@@ -68,6 +68,9 @@ ACE_Reactor *ACE_Reactor::reactor_ = 0;
 // only delete it safely if we created it!)
 int ACE_Reactor::delete_reactor_ = 0;
 
+// Terminate the eventloop.
+sig_atomic_t ACE_Reactor::end_event_loop_ = 0;
+
 ACE_Reactor *
 ACE_Reactor::instance (void)
 {
@@ -125,128 +128,134 @@ ACE_Reactor::close_singleton (void)
     }
 }
 
+// Run the event loop until the <ACE_Reactor::handle_events> method
+// returns -1 or the <end_event_loop> method is invoked.
+
 int
-ACE_Reactor::check_reconfiguration (void *)
+ACE_Reactor::run_event_loop (void)
 {
-#if !defined (ACE_HAS_WINCE)
-  if (ACE_Service_Config::reconfig_occurred ())
+  ACE_TRACE ("ACE_Reactor::run_event_loop");
+
+  while (ACE_Reactor::end_event_loop_ == 0)
     {
-      ACE_Service_Config::reconfigure ();
-      return 1;
+      int result = ACE_Reactor::instance ()->handle_events ();
+
+#if !defined (ACE_HAS_WINCE)
+      if (ACE_Service_Config::reconfig_occurred ())
+        ACE_Service_Config::reconfigure ();
+      else
+#endif /* !ACE_HAS_WINCE */
+        if (result == -1)
+          return -1;
     }
-#endif /* ACE_HAS_WINCE */
+  /* NOTREACHED */
   return 0;
 }
 
+// Run the event loop until the <ACE_Reactor::handle_events>
+// method returns -1, the <end_event_loop> method
+// is invoked, or the <ACE_Time_Value> expires.
+
 int
-ACE_Reactor::run_reactor_event_loop (REACTOR_EVENT_HOOK eh)
+ACE_Reactor::run_event_loop (ACE_Time_Value &tv)
 {
-  ACE_TRACE ("ACE_Reactor::run_reactor_event_loop");
+  ACE_TRACE ("ACE_Reactor::run_event_loop");
 
-  while (1)
+  while (ACE_Reactor::end_event_loop_ == 0)
     {
-      int result = this->implementation_->handle_events ();
-
-      if (eh != 0 && (*eh)(0))
-        continue;
-      else if (result == -1 && this->implementation_->deactivated ())
-        return 0;
-      else if (result == -1)
-        return -1;
+      int result = ACE_Reactor::instance ()->handle_events (tv);
+
+#if !defined (ACE_HAS_WINCE)
+      if (ACE_Service_Config::reconfig_occurred ())
+        ACE_Service_Config::reconfigure ();
+      else
+#endif /* !ACE_HAS_WINCE */
+        if (result <= 0)
+          return result;
     }
 
-  ACE_NOTREACHED (return 0;)
+  /* NOTREACHED */
+  return 0;
 }
 
+// Run the event loop until the <ACE_Reactor::alertable_handle_events> method
+// returns -1 or the <end_event_loop> method is invoked.
+
 int
-ACE_Reactor::run_alertable_reactor_event_loop (REACTOR_EVENT_HOOK eh)
+ACE_Reactor::run_alertable_event_loop (void)
 {
-  ACE_TRACE ("ACE_Reactor::run_alertable_reactor_event_loop");
+  ACE_TRACE ("ACE_Reactor::run_event_loop");
 
-  while (1)
+  while (ACE_Reactor::end_event_loop_ == 0)
     {
-      int result = this->implementation_->alertable_handle_events ();
-
-      if (eh != 0 && (*eh)(0))
-        continue;
-      else if (result == -1 && this->implementation_->deactivated ())
-        return 0;
-      else if (result == -1)
-        return -1;
-    }
+      int result = ACE_Reactor::instance ()->alertable_handle_events ();
 
-  ACE_NOTREACHED (return 0;)
+#if !defined (ACE_HAS_WINCE)
+      if (ACE_Service_Config::reconfig_occurred ())
+        ACE_Service_Config::reconfigure ();
+      else
+#endif /* !ACE_HAS_WINCE */
+
+        if (result == -1)
+          return -1;
+    }
+  /* NOTREACHED */
+  return 0;
 }
 
+// Run the event loop until the <ACE_Reactor::alertable_handle_events>
+// method returns -1, the <end_event_loop> method
+// is invoked, or the <ACE_Time_Value> expires.
+
 int
-ACE_Reactor::run_reactor_event_loop (ACE_Time_Value &tv,
-                                     REACTOR_EVENT_HOOK eh)
+ACE_Reactor::run_alertable_event_loop (ACE_Time_Value &tv)
 {
-  ACE_TRACE ("ACE_Reactor::run_reactor_event_loop");
+  ACE_TRACE ("ACE_Reactor::run_event_loop");
 
-  while (1)
+  while (ACE_Reactor::end_event_loop_ == 0)
     {
-      int result = this->implementation_->handle_events (tv);
-
-      if (eh != 0 && (*eh)(0))
-        continue;
-      else if (result == -1 && this->implementation_->deactivated ())
-        return 0;
-      else if (result <= 0)
-        return result;
+      int result = ACE_Reactor::instance ()->alertable_handle_events (tv);
+
+#if !defined (ACE_HAS_WINCE)
+      if (ACE_Service_Config::reconfig_occurred ())
+        ACE_Service_Config::reconfigure ();
+      else
+#endif /* !ACE_HAS_WINCE */
+        if (result <= 0)
+          return result;
     }
 
-  ACE_NOTREACHED (return 0;)
+  /* NOTREACHED */
+  return 0;
 }
 
-int
-ACE_Reactor::run_alertable_reactor_event_loop (ACE_Time_Value &tv,
-                                               REACTOR_EVENT_HOOK eh)
+void
+ACE_Reactor::reset_event_loop (void)
 {
-  ACE_TRACE ("ACE_Reactor::run_alertable_reactor_event_loop");
-
-  while (1)
-    {
-      int result = this->implementation_->alertable_handle_events (tv);
-
-      if (eh != 0 && (*eh)(0))
-        continue;
-      else if (result == -1 && this->implementation_->deactivated ())
-        return 0;
-      else if (result <= 0)
-        return result;
-    }
+  ACE_TRACE ("ACE_Reactor::reset_event_loop");
 
-  ACE_NOTREACHED (return 0;)
+  ACE_Reactor::end_event_loop_ = 0;
 }
 
 int
-ACE_Reactor::end_reactor_event_loop (void)
+ACE_Reactor::end_event_loop (void)
 {
-  ACE_TRACE ("ACE_Reactor::end_reactor_event_loop");
+  ACE_TRACE ("ACE_Reactor::end_event_loop");
+
+  ACE_Reactor::end_event_loop_ = 1;
 
-  this->implementation_->deactivate (1);
+  // Wakeup all threads waiting in the Reactor.
+  ACE_Reactor::instance ()->wakeup_all_threads ();
 
   return 0;
 }
 
 int
-ACE_Reactor::reactor_event_loop_done (void)
+ACE_Reactor::event_loop_done (void)
 {
-  ACE_TRACE ("ACE_Reactor::reactor_event_loop_done");
-  return this->implementation_->deactivated ();
-}
-  // Report if the <ACE_Reactor::instance>'s event loop is finished.
-
-void
-ACE_Reactor::reset_reactor_event_loop (void)
-{
-  ACE_TRACE ("ACE_Reactor::reset_event_loop");
-
-  this->implementation_->deactivate (0);
+  ACE_TRACE ("ACE_Reactor::event_loop_done");
+  return ACE_Reactor::end_event_loop_ != 0;
 }
-  // Resets the <ACE_Reactor::end_event_loop_> static so that the
-  // <run_event_loop> method can be restarted.
 
 void
 ACE_Reactor::dump (void) const
diff --git a/ace/Reactor.h b/ace/Reactor.h
index bbb2fa635f4..e5acd926d5f 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -62,13 +62,6 @@ public:
     // changes enabled bits).
   };
 
-  typedef int (*REACTOR_EVENT_HOOK)(void*);
-  // You can add a hook to various run_event methods and the hook will
-  // be called after handling every reactor event.  If this function
-  // returns 0, run_reactor_event_loop will check for the return value of
-  // handle_event.  If it is -1, the the run_reactor_event_loop will return
-  // (pre-maturely.)
-
   static ACE_Reactor *instance (void);
   // Get pointer to a process-wide <ACE_Reactor>.
 
@@ -81,7 +74,7 @@ public:
   static void close_singleton (void);
   // Delete the dynamically allocated Singleton
 
-  // = Singleton reactor event loop management methods.
+  // = Reactor event loop management methods.
 
   // Note that these method ONLY work on the "Singleton Reactor,"
   // i.e., the one returned from <ACE_Reactor::instance>.
@@ -110,42 +103,6 @@ public:
   // Resets the <ACE_Reactor::end_event_loop_> static so that the
   // <run_event_loop> method can be restarted.
 
-  static int check_reconfiguration (void *);
-  // The singleton reactor is used by the service_configurator.
-  // Therefore, we must check for the reconfiguration request and
-  // handle it after handling an event.
-
-
-  // = Reactor event loop management methods.
-
-  // These methods work with an instance of a reactor.
-  virtual int run_reactor_event_loop (REACTOR_EVENT_HOOK = 0);
-  virtual int run_alertable_reactor_event_loop (REACTOR_EVENT_HOOK = 0);
-  // Run the event loop until the
-  // <ACE_Reactor::handle_events/ACE_Reactor::alertable_handle_events>
-  // method returns -1 or the <end_event_loop> method is invoked.
-
-  virtual int run_reactor_event_loop (ACE_Time_Value &tv,
-                                      REACTOR_EVENT_HOOK = 0);
-  virtual int run_alertable_reactor_event_loop (ACE_Time_Value &tv,
-                                                REACTOR_EVENT_HOOK = 0);
-  // Run the event loop until the <ACE_Reactor::handle_events> or
-  // <ACE_Reactor::alertable_handle_events> methods returns -1, the
-  // <end_event_loop> method is invoked, or the <ACE_Time_Value>
-  // expires.
-
-  virtual int end_reactor_event_loop (void);
-  // Instruct the <ACE_Reactor::instance> to terminate its event loop
-  // and notifies the <ACE_Reactor::instance> so that it can wake up
-  // and close down gracefully.
-
-  virtual int reactor_event_loop_done (void);
-  // Report if the <ACE_Reactor::instance>'s event loop is finished.
-
-  virtual void reset_reactor_event_loop (void);
-  // Resets the <ACE_Reactor::end_event_loop_> static so that the
-  // <run_event_loop> method can be restarted.
-
   ACE_Reactor (ACE_Reactor_Impl *implementation = 0,
                int delete_implementation = 0);
   // Create the Reactor using <implementation>.  The flag
@@ -519,6 +476,9 @@ protected:
   static int delete_reactor_;
   // Must delete the <reactor_> singleton if non-0.
 
+  static sig_atomic_t end_event_loop_;
+  // Terminate the event loop of the singleton Reactor.
+
   ACE_Reactor (const ACE_Reactor &);
   ACE_Reactor &operator = (const ACE_Reactor &);
   // Deny access since member-wise won't work...
diff --git a/ace/Reactor.i b/ace/Reactor.i
index c197c7f325a..ba4c8dd01e9 100644
--- a/ace/Reactor.i
+++ b/ace/Reactor.i
@@ -23,91 +23,11 @@ ACE_Reactor::current_info (ACE_HANDLE handle,
   return this->implementation ()->current_info (handle, size);
 }
 
-// Run the event loop until the <ACE_Reactor::handle_events> method
-// returns -1 or the <end_event_loop> method is invoked.
-
-ACE_INLINE int
-ACE_Reactor::run_event_loop (void)
-{
-  ACE_TRACE ("ACE_Reactor::run_event_loop");
-
-  return
-    ACE_Reactor::instance ()
-      ->run_reactor_event_loop (ACE_Reactor::check_reconfiguration);
-}
-
-// Run the event loop until the <ACE_Reactor::handle_events>
-// method returns -1, the <end_event_loop> method
-// is invoked, or the <ACE_Time_Value> expires.
-
-ACE_INLINE int
-ACE_Reactor::run_event_loop (ACE_Time_Value &tv)
-{
-  ACE_TRACE ("ACE_Reactor::run_event_loop");
-
-  return
-    ACE_Reactor::instance ()
-      ->run_reactor_event_loop (tv,
-                                ACE_Reactor::check_reconfiguration);
-}
-
-// Run the event loop until the <ACE_Reactor::alertable_handle_events> method
-// returns -1 or the <end_event_loop> method is invoked.
-
-ACE_INLINE int
-ACE_Reactor::run_alertable_event_loop (void)
-{
-  ACE_TRACE ("ACE_Reactor::run_alertable_event_loop");
-
-  return
-    ACE_Reactor::instance ()
-      ->run_alertable_reactor_event_loop (ACE_Reactor::check_reconfiguration);
-}
-
-// Run the event loop until the <ACE_Reactor::alertable_handle_events>
-// method returns -1, the <end_event_loop> method
-// is invoked, or the <ACE_Time_Value> expires.
-
-ACE_INLINE int
-ACE_Reactor::run_alertable_event_loop (ACE_Time_Value &tv)
-{
-  ACE_TRACE ("ACE_Reactor::run_alertable_event_loop");
-
-  return
-    ACE_Reactor::instance ()
-      ->run_alertable_reactor_event_loop (tv,
-                                          ACE_Reactor::check_reconfiguration);
-}
-
-ACE_INLINE void
-ACE_Reactor::reset_event_loop (void)
-{
-  ACE_TRACE ("ACE_Reactor::reset_event_loop");
-
-  ACE_Reactor::instance ()->reset_reactor_event_loop ();
-}
-
-ACE_INLINE int
-ACE_Reactor::end_event_loop (void)
-{
-  ACE_TRACE ("ACE_Reactor::end_event_loop");
-  ACE_Reactor::instance ()->end_reactor_event_loop ();
-
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Reactor::event_loop_done (void)
-{
-  ACE_TRACE ("ACE_Reactor::event_loop_done");
-  return ACE_Reactor::instance ()->reactor_event_loop_done ();
-}
-
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::open (size_t size,
-                   int restart,
-                   ACE_Sig_Handler *signal_handler,
-                   ACE_Timer_Queue *timer_queue)
+		   int restart,
+		   ACE_Sig_Handler *signal_handler,
+		   ACE_Timer_Queue *timer_queue)
 {
   return this->implementation ()->open (size,
                                         restart,
@@ -126,46 +46,46 @@ ACE_Reactor::set_timer_queue (ACE_Timer_Queue *timer_queue)
   return this->implementation ()->set_timer_queue (timer_queue);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::close (void)
 {
   return this->implementation ()->close ();
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::work_pending (const ACE_Time_Value &max_wait_time)
 {
   return this->implementation ()->work_pending (max_wait_time);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::handle_events (ACE_Time_Value *max_wait_time)
 {
   return this->implementation ()->handle_events (max_wait_time);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::alertable_handle_events (ACE_Time_Value *max_wait_time)
 {
   return this->implementation ()->alertable_handle_events (max_wait_time);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::handle_events (ACE_Time_Value &max_wait_time)
 {
   return this->implementation ()->handle_events (max_wait_time);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::alertable_handle_events (ACE_Time_Value &max_wait_time)
 {
   return this->implementation ()->alertable_handle_events (max_wait_time);
 }
 
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (ACE_Event_Handler *event_handler,
-                               ACE_Reactor_Mask mask)
+			       ACE_Reactor_Mask mask)
 {
   int result = this->implementation ()->register_handler (event_handler,
                                                           mask);
@@ -176,10 +96,10 @@ ACE_Reactor::register_handler (ACE_Event_Handler *event_handler,
   return result;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (ACE_HANDLE io_handle,
-                               ACE_Event_Handler *event_handler,
-                               ACE_Reactor_Mask mask)
+			       ACE_Event_Handler *event_handler,
+			       ACE_Reactor_Mask mask)
 {
   int result = this->implementation ()->register_handler (io_handle,
                                                           event_handler,
@@ -190,12 +110,12 @@ ACE_Reactor::register_handler (ACE_HANDLE io_handle,
 
   return result;
 }
-
+ 
 #if defined (ACE_WIN32)
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (ACE_Event_Handler *event_handler,
-                               ACE_HANDLE event_handle)
+			       ACE_HANDLE event_handle)
 {
   int result = this->implementation ()->register_handler (event_handler,
                                                           event_handle);
@@ -205,14 +125,14 @@ ACE_Reactor::register_handler (ACE_Event_Handler *event_handler,
 
   return result;
 }
-
+ 
 #endif /* ACE_WIN32 */
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (ACE_HANDLE event_handle,
-                               ACE_HANDLE io_handle,
-                               ACE_Event_Handler *event_handler,
-                               ACE_Reactor_Mask mask)
+			       ACE_HANDLE io_handle,
+			       ACE_Event_Handler *event_handler,
+			       ACE_Reactor_Mask mask)
 {
   int result = this->implementation ()->register_handler (event_handle,
                                                           io_handle,
@@ -224,11 +144,11 @@ ACE_Reactor::register_handler (ACE_HANDLE event_handle,
 
   return result;
 }
-
-ACE_INLINE int
+ 
+ACE_INLINE int 
 ACE_Reactor::register_handler (const ACE_Handle_Set &handles,
-                               ACE_Event_Handler *event_handler,
-                               ACE_Reactor_Mask mask)
+			       ACE_Event_Handler *event_handler,
+			       ACE_Reactor_Mask mask)
 {
   int result = this->implementation ()->register_handler (handles,
                                                           event_handler,
@@ -236,16 +156,16 @@ ACE_Reactor::register_handler (const ACE_Handle_Set &handles,
   if (result != -1)
     // Assign *this* <Reactor> to the <Event_Handler>.
     event_handler->reactor (this);
-
+  
   return result;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (int signum,
-                               ACE_Event_Handler *new_sh,
-                               ACE_Sig_Action *new_disp,
-                               ACE_Event_Handler **old_sh,
-                               ACE_Sig_Action *old_disp)
+			       ACE_Event_Handler *new_sh,
+			       ACE_Sig_Action *new_disp,
+			       ACE_Event_Handler **old_sh,
+			       ACE_Sig_Action *old_disp)
 {
   return this->implementation ()->register_handler (signum,
                                                     new_sh,
@@ -254,45 +174,45 @@ ACE_Reactor::register_handler (int signum,
                                                     old_disp);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::register_handler (const ACE_Sig_Set &sigset,
-                               ACE_Event_Handler *new_sh,
-                               ACE_Sig_Action *new_disp)
+			       ACE_Event_Handler *new_sh,
+			       ACE_Sig_Action *new_disp)
 {
   return this->implementation ()->register_handler (sigset,
                                                     new_sh,
                                                     new_disp);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::remove_handler (ACE_Event_Handler *event_handler,
-                             ACE_Reactor_Mask mask)
+			     ACE_Reactor_Mask mask)
 {
   return this->implementation ()->remove_handler (event_handler,
                                                   mask);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::remove_handler (ACE_HANDLE handle,
-                             ACE_Reactor_Mask mask)
+			     ACE_Reactor_Mask mask)
 {
   return this->implementation ()->remove_handler (handle,
                                                   mask);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::remove_handler (const ACE_Handle_Set &handle_set,
-                             ACE_Reactor_Mask mask)
+			     ACE_Reactor_Mask mask)
 {
   return this->implementation ()->remove_handler (handle_set,
                                                   mask);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::remove_handler (int signum,
-                             ACE_Sig_Action *new_disp,
-                             ACE_Sig_Action *old_disp,
-                             int sigkey)
+			     ACE_Sig_Action *new_disp,
+			     ACE_Sig_Action *old_disp,
+			     int sigkey)
 {
   return this->implementation ()->remove_handler (signum,
                                                   new_disp,
@@ -300,67 +220,67 @@ ACE_Reactor::remove_handler (int signum,
                                                   sigkey);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::remove_handler (const ACE_Sig_Set &sigset)
 {
   return this->implementation ()->remove_handler (sigset);
 }
 
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::suspend_handler (ACE_Event_Handler *event_handler)
 {
   return this->implementation ()->suspend_handler (event_handler);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::suspend_handler (ACE_HANDLE handle)
 {
   return this->implementation ()->suspend_handler (handle);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::suspend_handler (const ACE_Handle_Set &handles)
 {
   return this->implementation ()->suspend_handler (handles);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::suspend_handlers (void)
 {
   return this->implementation ()->suspend_handlers ();
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::resume_handler (ACE_Event_Handler *event_handler)
 {
   return this->implementation ()->resume_handler (event_handler);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::resume_handler (ACE_HANDLE handle)
 {
   return this->implementation ()->resume_handler (handle);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::resume_handler (const ACE_Handle_Set &handles)
 {
   return this->implementation ()->resume_handler (handles);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::resume_handlers (void)
 {
   return this->implementation ()->resume_handlers ();
 }
 
 
-ACE_INLINE long
+ACE_INLINE long 
 ACE_Reactor::schedule_timer (ACE_Event_Handler *event_handler,
-                             const void *arg,
-                             const ACE_Time_Value &delta,
-                             const ACE_Time_Value &interval)
+			     const void *arg,
+			     const ACE_Time_Value &delta,
+			     const ACE_Time_Value &interval)
 {
   int result = this->implementation ()->schedule_timer (event_handler,
                                                         arg,
@@ -373,28 +293,28 @@ ACE_Reactor::schedule_timer (ACE_Event_Handler *event_handler,
   return result;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::cancel_timer (ACE_Event_Handler *event_handler,
-                           int dont_call_handle_close)
+			   int dont_call_handle_close)
 {
   return this->implementation ()->cancel_timer (event_handler,
                                                 dont_call_handle_close);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::cancel_timer (long timer_id,
-                           const void **arg,
-                           int dont_call_handle_close)
+			   const void **arg,
+			   int dont_call_handle_close)
 {
   return this->implementation ()->cancel_timer (timer_id,
                                                 arg,
                                                 dont_call_handle_close);
 }
 
-
-ACE_INLINE int
+  
+ACE_INLINE int 
 ACE_Reactor::schedule_wakeup (ACE_Event_Handler *event_handler,
-                              ACE_Reactor_Mask masks_to_be_added)
+			      ACE_Reactor_Mask masks_to_be_added)
 {
   int result = this->implementation ()->schedule_wakeup (event_handler,
                                                          masks_to_be_added);
@@ -404,73 +324,73 @@ ACE_Reactor::schedule_wakeup (ACE_Event_Handler *event_handler,
 
   return result;
 }
-
-ACE_INLINE int
+  
+ACE_INLINE int 
 ACE_Reactor::schedule_wakeup (ACE_HANDLE handle,
-                              ACE_Reactor_Mask masks_to_be_added)
+			      ACE_Reactor_Mask masks_to_be_added)
 {
   return implementation ()->schedule_wakeup (handle,
                                              masks_to_be_added);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::cancel_wakeup (ACE_Event_Handler *event_handler,
-                            ACE_Reactor_Mask masks_to_be_cleared)
+			    ACE_Reactor_Mask masks_to_be_cleared)
 {
   return this->implementation ()->cancel_wakeup (event_handler,
                                                  masks_to_be_cleared);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::cancel_wakeup (ACE_HANDLE handle,
-                            ACE_Reactor_Mask masks_to_be_cleared)
+			    ACE_Reactor_Mask masks_to_be_cleared)
 {
   return this->implementation ()->cancel_wakeup (handle,
                                                  masks_to_be_cleared);
 }
 
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::notify (ACE_Event_Handler *event_handler,
-                     ACE_Reactor_Mask mask,
-                     ACE_Time_Value *tv)
+		     ACE_Reactor_Mask mask,
+		     ACE_Time_Value *tv)
 {
   return this->implementation ()->notify (event_handler,
                                           mask,
                                           tv);
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Reactor::max_notify_iterations (int iterations)
 {
   this->implementation ()->max_notify_iterations (iterations);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::max_notify_iterations (void)
 {
   return this->implementation ()->max_notify_iterations ();
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::handler (ACE_HANDLE handle,
-                      ACE_Reactor_Mask mask,
-                      ACE_Event_Handler **event_handler)
+		      ACE_Reactor_Mask mask,
+		      ACE_Event_Handler **event_handler)
 {
   return this->implementation ()->handler (handle,
                                            mask,
                                            event_handler);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::handler (int signum,
-                      ACE_Event_Handler **event_handler)
+		      ACE_Event_Handler **event_handler)
 {
   return this->implementation ()->handler (signum,
                                            event_handler);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::initialized (void)
 {
   return this->implementation ()->initialized ();
@@ -482,73 +402,73 @@ ACE_Reactor::lock (void)
   return this->implementation ()->lock ();
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Reactor::wakeup_all_threads (void)
 {
   this->implementation ()->wakeup_all_threads ();
 }
 
-ACE_INLINE int
-ACE_Reactor::owner (ACE_thread_t new_owner,
-                    ACE_thread_t *old_owner)
+ACE_INLINE int 
+ACE_Reactor::owner (ACE_thread_t new_owner, 
+		    ACE_thread_t *old_owner)
 {
-  return this->implementation ()->owner (new_owner,
+  return this->implementation ()->owner (new_owner, 
                                          old_owner);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::owner (ACE_thread_t *owner)
 {
   return this->implementation ()->owner (owner);
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Reactor::requeue_position (int position)
 {
   this->implementation ()->requeue_position (position);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::requeue_position (void)
 {
   return this->implementation ()->requeue_position ();
 }
 
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::mask_ops (ACE_Event_Handler *event_handler,
-                       ACE_Reactor_Mask mask,
-                       int ops)
+		       ACE_Reactor_Mask mask,
+		       int ops)
 {
   return this->implementation ()->mask_ops (event_handler,
                                             mask,
                                             ops);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::mask_ops (ACE_HANDLE handle,
-                       ACE_Reactor_Mask mask,
-                       int ops)
+		       ACE_Reactor_Mask mask,
+		       int ops)
 {
   return this->implementation ()->mask_ops (handle,
                                             mask,
                                             ops);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::ready_ops (ACE_Event_Handler *event_handler,
-                        ACE_Reactor_Mask mask,
-                        int ops)
+			ACE_Reactor_Mask mask,
+			int ops)
 {
   return this->implementation ()->ready_ops (event_handler,
                                              mask,
                                              ops);
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Reactor::ready_ops (ACE_HANDLE handle,
-                        ACE_Reactor_Mask mask,
-                        int ops)
+			ACE_Reactor_Mask mask,
+			int ops)
 {
   return this->implementation ()->ready_ops (handle,
                                              mask,
diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h
index 7eb92659812..85c3033534c 100644
--- a/ace/Reactor_Impl.h
+++ b/ace/Reactor_Impl.h
@@ -155,18 +155,6 @@ public:
   // return when the system queues an I/O completion routine or an
   // Asynchronous Procedure Call.
 
-  // = Event handling control.
-
-  virtual int deactivated (void) = 0;
-  // Return the status of Reactor.  If this function returns 0, the reactor is
-  // actively handling events.  If it returns non-zero, <handling_events> and
-  // <handle_alertable_events> return -1 immediately.
-
-  virtual void deactivate (int do_stop) = 0;
-  // Control whether the Reactor will handle any more incoming events or not.
-  // If <do_stop> == 1, the Reactor will be disabled.  By default, a reactor
-  // is in active state and can be deactivated/reactived as wish.
-
   // = Register and remove Handlers.
 
   virtual int register_handler (ACE_Event_Handler *event_handler,
diff --git a/ace/SOCK.cpp b/ace/SOCK.cpp
index 10e4bde796b..67a10d44d64 100644
--- a/ace/SOCK.cpp
+++ b/ace/SOCK.cpp
@@ -30,14 +30,10 @@ int
 ACE_SOCK::get_remote_addr (ACE_Addr &sa) const
 {
   ACE_TRACE ("ACE_SOCK::get_remote_addr");
-
   int len = sa.get_size ();
-  sockaddr *addr = ACE_reinterpret_cast (sockaddr *,
-                                         sa.get_addr ());
+  sockaddr *addr = (sockaddr *) sa.get_addr ();
 
-  if (ACE_OS::getpeername (this->get_handle (),
-                           addr,
-                           &len) == -1)
+  if (ACE_OS::getpeername (this->get_handle (), addr, &len) == -1)
     return -1;
   
   sa.set_size (len);
@@ -48,14 +44,10 @@ int
 ACE_SOCK::get_local_addr (ACE_Addr &sa) const
 {
   ACE_TRACE ("ACE_SOCK::get_local_addr");
-
   int len = sa.get_size ();
-  sockaddr *addr = ACE_reinterpret_cast (sockaddr *,
-                                         sa.get_addr ());
+  sockaddr *addr = (sockaddr *) sa.get_addr ();
 
-  if (ACE_OS::getsockname (this->get_handle (),
-                           addr,
-                           &len) == -1)
+  if (ACE_OS::getsockname (this->get_handle (), addr, &len) == -1)
     return -1;
 
   sa.set_size (len);
@@ -141,6 +133,7 @@ ACE_SOCK::open (int type,
                                     protocolinfo,
                                     g,
                                     flags));
+
   int one = 1;
 
   if (this->get_handle () == ACE_INVALID_HANDLE)
@@ -154,8 +147,7 @@ ACE_SOCK::open (int type,
       this->close ();
       return -1;
     }
-  else
-    return 0;
+  return 0;
 }
 
 ACE_SOCK::ACE_SOCK (int type, 
diff --git a/ace/SOCK.h b/ace/SOCK.h
index 576806bc256..6918bf12ff3 100644
--- a/ace/SOCK.h
+++ b/ace/SOCK.h
@@ -29,15 +29,15 @@
 class ACE_Export ACE_SOCK : public ACE_IPC_SAP
 {
   // = TITLE
-  //     An abstract class that forms the basis for more specific
-  //     classes, such as <ACE_SOCK_Acceptor> and <ACE_SOCK_Stream>.
+  //     An abstract class which forms the basis for more specific
+  //     classes (such as ACE_SOCK_Acceptor and ACE_SOCK_Stream).
   //     Do not instantiate this class.
   //
   // = DESCRIPTION
   //    This class provides functions that are common to all of the
-  //    <ACE_SOCK_*> classes. <ACE_SOCK> provides the ability to get
-  //    and set socket options, get the local and remote addresses,
-  //    and close the socket.
+  //    SOCK-type classes. ACE_SOCK provides the ability to get and
+  //    set socket options, get the local and remote addresses, and
+  //    close the socket.
 public:
   ~ACE_SOCK (void);
   // Default ctor/dtor.
@@ -46,25 +46,24 @@ public:
                   int option,
                   void *optval,
                   int optlen) const;
-  // Wrapper around the <setsockopt> system call.
+  // Wrapper around the setsockopt() system call.
 
   int get_option (int level,
                   int option,
                   void *optval,
                   int *optlen) const;
-  // Wrapper around the <getsockopt> system call.
+  // Wrapper around the getsockopt() system call.
 
   int close (void);
   // Close down the socket.
 
   int get_local_addr (ACE_Addr &) const;
-  // Return the local endpoint address in the referenced <ACE_Addr>.
+  // Return the local endpoint address in the referenced ACE_Addr.
   // Returns 0 if successful, else -1.
 
   int get_remote_addr (ACE_Addr &) const;
   // Return the address of the remotely connected peer (if there is
-  // one), in the referenced <ACE_Addr>. Returns 0 if successful, else
-  // -1.
+  // one), in the referenced ACE_Addr. Returns 0 if successful, else -1.
 
   void dump (void) const;
   // Dump the state of an object.
@@ -112,6 +111,6 @@ protected:
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK.i"
-#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+#endif
 
 #endif /* ACE_SOCK_H */
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index 612dd023028..96726920173 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -71,9 +71,8 @@ ACE_SOCK_Acceptor::shared_accept_finish (ACE_SOCK_Stream new_stream,
     {
       // Save/restore errno.
       ACE_Errno_Guard error (errno);
-
-      // Only disable ACE_NONBLOCK if we weren't in non-blocking mode
-      // originally.
+      // Only disable ACE_NONBLOCK if we weren't in
+      // non-blocking mode originally.
       ACE::clr_flags (this->get_handle (),
 		      ACE_NONBLOCK);
       ACE::clr_flags (new_handle,
@@ -195,62 +194,29 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
 				     reset_new_handle);
 }
 
-void
-ACE_SOCK_Acceptor::dump (void) const
+// General purpose routine for performing server ACE_SOCK creation.
+
+ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
+				      int reuse_addr,
+				      int protocol_family,
+				      int backlog,
+				      int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Acceptor::dump");
+  ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
+  if (this->open (local_sap,
+		  reuse_addr,
+		  protocol_family,
+		  backlog,
+		  protocol) == -1)
+    ACE_ERROR ((LM_ERROR,
+		ASYS_TEXT ("%p\n"),
+		ASYS_TEXT ("ACE_SOCK_Acceptor")));
 }
 
-int
-ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
-                                int protocol_family,
-                                int backlog)
+void
+ACE_SOCK_Acceptor::dump (void) const
 {
-  ACE_TRACE ("ACE_SOCK_Acceptor::shared_open");
-  int error = 0;
-
-  if (protocol_family == PF_INET)
-    {
-      sockaddr_in local_inet_addr;
-      ACE_OS::memset (ACE_reinterpret_cast (void *,
-                                            &local_inet_addr),
-                      0,
-                      sizeof local_inet_addr);
-
-      if (local_sap == ACE_Addr::sap_any)
-        {
-          local_inet_addr.sin_port = 0;
-          local_inet_addr.sin_addr.s_addr = htonl (INADDR_ANY);
-        }
-      else
-        local_inet_addr = *ACE_reinterpret_cast (sockaddr_in *,
-                                                 local_sap.get_addr ());
-      if (local_inet_addr.sin_port == 0)
-        {
-          if (ACE::bind_port (this->get_handle (),
-                              local_inet_addr.sin_addr.s_addr) == -1)
-            error = 1;
-        }
-      else if (ACE_OS::bind (this->get_handle (),
-                             ACE_reinterpret_cast (sockaddr *,
-                                                   &local_inet_addr),
-                             sizeof local_inet_addr) == -1)
-        error = 1;
-    }
-  else if (ACE_OS::bind (this->get_handle (),
-			 (sockaddr *) local_sap.get_addr (),
-                         local_sap.get_size ()) == -1)
-    error = 1;
-
-  if (error != 0
-      || ACE_OS::listen (this->get_handle (),
-                         backlog) == -1)
-    {
-      error = 1;
-      this->close ();
-    }
-
-  return error ? -1 : 0;
+  ACE_TRACE ("ACE_SOCK_Acceptor::dump");
 }
 
 int
@@ -264,19 +230,15 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
                          int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::open");
-
-  if (ACE_SOCK::open (SOCK_STREAM,
-		      protocol_family,
-		      protocol,
-                      protocolinfo,
-                      g,
-                      flags,
-		      reuse_addr) == -1)
-    return -1;
-  else
-    return this->shared_open (local_sap,
-                              protocol_family,
-                              backlog);
+  ACE_UNUSED_ARG (local_sap);
+  ACE_UNUSED_ARG (protocolinfo);
+  ACE_UNUSED_ARG (g);
+  ACE_UNUSED_ARG (flags);
+  ACE_UNUSED_ARG (reuse_addr);
+  ACE_UNUSED_ARG (protocol_family);
+  ACE_UNUSED_ARG (backlog);
+  ACE_UNUSED_ARG (protocol);
+  ACE_NOTSUP_RETURN (-1);
 }
 
 ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
@@ -312,33 +274,55 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
 			 int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::open");
+  int error = 0;
 
   if (ACE_SOCK::open (SOCK_STREAM,
 		      protocol_family,
 		      protocol,
 		      reuse_addr) == -1)
-    return -1;
-  else
-    return this->shared_open (local_sap,
-                              protocol_family,
-                              backlog);
-}
+    error = 1;
 
-// General purpose routine for performing server ACE_SOCK creation.
+  else if (protocol_family == PF_INET)
+    {
+      sockaddr_in local_inet_addr;
+      ACE_OS::memset ((void *) &local_inet_addr,
+                      0,
+                      sizeof local_inet_addr);
 
-ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
-				      int reuse_addr,
-				      int protocol_family,
-				      int backlog,
-				      int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
-  if (this->open (local_sap,
-		  reuse_addr,
-		  protocol_family,
-		  backlog,
-		  protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
-		ASYS_TEXT ("%p\n"),
-		ASYS_TEXT ("ACE_SOCK_Acceptor")));
+      if (local_sap == ACE_Addr::sap_any)
+        {
+          local_inet_addr.sin_port = 0;
+          local_inet_addr.sin_addr.s_addr = htonl (INADDR_ANY);
+        }
+      else
+        local_inet_addr = *(sockaddr_in *) local_sap.get_addr ();
+
+      if (local_inet_addr.sin_port == 0)
+        {
+          if (ACE::bind_port (this->get_handle (),
+                              local_inet_addr.sin_addr.s_addr) == -1)
+            error = 1;
+        }
+      else
+        {
+          if (ACE_OS::bind (this->get_handle (),
+                            ACE_reinterpret_cast (sockaddr *,
+						  &local_inet_addr),
+                            sizeof local_inet_addr) == -1)
+            error = 1;
+        }
+    }
+  else if (ACE_OS::bind (this->get_handle (),
+			 (sockaddr *) local_sap.get_addr (),
+                         local_sap.get_size ()) == -1)
+    error = 1;
+
+  if (error || ACE_OS::listen (this->get_handle (),
+			       backlog) == -1)
+    {
+      error = 1;
+      this->close ();
+    }
+
+  return error ? -1 : 0;
 }
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index 3d2c236c540..e86ba1e8522 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -47,9 +47,6 @@ public:
                      int backlog = ACE_DEFAULT_BACKLOG,
                      int protocol = 0);
   // Initialize a passive-mode BSD-style acceptor socket (no QoS).
-  // <local_sap> is the address that we're going to listen for
-  // connections on.  If <reuse_addr> is 1 then we'll use the
-  // <SO_REUSEADDR> to reuse this address.
 
   ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
                      ACE_Protocol_Info *protocolinfo,
@@ -68,10 +65,7 @@ public:
             int backlog = ACE_DEFAULT_BACKLOG,
             int protocol = 0);
   // Initialize a passive-mode BSD-style acceptor socket (no QoS).
-  // <local_sap> is the address that we're going to listen for
-  // connections on.  If <reuse_addr> is 1 then we'll use the
-  // <SO_REUSEADDR> to reuse this address.  Returns 0 on success and
-  // -1 on failure.
+  // Returns 0 on success and -1 on failure.
 
   int open (const ACE_Addr &local_sap,
             ACE_Protocol_Info *protocolinfo,
@@ -131,13 +125,6 @@ protected:
   // Perform operations that must occur after <ACE_OS::accept> is
   // called.
 
-  int shared_open (const ACE_Addr &local_sap,
-                   int protocol_family,
-                   int backlog);
-  // This method factors out the common <open> code and is called by
-  // both the QoS-enabled <open> method and the BSD-style <open>
-  // method.
-
 private:
   int get_remote_addr (ACE_Addr &) const;
   // Do not allow this function to percolate up to this interface...
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp
index 49ecdb8a8f7..f5f1ab00077 100644
--- a/ace/SOCK_Connector.cpp
+++ b/ace/SOCK_Connector.cpp
@@ -21,62 +21,25 @@ ACE_SOCK_Connector::dump (void) const
 }
 
 int
-ACE_SOCK_Connector::shared_open (ACE_SOCK_Stream &new_stream,
-                                 int protocol_family,
-                                 int protocol,
-                                 int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Connector::shared_open");
-
-  // Only open a new socket if we don't already have a valid handle.
-  if (new_stream.get_handle () == ACE_INVALID_HANDLE
-      && new_stream.open (SOCK_STREAM,
-			  protocol_family,
-			  protocol,
-			  reuse_addr) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-int
-ACE_SOCK_Connector::shared_open (ACE_SOCK_Stream &new_stream,
-                                 int protocol_family,
-                                 int protocol,
-                                 ACE_Protocol_Info *protocolinfo,
-                                 ACE_SOCK_GROUP g,
-                                 u_long flags,
-                                 int reuse_addr)
+ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream,
+					  ACE_Time_Value *timeout,
+					  const ACE_Addr &local_sap,
+					  int reuse_addr,
+					  int protocol_family,
+					  int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Connector::shared_open");
-
+  ACE_TRACE ("ACE_SOCK_Connector::shared_connect_start");
   // Only open a new socket if we don't already have a valid handle.
   if (new_stream.get_handle () == ACE_INVALID_HANDLE
       && new_stream.open (SOCK_STREAM,
 			  protocol_family,
 			  protocol,
-                          protocolinfo,
-                          g,
-                          flags,
 			  reuse_addr) == -1)
     return -1;
-  else
-    return 0;
-}
-
-int
-ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream,
-					  ACE_Time_Value *timeout,
-					  const ACE_Addr &local_sap)
-{
-  ACE_TRACE ("ACE_SOCK_Connector::shared_connect_start");
-
-  if (local_sap != ACE_Addr::sap_any)
+  else if (local_sap != ACE_Addr::sap_any)
     {
-      sockaddr *laddr = ACE_reinterpret_cast (sockaddr *,
-                                              local_sap.get_addr ());
+      sockaddr *laddr = (sockaddr *) local_sap.get_addr ();
       size_t size = local_sap.get_size ();
-
       if (ACE_OS::bind (new_stream.get_handle (),
 			laddr,
 			size) == -1)
@@ -89,8 +52,7 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream,
     }
 
   // Enable non-blocking, if required.
-  if (timeout != 0 
-      && new_stream.enable (ACE_NONBLOCK) == -1)
+  if (timeout != 0 && new_stream.enable (ACE_NONBLOCK) == -1)
     return -1;
   else
     return 0;
@@ -111,8 +73,7 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
       if (error == EINPROGRESS || error == EWOULDBLOCK)
 	{
 	  // This expression checks if we were polling.
-	  if (timeout->sec () == 0 
-              && timeout->usec () == 0)
+	  if (timeout->sec () == 0 && timeout->usec () == 0)
 	    error = EWOULDBLOCK;
 	  // Wait synchronously using timeout.
 	  else if (this->complete (new_stream,
@@ -134,7 +95,6 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
 
   return result;
 }
-
 // Actively connect and produce a new ACE_SOCK_Stream if things go well...
 
 int
@@ -149,19 +109,16 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
 			     int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Connector::connect");
-  if (this->shared_open (new_stream,
-                         protocol_family,
-                         protocol,
-                         reuse_addr) == -1)
-    return -1;
-  else if (this->shared_connect_start (new_stream,
-                                       timeout,
-                                       local_sap) == -1)
+  if (this->shared_connect_start (new_stream,
+				  timeout,
+				  local_sap,
+				  reuse_addr,
+				  protocol_family,
+				  protocol) == -1)
     return -1;
 
   int result = ACE_OS::connect (new_stream.get_handle (),
-				ACE_reinterpret_cast (sockaddr *,
-                                                      remote_sap.get_addr ()),
+				(sockaddr *) remote_sap.get_addr (),
 				remote_sap.get_size ());
 
   return this->shared_connect_finish (new_stream,
@@ -175,31 +132,25 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
 			     ACE_QoS_Params qos_params,
 			     ACE_Time_Value *timeout,
 			     const ACE_Addr &local_sap,
-                             ACE_Protocol_Info * protocolinfo,
-                             ACE_SOCK_GROUP g,
-			     u_long flags,
+                             ACE_Protocol_Info * /* protocolinfo */,
+                             ACE_SOCK_GROUP /* g */,
+			     u_long /* flags */,
 			     int reuse_addr,
 			     int /* perms */,
 			     int protocol_family,
 			     int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Connector::connect");
-  if (this->shared_open (new_stream,
-                         protocol_family,
-                         protocol,
-                         protocolinfo,
-                         g,
-                         flags,
-                         reuse_addr) == -1)
-    return -1;
-  else if (this->shared_connect_start (new_stream,
-                                       timeout,
-                                       local_sap) == -1)
+  if (this->shared_connect_start (new_stream,
+				  timeout,
+				  local_sap,
+				  reuse_addr,
+				  protocol_family,
+				  protocol) == -1)
     return -1;
 
   int result = ACE_OS::connect (new_stream.get_handle (),
-				ACE_reinterpret_cast (sockaddr *,
-                                                      remote_sap.get_addr ()),
+				(sockaddr *) remote_sap.get_addr (),
 				remote_sap.get_size (),
 				qos_params);
 
@@ -218,8 +169,8 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
   ACE_TRACE ("ACE_SOCK_Connector::complete");
 #if defined (ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS)
   // Win32 has a timing problem - if you check to see if the
-  // connection has completed too fast, it will fail - so wait
-  // <ACE_NON_BLOCKING_BUG_DELAY> microseconds to let it catch up.
+  // connection has completed too fast, it will fail - so wait 1
+  // millisecond to let it catch up.
   ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY);
   ACE_OS::sleep (time);
 #endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */
@@ -236,8 +187,8 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
   else if (remote_sap != 0)
     {
       int len = remote_sap->get_size ();
-      sockaddr *addr = ACE_reinterpret_cast (sockaddr *,
-                                             remote_sap->get_addr ());
+      sockaddr *addr = (sockaddr *) remote_sap->get_addr ();
+
       if (ACE_OS::getpeername (h,
 			       addr,
 			       &len) == -1)
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index b2d3957f377..6d4387239b6 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -172,26 +172,12 @@ public:
   // Declare the dynamic allocation hooks.
 
 protected:
-  int shared_open (ACE_SOCK_Stream &new_stream,
-                   int protocol_family, 
-                   int protocol,
-                   int reuse_addr);
-  // Perform operations that ensure the socket is opened using
-  // BSD-style semantics (no QoS).
-
-  int shared_open (ACE_SOCK_Stream &new_stream,
-                   int protocol_family,
-                   int protocol,
-                   ACE_Protocol_Info *protocolinfo,
-                   ACE_SOCK_GROUP g,
-                   u_long flags,
-                   int reuse_addr);
-  // Perform operations that ensure the socket is opened using
-  // QoS-enabled semantics.
-
   int shared_connect_start (ACE_SOCK_Stream &new_stream,
 			    ACE_Time_Value *timeout,
-			    const ACE_Addr &local_sap);
+			    const ACE_Addr &local_sap,
+			    int reuse_addr,
+			    int protocol_family, 
+			    int protocol);
   // Perform operations that must be called before <ACE_OS::connect>.
 
   int shared_connect_finish (ACE_SOCK_Stream &new_stream,
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index 497392a3cd2..2c12b6eadd9 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -100,24 +100,58 @@ ACE_SOCK_Dgram::shared_open (const ACE_Addr &local,
   ACE_TRACE ("ACE_SOCK_Dgram::shared_open");
   int error = 0;
 
-  if (local == ACE_Addr::sap_any 
-      && protocol_family == PF_INET)
+  if (local == ACE_Addr::sap_any && protocol_family == PF_INET)
     {
       if (ACE::bind_port (this->get_handle ()) == -1)
         error = 1;
     }
-  else if (ACE_OS::bind (this->get_handle (),
-                         ACE_reinterpret_cast (sockaddr *,
-                                               local.get_addr ()),
+  else if (ACE_OS::bind (this->get_handle (), (sockaddr *) local.get_addr (), 
                          local.get_size ()) == -1)
     error = 1;
 
-  if (error != 0)
+  if (error)
     this->close ();
 
   return error ? -1 : 0;
 }
 
+// Here's the general-purpose constructor used by a connectionless
+// datagram ``server''...
+
+ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, 
+                                int protocol_family, 
+                                int protocol,
+                                int reuse_addr)
+  : ACE_SOCK (SOCK_DGRAM, protocol_family, protocol, reuse_addr)
+{
+  ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram");
+
+  if (this->shared_open (local, protocol_family) == -1)
+    ACE_ERROR ((LM_ERROR,
+                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("ACE_SOCK_Dgram")));
+}
+
+ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, 
+                                const ACE_QoS_Params &qos_params,
+                                int protocol_family, 
+                                int protocol,
+                                ACE_Protocol_Info *protocolinfo,
+                                ACE_SOCK_GROUP g,
+                                u_long flags,
+                                int reuse_addr)
+  : ACE_SOCK (SOCK_DGRAM,
+              protocol_family,
+              protocol,
+              protocolinfo,
+              g,
+              flags,
+              reuse_addr)
+{
+  ACE_UNUSED_ARG (qos_params);
+  ACE_UNUSED_ARG (local);
+}
+
 int
 ACE_SOCK_Dgram::open (const ACE_Addr &local, 
                       const ACE_QoS_Params &qos_params,
@@ -128,26 +162,17 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local,
                       u_long flags,
                       int reuse_addr)
 {
-  if (ACE_SOCK::open (SOCK_DGRAM,
-                      protocol_family, 
-                      protocol,
-                      protocolinfo,
-                      g,
-                      flags,
-                      reuse_addr) == -1)
-    return -1;
-  else if (this->shared_open (local,
-                              protocol_family) == -1)
-    return -1;
-  else
-    // Pass the QoS parameters.
-    return ACE_OS::join_leaf (this->get_handle (),
-                              ACE_reinterpret_cast (const sockaddr *,
-                                                    local.get_addr ()),
-                              local.get_size (),
-                              qos_params) == ACE_INVALID_HANDLE
-      ? -1 
-      : 0;
+  ACE_UNUSED_ARG (local);
+  ACE_UNUSED_ARG (qos_params);
+  ACE_UNUSED_ARG (protocol_family);
+  ACE_UNUSED_ARG (protocol);
+  ACE_UNUSED_ARG (protocolinfo);
+  ACE_UNUSED_ARG (g);
+  ACE_UNUSED_ARG (flags);
+  ACE_UNUSED_ARG (reuse_addr);
+
+  // Under construction...
+  ACE_NOTSUP_RETURN (-1);
 }
 
 // Here's the general-purpose open routine.
@@ -169,48 +194,6 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local,
                               protocol_family);
 }
 
-// Here's the general-purpose constructor used by a connectionless
-// datagram ``server''...
-
-ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, 
-                                int protocol_family, 
-                                int protocol,
-                                int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram");
-
-  if (this->open (local,
-                  protocol_family,
-                  protocol,
-                  reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_SOCK_Dgram")));
-}
-
-ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, 
-                                const ACE_QoS_Params &qos_params,
-                                int protocol_family, 
-                                int protocol,
-                                ACE_Protocol_Info *protocolinfo,
-                                ACE_SOCK_GROUP g,
-                                u_long flags,
-                                int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram");
-  if (this->open (local,
-                  qos_params,
-                  protocol_family,
-                  protocol,
-                  protocolinfo,
-                  g,
-                  flags,
-                  reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_SOCK_Dgram")));
-}
-
 #if defined (ACE_HAS_MSG)
 // Send an iovec of size N to ADDR as a datagram (connectionless
 // version).
diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp
index 833e89ff404..061ab9f669d 100644
--- a/ace/SOCK_Dgram_Bcast.cpp
+++ b/ace/SOCK_Dgram_Bcast.cpp
@@ -1,5 +1,7 @@
+// SOCK_Dgram_Bcast.cpp
 // $Id$
 
+
 #define ACE_BUILD_DLL
 #include "ace/SOCK_Dgram_Bcast.h"
 
@@ -12,8 +14,8 @@ ACE_RCSID(ace, SOCK_Dgram_Bcast, "$Id$")
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Bcast)
 
 ACE_Bcast_Node::ACE_Bcast_Node (ACE_INET_Addr &addr,
-                                ACE_Bcast_Node *next)
-  : bcast_addr_ (addr),
+				ACE_Bcast_Node *next)
+  : bcast_addr_ (addr), 
     next_ (next)
 {
   ACE_TRACE ("ACE_Bcast_Node::ACE_Bcast_Node");
@@ -58,12 +60,12 @@ ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (void)
 // Here's the general-purpose constructor used by a connectionless
 // datagram ``server''...
 
-ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (const ACE_Addr &local,
-                                            int protocol_family,
-                                            int protocol,
-                                            int reuse_addr,
+ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, 
+					    int protocol_family, 
+					    int protocol,
+					    int reuse_addr,
                                             const ASYS_TCHAR *host_name)
-  : ACE_SOCK_Dgram (local, protocol_family, protocol, reuse_addr),
+  : ACE_SOCK_Dgram (local, protocol_family, protocol, reuse_addr), 
     if_list_ (0)
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast");
@@ -77,16 +79,16 @@ ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (const ACE_Addr &local,
 // Here's the general-purpose open routine.
 
 int
-ACE_SOCK_Dgram_Bcast::open (const ACE_Addr &local,
-                            int protocol_family,
-                            int protocol,
-                            int reuse_addr,
+ACE_SOCK_Dgram_Bcast::open (const ACE_Addr &local, 
+			    int protocol_family, 
+			    int protocol,
+			    int reuse_addr,
                             const ASYS_TCHAR *host_name)
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::open");
 
-  if (this->ACE_SOCK_Dgram::open (local, protocol_family,
-                                  protocol, reuse_addr) == -1)
+  if (this->ACE_SOCK_Dgram::open (local, protocol_family, 
+				  protocol, reuse_addr) == -1)
     return -1;
 
   return this->mk_broadcast (host_name);
@@ -103,8 +105,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ASYS_TCHAR *host_name)
 
   if (ACE_OS::setsockopt (this->get_handle (),
                           SOL_SOCKET,
-                          SO_BROADCAST,
-                          (char *) &one,
+                          SO_BROADCAST, 
+			  (char *) &one,
                           sizeof one) == -1)
     return -1;
 
@@ -122,9 +124,9 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ASYS_TCHAR *host_name)
   if (ACE_OS::ioctl (s,
                      SIOCGIFCONF,
                      (char *) &ifc) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n",
-                      "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface configuration)"),
-                      ACE_INVALID_HANDLE);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", 
+		      "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface configuration)"),
+		      ACE_INVALID_HANDLE);
 
   struct ifreq *ifr = ifc.ifc_req;
 
@@ -136,43 +138,44 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ASYS_TCHAR *host_name)
       hostent *hp = ACE_OS::gethostbyname (ASYS_MULTIBYTE_STRING (host_name));
 
       if (hp == 0)
-        return -1;
+	return -1;
       else
-#if defined(_UNICOS)
+#if !defined(_UNICOS)
+	ACE_OS::memcpy ((char *) &host_addr.sin_addr.s_addr, 
+			(char *) hp->h_addr, 
+			hp->h_length);
+#else /* _UNICOS */
         {
           ACE_UINT64 haddr;  // a place to put the address
           char * haddrp = (char *) &haddr;  // convert to char pointer
+          haddr += 4;   // adjust within the word
           ACE_OS::memcpy(haddrp,(char *) hp->h_addr,hp->h_length);
           host_addr.sin_addr.s_addr = haddr;
         }
-#else /* ! _UNICOS */
-        ACE_OS::memcpy ((char *) &host_addr.sin_addr.s_addr,
-                        (char *) hp->h_addr,
-                        hp->h_length);
 #endif /* ! _UNICOS */
     }
 
-  for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0; n--, ifr++)
+  for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0; n--, ifr++) 
     {
       // Compare host ip address with interface ip address.
       if (host_name)
         {
-          struct sockaddr_in if_addr;
+	  struct sockaddr_in if_addr;
 
           ACE_OS::memcpy (&if_addr,
                           &ifr->ifr_addr,
                           sizeof if_addr);
 
           if (host_addr.sin_addr.s_addr != if_addr.sin_addr.s_addr)
-            continue;
+	    continue;
         }
 
-      if (ifr->ifr_addr.sa_family != AF_INET)
-        {
-          ACE_ERROR ((LM_ERROR, "%p\n",
-                      "ACE_SOCK_Dgram_Bcast::mk_broadcast: Not AF_INET"));
-          continue;
-        }
+      if (ifr->ifr_addr.sa_family != AF_INET) 
+	{
+	  ACE_ERROR ((LM_ERROR, "%p\n", 
+		      "ACE_SOCK_Dgram_Bcast::mk_broadcast: Not AF_INET"));
+	  continue;
+	}
 
       struct ifreq flags = *ifr;
       struct ifreq if_req = *ifr;
@@ -180,46 +183,46 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ASYS_TCHAR *host_name)
       if (ACE_OS::ioctl (s,
                          SIOCGIFFLAGS,
                          (char *) &flags) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "%p\n",
-                     "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)"));
-          continue;
-        }
+	{
+	  ACE_ERROR ((LM_ERROR, "%p\n", 
+		     "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)"));
+	  continue;
+	}   
 
       if (ACE_BIT_ENABLED (flags.ifr_flags,
                            IFF_UP) == 0)
-        {
-          ACE_ERROR ((LM_ERROR, "%p\n",
-                     "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up"));
-          continue;
-        }
+	{
+	  ACE_ERROR ((LM_ERROR, "%p\n", 
+		     "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up"));
+	  continue;
+	}
 
       if (ACE_BIT_ENABLED (flags.ifr_flags,
                            IFF_LOOPBACK))
-        continue;
+	continue;
 
       if (ACE_BIT_ENABLED (flags.ifr_flags,
                            IFF_BROADCAST))
-        {
-          if (ACE_OS::ioctl (s,
+	{
+	  if (ACE_OS::ioctl (s,
                              SIOCGIFBRDADDR,
                              (char *) &if_req) == -1)
-            ACE_ERROR ((LM_ERROR, "%p\n",
-                       "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)"));
-          else
-            {
-              ACE_INET_Addr addr (ACE_reinterpret_cast (sockaddr_in *,
+	    ACE_ERROR ((LM_ERROR, "%p\n", 
+		       "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)"));
+	  else 
+	    {
+	      ACE_INET_Addr addr (ACE_reinterpret_cast (sockaddr_in *,
                                                         &if_req.ifr_broadaddr),
                                   sizeof if_req.ifr_broadaddr);
-              ACE_NEW_RETURN (this->if_list_,
+	      ACE_NEW_RETURN (this->if_list_,
                               ACE_Bcast_Node (addr,
                                               this->if_list_),
                               -1);
-            }
-        }
-      else
-        ACE_ERROR ((LM_ERROR, "%p\n",
-                   "ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface."));
+	    }
+	}
+      else 
+	ACE_ERROR ((LM_ERROR, "%p\n", 
+		   "ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface."));
     }
 #else
   ACE_UNUSED_ARG (host_name);
@@ -238,16 +241,16 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ASYS_TCHAR *host_name)
 // number of bytes sent.
 
 ssize_t
-ACE_SOCK_Dgram_Bcast::send (const void *buf,
-                            size_t n,
-                            u_short port_number,
-                            int flags) const
+ACE_SOCK_Dgram_Bcast::send (const void *buf, 
+			    size_t n,
+			    u_short port_number, 
+			    int flags) const
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::send");
   size_t iterations = 0;
   ssize_t total_bytes = 0;
 
-  if (this->if_list_ == 0)
+  if (this->if_list_ == 0) 
     return -1;
 
   for (ACE_Bcast_Node *temp = this->if_list_;
@@ -256,16 +259,16 @@ ACE_SOCK_Dgram_Bcast::send (const void *buf,
     {
       temp->bcast_addr_.set_port_number (port_number);
 
-      ssize_t bytes_sent = ACE_SOCK_Dgram::send (buf,
-                                                 n,
-                                                 temp->bcast_addr_,
-                                                 flags);
+      ssize_t bytes_sent = ACE_SOCK_Dgram::send (buf, 
+                                                 n, 
+						 temp->bcast_addr_, 
+						 flags);
 
       if (bytes_sent == -1)
-        return -1;
-      else
-        total_bytes += bytes_sent;
-
+	return -1;
+      else 
+	total_bytes += bytes_sent;
+	
       iterations++;
     }
 
@@ -276,21 +279,21 @@ ACE_SOCK_Dgram_Bcast::send (const void *buf,
 // Broadcast datagram to every interfaces.
 
 ssize_t
-ACE_SOCK_Dgram_Bcast::send (const iovec iov[],
-                            size_t n,
-                            u_short /* port_number */,
-                            int flags) const
+ACE_SOCK_Dgram_Bcast::send (const iovec iov[], 
+			    size_t n, 
+			    u_short /* port_number */,
+			    int flags) const
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::send");
 
   if (this->if_list_ == 0)
     return -1;
-
+  
   // Send the message to every interface.
 
   for (ACE_Bcast_Node *temp = this->if_list_;
        temp != 0;
-       temp++)
+       temp++) 
     if (ACE_SOCK_Dgram::send (iov,
                               n,
                               temp->bcast_addr_,
@@ -304,10 +307,10 @@ ACE_SOCK_Dgram_Bcast::send (const iovec iov[],
 // must be preassigned to the broadcast address of the subnet...).
 
 ssize_t
-ACE_SOCK_Dgram_Bcast::send (const iovec iov[],
-                            size_t n,
-                            const ACE_Addr &addr,
-                            int flags) const
+ACE_SOCK_Dgram_Bcast::send (const iovec iov[], 
+			    size_t n, 
+			    const ACE_Addr &addr, 
+			    int flags) const
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::send");
 
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index d9bbaca1524..0a184226281 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -6,7 +6,7 @@
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK_Dgram_Mcast.i"
-#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+#endif
 
 ACE_RCSID(ace, SOCK_Dgram_Mcast, "$Id$")
 
@@ -26,76 +26,16 @@ ACE_SOCK_Dgram_Mcast::ACE_SOCK_Dgram_Mcast (void)
 }
 
 int
-ACE_SOCK_Dgram_Mcast::open (const ACE_Addr &mcast_addr,
-                            int protocol_family,
-                            int protocol,
-                            int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::open");
-
-  // Make a copy of address to use in the <send> methods.
-  // Note: Sun C++ 4.2 needs the useless const_cast.
-  this->mcast_addr_.set (ACE_reinterpret_cast (const ACE_INET_Addr &,
-                                               ACE_const_cast (ACE_Addr &,
-                                                               mcast_addr)));
-
-  // Only perform the <open> initialization if we haven't been opened
-  // earlier.
-  if (this->get_handle () == ACE_INVALID_HANDLE)
-    {
-      if (ACE_SOCK::open (SOCK_DGRAM,
-                          protocol_family,
-                          protocol,
-                          reuse_addr) == -1)
-        return -1;
-
-      int one = 1;
-      if (reuse_addr
-          && this->ACE_SOCK::set_option (SOL_SOCKET,
-                                         SO_REUSEADDR,
-                                         &one,
-                                         sizeof one) == -1)
-        return -1;
-#if defined (SO_REUSEPORT)
-      else if (this->ACE_SOCK::set_option (SOL_SOCKET,
-                                           SO_REUSEPORT,
-                                           &one,
-                                           sizeof one) == -1)
-        return -1;
-#endif /* SO_REUSEPORT */
-
-      // Create an address to bind the socket to.
-      ACE_INET_Addr local;
-
-      if (local.set (this->mcast_addr_.get_port_number ()) == -1)
-        return -1;
-      else if (ACE_SOCK_Dgram::shared_open (local,
-                                            protocol_family) == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
-int
-ACE_SOCK_Dgram_Mcast::open (const ACE_Addr &mcast_addr,
-                            const ACE_QoS_Params &qos_params,
-                            int protocol_family,
-                            int protocol,
-                            ACE_Protocol_Info *protocolinfo,
-                            ACE_SOCK_GROUP g,
-                            u_long flags,
-                            int reuse_addr)
+ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
+                                   int reuse_addr,
+                                   const ASYS_TCHAR *net_if,
+                                   int protocol_family,
+                                   int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::open");
-
-  ACE_UNUSED_ARG (qos_params);
+  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_i");
 
   // Make a copy of address to use in the <send> methods.
-  // Note: Sun C++ 4.2 needs the useless const_cast.
-  this->mcast_addr_.set (ACE_reinterpret_cast (const ACE_INET_Addr &,
-                                               ACE_const_cast (ACE_Addr &,
-                                                               mcast_addr)));
+  this->mcast_addr_.set (mcast_addr);
 
   // Only perform the <open> initialization if we haven't been opened
   // earlier.
@@ -104,9 +44,6 @@ ACE_SOCK_Dgram_Mcast::open (const ACE_Addr &mcast_addr,
       if (ACE_SOCK::open (SOCK_DGRAM,
                           protocol_family,
                           protocol,
-                          protocolinfo,
-                          g,
-                          flags,
                           reuse_addr) == -1)
         return -1;
 
@@ -118,10 +55,10 @@ ACE_SOCK_Dgram_Mcast::open (const ACE_Addr &mcast_addr,
                                          sizeof one) == -1)
         return -1;
 #if defined (SO_REUSEPORT)
-      else if (this->ACE_SOCK::set_option (SOL_SOCKET,
-                                           SO_REUSEPORT,
-                                           &one,
-                                           sizeof one) == -1)
+      if (this->ACE_SOCK::set_option (SOL_SOCKET,
+                                      SO_REUSEPORT,
+                                      &one,
+                                      sizeof one) == -1)
         return -1;
 #endif /* SO_REUSEPORT */
 
@@ -134,18 +71,6 @@ ACE_SOCK_Dgram_Mcast::open (const ACE_Addr &mcast_addr,
                                             protocol_family) == -1)
         return -1;
     }
-
-  return 0;
-}
-
-int
-ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                                     const ASYS_TCHAR *net_if,
-                                     int protocol_family,
-                                     int protocol,
-                                     int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_ifs");
 #if defined (ACE_WIN32)
   // Windows NT's winsock has trouble with multicast subscribes in the
   // presence of multiple network interfaces when the IP address is
@@ -214,109 +139,8 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
       else
         return 1;
     }
-#else
-  ACE_UNUSED_ARG (mcast_addr);
-  ACE_UNUSED_ARG (protocol_family);
-  ACE_UNUSED_ARG (protocol);
-  ACE_UNUSED_ARG (reuse_addr);
+  // else do it like everyone else...
 #endif /* ACE_WIN32 */
-  // Otherwise, do it like everyone else...
-
-  // Create multicast request.
-  if (this->make_multicast_address (this->mcast_addr_,
-                                    net_if) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-int
-ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                                     const ACE_QoS_Params &qos_params,
-                                     const ASYS_TCHAR *net_if,
-                                     int protocol_family,
-                                     int protocol,
-                                     int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_ifs");
-#if defined (ACE_WIN32)
-  // Windows NT's winsock has trouble with multicast subscribes in the
-  // presence of multiple network interfaces when the IP address is
-  // given as INADDR_ANY.  It will pick the first interface and only
-  // accept mcast there.  So, to work around this, cycle through all
-  // of the interfaces known and subscribe to all the non-loopback
-  // ones.
-  //
-  // Note that this only needs to be done on NT, but there's no way to
-  // tell at this point if the code will be running on NT - only if it
-  // is compiled for NT-only or for NT/95, and that doesn't really
-  // help us.  It doesn't hurt to do this on Win95, it's just a little
-  // slower than it normally would be.
-  //
-  // NOTE - <ACE::get_ip_interfaces> doesn't always get all of the
-  // interfaces.  In particular, it may not get a PPP interface.  This
-  // is a limitation of the way <ACE::get_ip_interfaces> works with
-  // MSVC.  The reliable way of getting the interface list is
-  // available only with MSVC 5.
-
-  if (net_if == 0)
-    {
-      ACE_INET_Addr *if_addrs = 0;
-      size_t if_cnt;
-
-      if (ACE::get_ip_interfaces (if_cnt,
-                                  if_addrs) != 0)
-        return -1;
-
-      size_t nr_subscribed = 0;
-
-      if (if_cnt < 2)
-        {
-          if (this->subscribe (mcast_addr,
-                               qos_params,
-                               reuse_addr,
-                               ASYS_TEXT ("0.0.0.0"),
-                               protocol_family,
-                               protocol) == 0)
-            ++nr_subscribed;
-        }
-      else
-        // Iterate through all the interfaces, figure out which ones
-        // offer multicast service, and subscribe to them.
-        while (if_cnt > 0)
-          {
-            --if_cnt;
-
-            // Convert to 0-based for indexing, next loop check.
-            if (if_addrs[if_cnt].get_ip_address() == INADDR_LOOPBACK)
-              continue;
-            if (this->subscribe (mcast_addr,
-                                 qos_params,
-                                 reuse_addr,
-                                 ASYS_WIDE_STRING (if_addrs[if_cnt].get_host_addr()),
-                                 protocol_family,
-                                 protocol) == 0)
-              ++nr_subscribed;
-          }
-
-      delete [] if_addrs;
-
-      if (nr_subscribed == 0)
-        {
-          errno = ENODEV;
-          return -1;
-        }
-      else
-        return 1;
-    }
-#else
-  ACE_UNUSED_ARG (mcast_addr);
-  ACE_UNUSED_ARG (qos_params);
-  ACE_UNUSED_ARG (protocol_family);
-  ACE_UNUSED_ARG (protocol);
-  ACE_UNUSED_ARG (reuse_addr);
-#endif /* ACE_WIN32 */
-  // Otherwise, do it like everyone else...
 
   // Create multicast request.
   if (this->make_multicast_address (this->mcast_addr_,
@@ -333,28 +157,19 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
                                  int protocol_family,
                                  int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe");
-
-  if (this->open (mcast_addr,
-                  protocol_family,
-                  protocol,
-                  reuse_addr) == -1)
-    return -1;
-
-  int result = this->subscribe_ifs (mcast_addr,
-                                    net_if,
-                                    protocol_family,
-                                    protocol,
-                                    reuse_addr);
-  // Check for the "short-circuit" return value of 1 (for NT).
-  if (result != 0)
-    return result;
-
-  // Create multicast request.
-  else if (this->make_multicast_address (this->mcast_addr_,
-                                         net_if) == -1)
+  int result = this->subscribe_i (mcast_addr,
+                                  reuse_addr,
+                                  net_if,
+                                  protocol_family,
+                                  protocol);
+  // Check for the error case.
+  if (result == -1)
     return -1;
-
+#if defined (ACE_WIN32)
+  // Check for the "short-circuit" return value (for NT).
+  else if (result == 1)
+    return 0;
+#endif /* ACE_WIN32 */
   // Tell network device driver to read datagrams with a
   // multicast_address IP interface.
   else if (this->ACE_SOCK::set_option (IPPROTO_IP,
@@ -374,25 +189,22 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
                                  int protocol_family,
                                  int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe");
-
-  if (this->open (mcast_addr,
-                  protocol_family,
-                  protocol,
-                  reuse_addr) == -1)
+  int result = this->subscribe_i (mcast_addr,
+                                  reuse_addr,
+                                  net_if,
+                                  protocol_family,
+                                  protocol);
+  // Check for the error case.
+  if (result == -1)
     return -1;
+#if defined (ACE_WIN32)
+  // @@ Note that this code is currently broken since <subscribe_i>
+  // calls the wrong version of subscribe recursively!
 
-  // The following method call only applies to Win32 currently.
-  int result = this->subscribe_ifs (mcast_addr,
-                                    qos_params,
-                                    net_if,
-                                    protocol_family,
-                                    protocol,
-                                    reuse_addr);
-  // Check for the "short-circuit" return value of 1 (for NT).
-  if (result != 0)
-    return result;
-
+  // Check for the "short-circuit" return value (for NT).
+  else if (result == 1)
+    return 0;
+#endif /* ACE_WIN32 */
   // Tell network device driver to read datagrams with a
   // <mcast_request_if_> IP interface.
   else if (ACE_OS::join_leaf (this->get_handle (),
@@ -412,12 +224,12 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
 }
 
 int
-ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                                       const ASYS_TCHAR *net_if,
-                                       int protocol_family,
-                                       int protocol)
+ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr,
+                                     const ASYS_TCHAR *net_if,
+                                     int protocol_family,
+                                     int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe_ifs");
+  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe_i");
 #if defined (ACE_WIN32)
   // Windows NT's winsock has trouble with multicast subscribes in the
   // presence of multiple network interfaces when the IP address is
@@ -481,14 +293,13 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
 
       return 1;
     }
-#else
+  // else do it like everyone else...
+#endif /* ACE_WIN32 */
+
   ACE_UNUSED_ARG (protocol_family);
   ACE_UNUSED_ARG (protocol);
-#endif /* ACE_WIN32 */
-  // Otherwise, do it like everyone else.
 
   ip_mreq multicast_address;
-
   // Create multicast request.
   if (this->make_multicast_address_i (mcast_addr,
                                       multicast_address,
@@ -505,24 +316,27 @@ ACE_SOCK_Dgram_Mcast::unsubscribe (const ACE_INET_Addr &mcast_addr,
                                    int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe");
-  int result = this->unsubscribe_ifs (mcast_addr,
-                                      net_if,
-                                      protocol_family,
-                                      protocol);
-
-  // Check for the "short-circuit" return value of 1 (for NT).
-  if (result != 0)
-    return result;
+  int result = this->unsubscribe_i (mcast_addr,
+                                    net_if,
+                                    protocol_family,
+                                    protocol);
 
-  // Tell network device driver to stop reading datagrams with the
-  // <mcast_addr>.
+  // Check for error return and bail out.
+  if (result == -1)
+    return -1;
+#if defined (ACE_WIN32)
+  // Check for the "short-circuit" return value (for NT).
+  else if (result == 1)
+    return 0;
+#endif /* ACE_WIN32 */
+  // Tell network device driver to read datagrams with a
+  // multicast_address address.
   else if (ACE_SOCK::set_option (IPPROTO_IP,
                                  IP_DROP_MEMBERSHIP,
                                  &this->mcast_request_if_,
                                  sizeof this->mcast_request_if_) == -1)
     return -1;
-  else
-    return 0;
+  return 0;
 }
 
 int
@@ -551,7 +365,7 @@ ACE_SOCK_Dgram_Mcast::make_multicast_address_i (const ACE_INET_Addr &mcast_addr,
       multicast_address.imr_interface.s_addr =
         htonl (interface_addr.get_ip_address ());
 #else
-      ifreq if_address;
+      struct ifreq if_address;
 
 #if defined (ACE_PSOS)
       // Look up the interface by number, not name.
@@ -565,7 +379,7 @@ ACE_SOCK_Dgram_Mcast::make_multicast_address_i (const ACE_INET_Addr &mcast_addr,
                          &if_address) == -1)
         return -1;
 
-      sockaddr_in *socket_address;
+      struct sockaddr_in *socket_address;
       socket_address = ACE_reinterpret_cast(sockaddr_in *,
                                             &if_address.ifr_addr);
       multicast_address.imr_interface.s_addr = socket_address->sin_addr.s_addr;
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index e09199b0f81..b74db60e6da 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -134,50 +134,27 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  // = Disable public <open> methods to ensure class used properly.
-
-  int open (const ACE_Addr &mcast_addr,
-            int protocol_family = PF_INET,
-            int protocol = 0,
-            int reuse_addr = 0);
-  // Not publically visible.
-
-  int open (const ACE_Addr &mcast_addr,
-            const ACE_QoS_Params &qos_params,
-            int protocol_family = PF_INET,
-            int protocol = 0,
-            ACE_Protocol_Info *protocolinfo = 0,
-            ACE_SOCK_GROUP g = 0,
-            u_long flags = 0,
-            int reuse_addr = 0);
-  // Not publically visible.
-
-  int subscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                     const ASYS_TCHAR *net_if,
-                     int protocol_family,
-                     int protocol,
-                     int reuse_addr);
-  // Subscribe to the multicast interface using BSD-style semantics
-  // (no QoS).
-
-  int subscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                     const ACE_QoS_Params &qos_params,
-                     const ASYS_TCHAR *net_if,
-                     int protocol_family,
-                     int protocol,
-                     int reuse_addr);
-  // Subscribe to the multicast interface using QoS-enabled semantics.
-
-  int unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                       const ASYS_TCHAR *net_if = 0,
-                       int protocol_family = PF_INET,
-                       int protocol = 0);
-  // Unsubscribe to multicast interfaces subscribed to previously by
-  // <subscribe_ifs>.
-
-  // = Disable public use of <ACE_SOCK_Dgram::send>s 
-
-  // This forces <ACE_SOCK_Dgram_Mcast::send>s inline.
+  ACE_HANDLE open (const ACE_Addr &local,
+                   int protocol_family = PF_INET,
+                   int protocol = 0);
+  // Disable public use of <ACE_SOCK_Dgram::open> to ensure the class
+  // is used properly.
+
+  int subscribe_i (const ACE_INET_Addr &mcast_addr,
+		   int reuse_addr = 1,
+		   const ASYS_TCHAR *net_if = 0,
+		   int protocol_family = PF_INET,
+		   int protocol = 0);
+  // Implementation method of <subscribe>.
+
+  int unsubscribe_i (const ACE_INET_Addr &mcast_addr,
+		     const ASYS_TCHAR *net_if = 0,
+		     int protocol_family = PF_INET,
+		     int protocol = 0);
+  // Implementation method of <unsubscribe>.
+
+  // = Disable public use of <ACE_SOCK_Dgram::send>s and force
+  // <ACE_SOCK_Dgram_Mcast::send>s inline.
   ssize_t send (const void *buf,
                 size_t n,
                 const ACE_Addr &addr,
diff --git a/ace/SOCK_Dgram_Mcast.i b/ace/SOCK_Dgram_Mcast.i
index ddbbe3cfc4f..1d0e6e8004e 100644
--- a/ace/SOCK_Dgram_Mcast.i
+++ b/ace/SOCK_Dgram_Mcast.i
@@ -1,6 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
+// SOCK_Dgram_Mcast.i
+
 ASYS_INLINE
 ACE_SOCK_Dgram_Mcast::~ACE_SOCK_Dgram_Mcast (void)
 {
@@ -11,17 +13,13 @@ ACE_SOCK_Dgram_Mcast::set_option (int option,
 				  char optval) 
 { 
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::set_option");
-#if defined (ACE_WIN32)
-  int sock_opt = optval;
-  return this->ACE_SOCK::set_option (IPPROTO_IP,
-                                     option, 
-				     &sock_opt,
-                                     sizeof (sock_opt));
+#if !defined (ACE_WIN32)
+  return this->ACE_SOCK::set_option (IPPROTO_IP, option, 
+				     &optval, sizeof (char));
 #else
-  return this->ACE_SOCK::set_option (IPPROTO_IP,
-                                     option, 
-				     &optval,
-                                     sizeof (optval));
+  int sock_opt = optval;
+  return this->ACE_SOCK::set_option (IPPROTO_IP, option, 
+				     &sock_opt, sizeof (sock_opt));
 #endif /* !ACE_WIN32 */  
 }
 
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 36024b8d57d..84d12bedf9a 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -3,14 +3,12 @@
 #define ACE_BUILD_DLL
 #include "ace/Malloc.h"
 #if !defined (ACE_HAS_WINCE)
-# include "ace/Service_Config.h"
+#  include "ace/Service_Config.h"
 #endif /* !ACE_HAS_WINCE */
 #include "ace/SString.h"
 #include "ace/Auto_Ptr.h"
 
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-# include "ace/streams.h"
-#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
+#include "ace/streams.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/SString.i"
diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp
index 66a9d70627c..fda7b6b1cb0 100644
--- a/ace/SV_Semaphore_Simple.cpp
+++ b/ace/SV_Semaphore_Simple.cpp
@@ -1,3 +1,4 @@
+// SV_Semaphore_Simple.cpp
 // $Id$
 
 /* -*- C++ -*- */
@@ -21,8 +22,8 @@ ACE_SV_Semaphore_Simple::dump (void) const
 
 int
 ACE_SV_Semaphore_Simple::control (int cmd,
-                                  int value,
-                                  u_short semnum) const
+				  int value,
+				  u_short semnum) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::control");
   if (this->internal_id_ == -1)
@@ -34,7 +35,7 @@ ACE_SV_Semaphore_Simple::control (int cmd,
       semctl_arg.val = value;
       return ACE_OS::semctl (this->internal_id_,
                              semnum,
-                             cmd,
+			     cmd,
                              semctl_arg);
     }
 }
@@ -73,15 +74,15 @@ ACE_SV_Semaphore_Simple::op (int val, u_short n, int flags) const
 
 int
 ACE_SV_Semaphore_Simple::open (key_t k,
-                               int flags,
-                               int initial_value,
-                               u_short n,
-                               int perms)
+			       int flags,
+			       int initial_value,
+			       u_short n,
+			       int perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::open");
   union semun ivalue;
 
-  if (k == IPC_PRIVATE || k == ACE_static_cast (key_t, ACE_INVALID_SEM_KEY))
+  if (k == IPC_PRIVATE || k == ACE_INVALID_SEM_KEY)
     return -1;
 
   ivalue.val = initial_value;
@@ -96,16 +97,16 @@ ACE_SV_Semaphore_Simple::open (key_t k,
   if (ACE_BIT_ENABLED (flags, IPC_CREAT))
     for (int i = 0; i < n; i++)
       if (ACE_OS::semctl (this->internal_id_, i, SETVAL, ivalue) == -1)
-        return -1;
+	return -1;
 
   return 0;
 }
 
 ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k,
-                                                  int flags,
-                                                  int initial_value,
-                                                  u_short n,
-                                                  int perms)
+						  int flags,
+						  int initial_value,
+						  u_short n,
+						  int perms)
   : key_ (k)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple");
@@ -128,7 +129,7 @@ ACE_SV_Semaphore_Simple::name_2_key (const char *name)
   if (name == 0)
     {
       errno = EINVAL;
-      return ACE_static_cast (key_t, ACE_INVALID_SEM_KEY);
+      return ACE_INVALID_SEM_KEY;
     }
 
   // Basically "hash" the values in the <name>.  This won't
@@ -142,10 +143,10 @@ ACE_SV_Semaphore_Simple::name_2_key (const char *name)
 
 int
 ACE_SV_Semaphore_Simple::open (const char *name,
-                               int flags,
-                               int initial_value,
-                               u_short n,
-                               int perms)
+			       int flags,
+			       int initial_value,
+			       u_short n,
+			       int perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::open");
 
@@ -160,15 +161,15 @@ ACE_SV_Semaphore_Simple::open (const char *name,
 }
 
 ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name,
-                                                  int flags,
-                                                  int initial_value,
-                                                  u_short n,
-                                                  int perms)
+						  int flags,
+						  int initial_value,
+						  u_short n,
+						  int perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple");
   if (this->open (name, flags, initial_value, n, perms) == -1)
     ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")));
+		ASYS_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")));
 }
 
 ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void)
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index 41ee8fe7e1f..c904b07820e 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -132,8 +132,7 @@ protected:
   int sem_number_;
   // Number of semaphores we're creating.
 
-  int init (key_t k = ACE_static_cast (key_t, ACE_INVALID_SEM_KEY),
-            int i = -1);
+  int init (key_t k = ACE_INVALID_SEM_KEY, int i = -1);
   key_t name_2_key (const char *name);
   // Convert name to key This function is used internally to create
   // keys for the semaphores. A valid name contains letters and
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index ab1b8f654ac..83f9d3d29eb 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -476,9 +476,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
    int disable_notify_pipe,
    ACE_Reactor_Notify *notify)
     : token_ (*this),
-      lock_adapter_ (token_),
-      deactivated_ (0)
-
+      lock_adapter_ (token_)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::ACE_Select_Reactor_T");
 
@@ -1168,7 +1166,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events
   ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1);
 
   if (ACE_OS::thr_equal (ACE_Thread::self (),
-                         this->owner_) == 0 || this->deactivated_)
+                         this->owner_) == 0)
     return -1;
 
   // Update the countdown to reflect time waiting for the mutex.
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index e4ee05b97ea..6c6a41e71e5 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -193,18 +193,6 @@ public:
   // Current <alertable_handle_events> is identical to
   // <handle_events>.
 
-  // = Event handling control.
-
-  virtual int deactivated (void);
-  // Return the status of Reactor.  If this function returns 0, the reactor is
-  // actively handling events.  If it returns non-zero, <handling_events> and
-  // <handle_alertable_events> return -1 immediately.
-
-  virtual void deactivate (int do_stop);
-  // Control whether the Reactor will handle any more incoming events or not.
-  // If <do_stop> == 1, the Reactor will be disabled.  By default, a reactor
-  // is in active state and can be deactivated/reactived as wish.
-
   // = Register and remove <ACE_Event_Handler>s.
   virtual int register_handler (ACE_Event_Handler *eh,
                                 ACE_Reactor_Mask mask);
@@ -612,9 +600,6 @@ protected:
   int handle_events_i (ACE_Time_Value *max_wait_time = 0);
   // Stops the VC++ compiler from bitching about exceptions and destructors
 
-  sig_atomic_t deactivated_;
-  // This flag is used to keep track of whether we are actively handling
-  // events or not.
 
 private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Select_Reactor_T (const ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN> &))
diff --git a/ace/Select_Reactor_T.i b/ace/Select_Reactor_T.i
index 9c447a5d50b..f394c01053b 100644
--- a/ace/Select_Reactor_T.i
+++ b/ace/Select_Reactor_T.i
@@ -219,19 +219,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::alertable_handle_events (ACE_Tim
   return this->handle_events (max_wait_time);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::deactivated (void)
-{
-  return this->deactivated_;
-}
-
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ void
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::deactivate (int do_stop)
-{
-  this->deactivated_ = do_stop;
-  this->wakeup_all_threads ();
-}
-
 template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ size_t
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::size (void)
 {
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 50cd504b45b..52a2ec4b190 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -536,11 +536,6 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
 {
   int result = 0;
   ACE_TRACE ("ACE_Service_Config::open");
-  ACE_Log_Msg *log_msg = ACE_LOG_MSG;
-
-  // Record the current log setting upon entering this thread.
-  int debugging_enabled =
-    log_msg->log_priority_enabled (LM_DEBUG);
 
   if (ACE_Service_Config::is_initialized_ != 0)
     // Guard against reentrant processing!
@@ -550,7 +545,8 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
 
   if (ACE_Service_Config::init_svc_conf_file_queue () == -1)
     return -1;
-  else if (!ignore_default_svc_conf_file
+
+  if (!ignore_default_svc_conf_file
       && ACE_Service_Config::svc_conf_file_queue_->is_empty ()
       // Load the default "svc.conf" entry here if there weren't
       // overriding -f arguments in <parse_args>.
@@ -561,19 +557,15 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
                        "enqueue_tail"),
                       -1);
 
-  // If -d was included as a startup parameter, the user wants debug
-  // information printed during service initialization.
+  // Clear the LM_DEBUG bit from log messages if appropriate.  This
+  // will be reset at the bottom of this function.
   if (ACE::debug ())
-    ACE_Log_Msg::enable_debug_messages ();
-  else 
-    // The user has requested no debugging info.
     ACE_Log_Msg::disable_debug_messages ();
-
   // Become a daemon before doing anything else.
   if (ACE_Service_Config::be_a_daemon_)
     ACE_Service_Config::start_daemon ();
 
-  u_long flags = log_msg->flags ();
+  u_long flags = ACE_LOG_MSG->flags ();
 
   if (flags == 0)
     // Only use STDERR if the caller hasn't already set the flags.
@@ -587,9 +579,9 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
     // equal to the default static logger key.
     key = ACE_Service_Config::logger_key_;
 
-  if (log_msg->open (program_name,
-                     flags,
-                     key) == -1)
+  if (ACE_LOG_MSG->open (program_name,
+                         flags,
+                         key) == -1)
     result = -1;
   else
     {
@@ -611,16 +603,15 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
         result = -1;
       else
         {
-          int result =
-            ACE_Service_Config::process_commandline_directives ();
-          result =
-            ACE_Service_Config::process_directives () + result;
+          int result = ACE_Service_Config::process_commandline_directives ();
+          result = ACE_Service_Config::process_directives () + result;
         }
 
-      // There's no point in dealing with this on NT since it doesn't
-      // really support signals very well...
+      // There's no point in dealing with this on NT since it doesn't really
+      // support signals very well...
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
-      // @@ This really ought to be a Singleton.
+      // This really ought to be a Singleton I suspect...
+
       if (ACE_Reactor::instance ()->register_handler
           (ACE_Service_Config::signum_,
            ACE_Service_Config::signal_handler_) == -1)
@@ -631,13 +622,8 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
 
   ace_yy_delete_parse_buffer ();
 
-  // Reset debugging back to the way it was when we came into into
-  // <open_i>.
-  if (debugging_enabled)
+  if (ACE::debug ())
     ACE_Log_Msg::enable_debug_messages ();
-   else 
-     // Debugging was off when we entered <open_i>.
-    ACE_Log_Msg::disable_debug_messages ();
 
   return result;
 }
@@ -647,8 +633,7 @@ ACE_Service_Config::ACE_Service_Config (const ASYS_TCHAR program_name[],
 {
   ACE_TRACE ("ACE_Service_Config::ACE_Service_Config");
 
-  if (this->open (program_name, 
-                  logger_key) == -1
+  if (this->open (program_name, logger_key) == -1
       && errno != ENOENT)
     // Only print out an error if it wasn't the svc.conf file that was
     // missing.
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index de6e960da81..2c991865674 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -91,16 +91,12 @@ class ACE_Export ACE_Service_Config
   //     configuration of services.
   //
   // = DESCRIPTION
-  //     The <ACE_Service_Config> uses the Monostate pattern.  Therefore,
-  //     you can only have one of these instantiated per-process.
-  // 
   //     NOTE: the signal_handler_ static member is allocated by the
-  //     <ACE_Object_Manager>.  The <ACE_Service_Config> constructor
-  //     uses signal_handler_.  Therefore, if the program has any
-  //     static <ACE_Service_Config> objects, there might be
-  //     initialization order problems.  They can be minimized, but
-  //     not eliminated, by _not_ #defining
-  //     ACE_HAS_NONSTATIC_OBJECT_MANAGER.
+  //     ACE_Object_Manager.  The ACE_Service_Config constructor uses
+  //     signal_handler_.  Therefore, if the program has any static
+  //     ACE_Service_Config objects, there might be initialization
+  //     order problems.  They can be minimized, but not eliminated,
+  //     by _not_ #defining ACE_HAS_NONSTATIC_OBJECT_MANAGER.
 public:
   enum {MAX_SERVICES = ACE_DEFAULT_SELECT_REACTOR_SIZE};
 
diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index 3e49485f5f7..d22733c872d 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -103,8 +103,7 @@ ACE_Service_Manager::init (int argc, ASYS_TCHAR *argv[])
          break;
        }
 
-  if (this->get_handle () == ACE_INVALID_HANDLE &&
-      this->open (local_addr) == -1)
+  if (this->open (local_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ASYS_TEXT ("%p\n"),
                        ASYS_TEXT ("open")), -1);
@@ -129,17 +128,11 @@ ACE_Service_Manager::fini (void)
 {
   ACE_TRACE ("ACE_Service_Manager::fini");
 
-  int retv = 0;
   if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      retv = ACE_Reactor::instance ()->remove_handler
-        (this,
-         ACE_Event_Handler::ACCEPT_MASK |
-         ACE_Event_Handler::DONT_CALL);
-      this->handle_close (ACE_INVALID_HANDLE,
-                          ACE_Event_Handler::NULL_MASK);
-    }
-  return retv;
+    return ACE_Reactor::instance ()->remove_handler
+      (this,
+       ACE_Event_Handler::ACCEPT_MASK);
+  return 0;
 }
 
 ACE_HANDLE
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp
index 4aaf6be5e14..6dc4def40c4 100644
--- a/ace/Singleton.cpp
+++ b/ace/Singleton.cpp
@@ -68,7 +68,9 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void)
           // ACE_Object_Manager:  we'll have to leak this instance.
 #endif /* ACE_MT_SAFE */
 
-          ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0);
+          ACE_NEW_RETURN (singleton,
+                          (ACE_Singleton<TYPE,
+                           ACE_LOCK>), 0);
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
         }
       else
@@ -85,8 +87,9 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void)
 
           if (singleton == 0)
             {
-              ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0);
-
+              ACE_NEW_RETURN (singleton,
+                              (ACE_Singleton<TYPE, ACE_LOCK>),
+                              0);
               // Register for destruction with ACE_Object_Manager.
               ACE_Object_Manager::at_exit (singleton);
             }
@@ -108,99 +111,9 @@ ACE_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
 // Pointer to the Singleton instance.
 template <class TYPE, class ACE_LOCK> ACE_Singleton<TYPE, ACE_LOCK> *
 ACE_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
-
-template <class TYPE, class ACE_LOCK> ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
 #endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */
 
 template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void)
-{
-  ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump");
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("instance_ = %x"),
-              ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK>
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i (void)
-{
-#if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  // Pointer to the Singleton instance.  This works around a bug with
-  // G++ and it's (mis-)handling of templates and statics...
-  static ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *singleton_ = 0;
-
-  return singleton_;
-#else
-  return ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::singleton_;
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK> TYPE *
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance (void)
-{
-  ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance");
-
-  ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&singleton =
-    ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ();
-
-  // Perform the Double-Check pattern...
-  if (singleton == 0)
-    {
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-      if (ACE_Object_Manager::starting_up () ||
-          ACE_Object_Manager::shutting_down ())
-        {
-          // The program is still starting up, and therefore assumed
-          // to be single threaded.  There's no need to double-check.
-          // Or, the ACE_Object_Manager instance has been destroyed,
-          // so the preallocated lock is not available.  Either way,
-          // don't register for destruction with the
-          // ACE_Object_Manager:  we'll have to leak this instance.
-#endif /* ACE_MT_SAFE */
-
-          ACE_NEW_RETURN (singleton, (ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>),
-                          0);
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-        }
-      else
-        {
-          // Obtain a lock from the ACE_Object_Manager.  The pointer
-          // is static, so we only obtain one per
-          // ACE_Unmanaged_Singleton instantiation.
-          static ACE_LOCK *lock = 0;
-          if (ACE_Object_Manager::get_singleton_lock (lock) != 0)
-            // Failed to acquire the lock!
-            return 0;
-
-          ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0);
-
-          if (singleton == 0)
-            ACE_NEW_RETURN (singleton,
-                            (ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>),
-                            0);
-        }
-#endif /* ACE_MT_SAFE */
-    }
-
-  return &singleton->instance_;
-}
-
-template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::close (void)
-{
-  ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&singleton =
-    ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ();
-
-  if (singleton)
-    singleton->cleanup ();
-}
-
-template <class TYPE, class ACE_LOCK> void
 ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
 {
   ACE_TRACE ("ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump");
@@ -248,8 +161,9 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
           // don't register for destruction with the
           // ACE_Object_Manager:  we'll have to leak this instance.
 #endif /* ACE_MT_SAFE */
-
-          ACE_NEW_RETURN (singleton, (ACE_TSS_Singleton<TYPE, ACE_LOCK>), 0);
+          ACE_NEW_RETURN (singleton,
+                          (ACE_TSS_Singleton<TYPE, ACE_LOCK>),
+                          0);
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
         }
       else
@@ -265,9 +179,9 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
 
           if (singleton == 0)
             {
-              ACE_NEW_RETURN (singleton, (ACE_TSS_Singleton<TYPE, ACE_LOCK>),
+              ACE_NEW_RETURN (singleton,
+                              (ACE_TSS_Singleton<TYPE, ACE_LOCK>),
                               0);
-
               // Register for destruction with ACE_Object_Manager.
               ACE_Object_Manager::at_exit (singleton);
             }
@@ -281,105 +195,16 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
 template <class TYPE, class ACE_LOCK> void
 ACE_TSS_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
 {
+  ACE_TRACE ("ACE_TSS_Singleton::cleanup");
+
   delete this;
   ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i () = 0;
 }
 
-template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
-{
-  ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump");
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("instance_ = %x"),
-              ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK>
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void)
-{
-#if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  // Pointer to the Singleton instance.  This works around a bug with
-  // G++ and it's (mis-)handling of templates and statics...
-  static ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *singleton_ = 0;
-
-  return singleton_;
-#else
-  return ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::singleton_;
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK> TYPE *
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
-{
-  ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance");
-
-  ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&singleton =
-    ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ();
-
-  // Perform the Double-Check pattern...
-  if (singleton == 0)
-    {
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-      if (ACE_Object_Manager::starting_up () ||
-          ACE_Object_Manager::shutting_down ())
-        {
-          // The program is still starting up, and therefore assumed
-          // to be single threaded.  There's no need to double-check.
-          // Or, the ACE_Object_Manager instance has been destroyed,
-          // so the preallocated lock is not available.  Either way,
-          // don't register for destruction with the
-          // ACE_Object_Manager:  we'll have to leak this instance.
-#endif /* ACE_MT_SAFE */
-          ACE_NEW_RETURN (singleton,
-                          (ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>),
-                          0);
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-        }
-      else
-        {
-          // Obtain a lock from the ACE_Object_Manager.  The pointer
-          // is static, so we only obtain one per
-          // ACE_Unmanaged_Singleton instantiation.
-          static ACE_LOCK *lock = 0;
-          if (ACE_Object_Manager::get_singleton_lock (lock) != 0)
-            // Failed to acquire the lock!
-            return 0;
-
-          ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0);
-
-          if (singleton == 0)
-            ACE_NEW_RETURN (singleton,
-                            (ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>),
-                            0);
-        }
-#endif /* ACE_MT_SAFE */
-    }
-
-  return ACE_TSS_GET (&singleton->instance_, TYPE);
-}
-
-template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::close (void)
-{
-  ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&singleton =
-    ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ();
-
-  if (singleton)
-    singleton->cleanup ();
-}
-
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
 // Pointer to the Singleton instance.
 template <class TYPE, class ACE_LOCK> ACE_TSS_Singleton <TYPE, ACE_LOCK> *
 ACE_TSS_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
-
-template <class TYPE, class ACE_LOCK>
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
 #endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */
 
 #endif /* ACE_SINGLETON_C */
diff --git a/ace/Singleton.h b/ace/Singleton.h
index 9bef9acf126..14bb6461ccb 100644
--- a/ace/Singleton.h
+++ b/ace/Singleton.h
@@ -104,45 +104,6 @@ protected:
 };
 
 template <class TYPE, class ACE_LOCK>
-class ACE_Unmanaged_Singleton : public ACE_Singleton <TYPE, ACE_LOCK>
-{
-  // = TITLE
-  //     Same as <ACE_Singleton>, except does _not_ register with
-  //     <ACE_Object_Manager> for destruction.
-  //
-  // = DESCRIPTION
-  //     This version of <ACE_Singleton> can be used if, for example,
-  //     its DLL will be unloaded before the <ACE_Object_Manager>
-  //     destroys the instance.  Unlike with <ACE_Singleton>, the
-  //     application is responsible for explicitly destroying the
-  //     instance after it is no longer needed (if it wants to avoid
-  //     memory leaks, at least).  The close () static member function
-  //     must be used to explicitly destroy the Singleton.
-  //
-public:
-  static TYPE *instance (void);
-  // Global access point to the Singleton.
-
-  static void close (void);
-  // Explicitly delete the Singleton instance.
-
-  static void dump (void);
-  // Dump the state of the object.
-
-protected:
-  ACE_Unmanaged_Singleton (void);
-  // Default constructor.
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  static ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *singleton_;
-  // Pointer to the Singleton (ACE_Cleanup) instance.
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-
-  static ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&instance_i (void);
-  // Get pointer to the Singleton instance.
-};
-
-template <class TYPE, class ACE_LOCK>
 class ACE_TSS_Singleton : public ACE_Cleanup
 {
   // = TITLE
@@ -188,46 +149,6 @@ protected:
   // Get pointer to the TSS Singleton instance.
 };
 
-template <class TYPE, class ACE_LOCK>
-class ACE_Unmanaged_TSS_Singleton : public ACE_TSS_Singleton <TYPE, ACE_LOCK>
-{
-  // = TITLE
-  //     Same as <ACE_TSS_Singleton>, except does _not_ register with
-  //     <ACE_Object_Manager> for destruction.
-  //
-  // = DESCRIPTION
-  //     This version of <ACE_TSS_Singleton> can be used if, for
-  //     example, its DLL will be unloaded before the
-  //     <ACE_Object_Manager> destroys the instance.  Unlike with
-  //     <ACE_Singleton>, the application is responsible for
-  //     explicitly destroying the instance after it is no longer
-  //     needed (if it wants to avoid memory leaks, at least).  The
-  //     close () static member function must be used to explicitly
-  //     destroy the Singleton.
-  //
-public:
-  static TYPE *instance (void);
-  // Global access point to the Singleton.
-
-  static void close (void);
-  // Explicitly delete the Singleton instance.
-
-  static void dump (void);
-  // Dump the state of the object.
-
-protected:
-  ACE_Unmanaged_TSS_Singleton (void);
-  // Default constructor.
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  static ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *singleton_;
-  // Pointer to the Singleton (ACE_Cleanup) instance.
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-
-  static ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&instance_i (void);
-  // Get pointer to the Singleton instance.
-};
-
 #if defined (__ACE_INLINE__)
 #include "ace/Singleton.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Singleton.i b/ace/Singleton.i
index 38e37fc3d7c..c49bd5a0428 100644
--- a/ace/Singleton.i
+++ b/ace/Singleton.i
@@ -1,6 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
+// Singleton.i
+
 // Default constructors.
 //
 // Note: don't explicitly initialize "instance_", because TYPE may not
@@ -12,16 +14,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::ACE_Singleton (void)
 }
 
 template <class TYPE, class ACE_LOCK> ACE_INLINE
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_Singleton (void)
-{
-}
-
-template <class TYPE, class ACE_LOCK> ACE_INLINE
 ACE_TSS_Singleton<TYPE, ACE_LOCK>::ACE_TSS_Singleton (void)
 {
 }
 
-template <class TYPE, class ACE_LOCK> ACE_INLINE
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_TSS_Singleton (void)
-{
-}
diff --git a/ace/Stats.cpp b/ace/Stats.cpp
index 658bd5ec12d..b025ba2e616 100644
--- a/ace/Stats.cpp
+++ b/ace/Stats.cpp
@@ -222,7 +222,7 @@ ACE_Stats::print_summary (const u_int precision,
       // Build a format string, in case the C library doesn't support %*u.
       ASYS_TCHAR format[32];
       if (tmp_precision == 0)
-        ACE_OS::sprintf (format, ASYS_TEXT ("%%%d"), tmp_precision);
+        ACE_OS::sprintf (format, ASYS_TEXT ("%%d"), tmp_precision);
       else
         ACE_OS::sprintf (format, ASYS_TEXT ("%%d.%%0%du"), tmp_precision);
 
@@ -547,8 +547,7 @@ ACE_Throughput_Stats::dump_results (const ASYS_TCHAR* msg,
 {
   if (this->samples_count_ == 0u)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("%s : no data collected\n"), msg));
+      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%s : no data collected\n")));
       return;
     }
 
diff --git a/ace/Strategies.h b/ace/Strategies.h
index 1574557cf37..474c23503ac 100644
--- a/ace/Strategies.h
+++ b/ace/Strategies.h
@@ -100,11 +100,6 @@ public:
   virtual int cache (const void *recycling_act) = 0;
   // Add to cache.
 
-  virtual int recycle_state (const void *recycling_act,
-                             ACE_Recyclable_State new_state) = 0;
-  virtual ACE_Recyclable_State recycle_state (const void *recycling_act) const = 0;
-  // Get/Set <recycle_state>.
-
   virtual int mark_as_closed (const void *recycling_act) = 0;
   // Mark as closed.
 
@@ -119,18 +114,36 @@ protected:
 class ACE_Export ACE_Recyclable
 {
 public:
+  enum State
+  {
+    IDLE_AND_PURGABLE,
+    // Idle and can be purged.
+
+    IDLE_BUT_NOT_PURGABLE,
+    // Idle but cannot be purged.
+
+    BUSY = 2,
+    // Busy (i.e., cannot be recycled or purged).
+
+    CLOSED = 3,
+    // Closed.
+
+    UNKNOWN = 4
+    // Unknown state.
+  };
+
   virtual ~ACE_Recyclable (void);
   // Destructor.
 
   // = Set/Get the recyclable bit
-  ACE_Recyclable_State recycle_state (void) const;
-  void recycle_state (ACE_Recyclable_State new_state);
+  State state (void) const;
+  void state (State new_state);
 
 protected:
-  ACE_Recyclable (ACE_Recyclable_State initial_state);
+  ACE_Recyclable (State initial_state);
   // Protected constructor.
 
-  ACE_Recyclable_State recycle_state_;
+  State state_;
   // Our state.
 };
 
diff --git a/ace/Strategies.i b/ace/Strategies.i
index d970ef75f65..2d101275030 100644
--- a/ace/Strategies.i
+++ b/ace/Strategies.i
@@ -14,8 +14,8 @@ ACE_Connection_Recycling_Strategy::ACE_Connection_Recycling_Strategy (void)
 }
 
 ACE_INLINE
-ACE_Recyclable::ACE_Recyclable (ACE_Recyclable_State initial_state)
-  : recycle_state_ (initial_state)
+ACE_Recyclable::ACE_Recyclable (ACE_Recyclable::State initial_state)
+  : state_ (initial_state)
 {
 }
 
@@ -24,25 +24,25 @@ ACE_Recyclable::~ACE_Recyclable (void)
 {
 }
 
-ACE_INLINE ACE_Recyclable_State
-ACE_Recyclable::recycle_state (void) const
+ACE_INLINE ACE_Recyclable::State 
+ACE_Recyclable::state (void) const
 {
-  return this->recycle_state_;
+  return this->state_;
 }
 
-ACE_INLINE void
-ACE_Recyclable::recycle_state (ACE_Recyclable_State new_state)
+ACE_INLINE void 
+ACE_Recyclable::state (ACE_Recyclable::State new_state)
 {
-  this->recycle_state_ = new_state;
+  this->state_ = new_state;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ACE_Hashable::ACE_Hashable (void)
   : hash_value_ (0)
 {
 }
 
-ACE_INLINE
+ACE_INLINE 
 ACE_Hashable::~ACE_Hashable (void)
 {
 }
@@ -62,13 +62,13 @@ ACE_Hashable::hash (void) const
   return this->hash_value_;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ACE_Refcountable::ACE_Refcountable (int refcount)
   : refcount_ (refcount)
 {
 }
 
-ACE_INLINE
+ACE_INLINE 
 ACE_Refcountable::~ACE_Refcountable (void)
 {
 }
@@ -79,14 +79,15 @@ ACE_Refcountable::increment (void)
   return ++this->refcount_;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Refcountable::decrement (void)
 {
   return --this->refcount_;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Refcountable::refcount (void) const
 {
   return this->refcount_;
 }
+
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp
index 9185bf10b2d..5bacb3db45e 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -228,9 +228,9 @@ ACE_Thread_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handler
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
 ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy
-(const ACE_PEER_ACCEPTOR_ADDR &local_addr,
- int restart,
- ACE_Reactor *reactor)
+  (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+   int restart,
+   ACE_Reactor *reactor)
   : reactor_ (reactor)
 {
   ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy");
@@ -243,7 +243,7 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
 ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler
-(SVC_HANDLER *svc_handler)
+  (SVC_HANDLER *svc_handler)
 {
   ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler");
 
@@ -271,13 +271,13 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
 ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms)
+  (SVC_HANDLER *&sh,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms)
 {
   ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler");
 
@@ -292,14 +292,14 @@ ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
 ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
-(SVC_HANDLER *&sh,
- SVC_HANDLER *&sh_copy,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms)
+  (SVC_HANDLER *&sh,
+   SVC_HANDLER *&sh_copy,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms)
 {
   ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler");
 
@@ -368,20 +368,19 @@ ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handle
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX>
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cached_Connect_Strategy
-(ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
- ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
- ACE_Recycling_Strategy<SVC_HANDLER> *rec_s,
- MUTEX *lock,
- int delete_lock)
-  : lock_ (lock),
-    delete_lock_ (delete_lock),
-    reverse_lock_ (0),
-    creation_strategy_ (0),
-    delete_creation_strategy_ (0),
-    concurrency_strategy_ (0),
-    delete_concurrency_strategy_ (0),
-    recycling_strategy_ (0),
-    delete_recycling_strategy_ (0)
+  (ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
+   ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
+   ACE_Recycling_Strategy<SVC_HANDLER> *rec_s,
+   MUTEX *lock,
+   int delete_lock)
+    : lock_ (lock),
+      delete_lock_ (delete_lock),
+      creation_strategy_ (0),
+      delete_creation_strategy_ (0),
+      concurrency_strategy_ (0),
+      delete_concurrency_strategy_ (0),
+      recycling_strategy_ (0),
+      delete_recycling_strategy_ (0)
 {
   // Create a new lock if necessary.
   if (this->lock_ == 0)
@@ -392,9 +391,6 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cache
       this->delete_lock_ = 1;
     }
 
-  ACE_NEW (this->reverse_lock_,
-           REVERSE_MUTEX (*this->lock_));
-
   if (this->open (cre_s, con_s, rec_s) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
@@ -407,8 +403,6 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cach
   if (this->delete_lock_)
     delete this->lock_;
 
-  delete this->reverse_lock_;
-
   if (this->delete_creation_strategy_)
     delete this->creation_strategy_;
   this->delete_creation_strategy_ = 0;
@@ -426,7 +420,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cach
 
   // Close down all cached service handlers.
   CONNECTION_MAP_ENTRY *entry;
-  for (CONNECTION_MAP_ITERATOR iterator (connection_map_);
+  for (CONNECTION_MAP_ITERATOR iterator (connection_cache_);
        iterator.next (entry);
        iterator.advance ())
     {
@@ -437,9 +431,9 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cach
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::open
-(ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
- ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
- ACE_Recycling_Strategy<SVC_HANDLER> *rec_s)
+  (ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
+   ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
+   ACE_Recycling_Strategy<SVC_HANDLER> *rec_s)
 {
   // Initialize the creation strategy.
 
@@ -507,15 +501,15 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::open
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::check_hint_i
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms,
- ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
- int &found)
+  (SVC_HANDLER *&sh,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms,
+   ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
+   int &found)
 {
   ACE_UNUSED_ARG (remote_addr);
   ACE_UNUSED_ARG (timeout);
@@ -530,7 +524,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::check_hin
   CONNECTION_MAP_ENTRY *possible_entry = (CONNECTION_MAP_ENTRY *) sh->recycling_act ();
 
   // Check to see if the hint svc_handler has been closed down
-  if (possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED)
+  if (possible_entry->ext_id_.state () == ACE_Recyclable::CLOSED)
     {
       // If close, decrement refcount
       if (possible_entry->ext_id_.decrement () == 0)
@@ -550,9 +544,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::check_hin
 
   // If hint is not closed, see if it is connected to the correct
   // address and is recyclable
-  else if ((possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_AND_PURGABLE ||
-            possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE) &&
-           possible_entry->ext_id_.subject () == remote_addr)
+  else if (possible_entry->ext_id_ == remote_addr)
     {
       // Hint successful
       found = 1;
@@ -582,22 +574,22 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::check_hin
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_create_svc_handler_i
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms,
- ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
- int &found)
+  (SVC_HANDLER *&sh,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms,
+   ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
+   int &found)
 {
   // Explicit type conversion
   REFCOUNTED_HASH_RECYCLABLE_ADDRESS search_addr (remote_addr);
 
   // Try to find the address in the cache.  Only if we don't find it
   // do we create a new <SVC_HANDLER> and connect it with the server.
-  if (this->find (search_addr, entry) == -1)
+  if (this->connection_cache_.find (search_addr, entry) == -1)
     {
       // Set the flag
       found = 0;
@@ -608,13 +600,13 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_c
 
       // Actively establish the connection.  This is a timed blocking
       // connect.
-      if (this->new_connection (sh,
-                                remote_addr,
-                                timeout,
-                                local_addr,
-                                reuse_addr,
-                                flags,
-                                perms) == -1)
+      if (this->CONNECT_STRATEGY::connect_svc_handler (sh,
+                                                       remote_addr,
+                                                       timeout,
+                                                       local_addr,
+                                                       reuse_addr,
+                                                       flags,
+                                                       perms) == -1)
         {
           // If connect() failed because of timeouts, we have to
           // reject the connection entirely. This is necessary since
@@ -628,9 +620,9 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_c
       else
         {
           // Insert the new SVC_HANDLER instance into the cache.
-          if (this->connection_map_.bind (search_addr,
-                                          sh,
-                                          entry) == -1)
+          if (this->connection_cache_.bind (search_addr,
+                                            sh,
+                                            entry) == -1)
             return -1;
 
           // Set the recycler and the recycling act
@@ -655,38 +647,14 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_c
 }
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::new_connection
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms)
-{
-  // Yow, Reverse Guard!  Let go of the lock for the duration of the
-  // actual connect.  This will allow other threads to hack on the
-  // connection cache while this thread creates the new connection.
-  ACE_GUARD_RETURN (REVERSE_MUTEX, ace_mon, *this->reverse_lock_, -1);
-
-  return this->CONNECT_STRATEGY::connect_svc_handler (sh,
-                                                      remote_addr,
-                                                      timeout,
-                                                      local_addr,
-                                                      reuse_addr,
-                                                      flags,
-                                                      perms);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_svc_handler
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms)
+  (SVC_HANDLER *&sh,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms)
 {
   int found = 0;
 
@@ -730,14 +698,14 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_svc_handler
-(SVC_HANDLER *&sh,
- SVC_HANDLER *&sh_copy,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms)
+  (SVC_HANDLER *&sh,
+   SVC_HANDLER *&sh_copy,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms)
 {
   int found = 0;
 
@@ -783,14 +751,14 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_svc_handler_i
-(SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
- ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
- int reuse_addr,
- int flags,
- int perms,
- int& found)
+  (SVC_HANDLER *&sh,
+   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+   ACE_Time_Value *timeout,
+   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+   int reuse_addr,
+   int flags,
+   int perms,
+   int& found)
 {
   CONNECTION_MAP_ENTRY *entry = 0;
 
@@ -828,7 +796,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s
 
   // For all successful cases: mark the <svc_handler> in the cache
   // as being <in_use>.  Therefore recyclable is BUSY.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_BUSY);
+  entry->ext_id_.state (ACE_Recyclable::BUSY);
 
   // And increment the refcount
   entry->ext_id_.increment ();
@@ -855,62 +823,12 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::cache_i (
 
   // Mark the <svc_handler> in the cache as not being <in_use>.
   // Therefore recyclable is IDLE.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_IDLE_AND_PURGABLE);
+  entry->ext_id_.state (ACE_Recyclable::IDLE_AND_PURGABLE);
 
   return 0;
 }
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycle_state (const void *recycling_act,
-                                                                                      ACE_Recyclable_State new_state)
-{
-  // Synchronization is required here as the setting of the recyclable
-  // state must be done atomically with respect to other threads that
-  // are querying the cache.
-  ACE_GUARD_RETURN (MUTEX, ace_mon, *this->lock_, -1);
-
-  return this->recycle_state_i (recycling_act,
-                                new_state);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycle_state_i (const void *recycling_act,
-                                                                                        ACE_Recyclable_State new_state)
-{
-  // The wonders and perils of ACT
-  CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act;
-
-  // Mark the <svc_handler> in the cache as not being <in_use>.
-  // Therefore recyclable is IDLE.
-  entry->ext_id_.recycle_state (new_state);
-
-  return 0;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_Recyclable_State
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycle_state (const void *recycling_act) const
-{
-  // Const cast.
-  SELF *fake_this = ACE_const_cast (SELF *, this);
-
-  // Synchronization is required here.
-  ACE_GUARD_RETURN (MUTEX, ace_mon, *fake_this->lock_, ACE_RECYCLABLE_UNKNOWN);
-
-  return this->recycle_state_i (recycling_act);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_Recyclable_State
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycle_state_i (const void *recycling_act) const
-{
-  // The wonders and perils of ACT
-  CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act;
-
-  // Mark the <svc_handler> in the cache as not being <in_use>.
-  // Therefore recyclable is IDLE.
-  return entry->ext_id_.recycle_state ();
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::purge (const void *recycling_act)
 {
   // Excluded other threads from changing cache while we take this
@@ -926,7 +844,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::purge_i (
   // The wonders and perils of ACT
   CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act;
 
-  return this->connection_map_.unbind (entry);
+  return this->connection_cache_.unbind (entry);
 }
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
@@ -946,7 +864,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::mark_as_c
   CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act;
 
   // Mark the <svc_handler> in the cache as CLOSED.
-  entry->ext_id_.recycle_state (ACE_RECYCLABLE_CLOSED);
+  entry->ext_id_.state (ACE_Recyclable::CLOSED);
 
   return 0;
 }
@@ -972,7 +890,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::cleanup_h
 
   // If the svc_handler state is closed and the refcount == 0, call
   // close() on svc_handler.
-  if (entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED &&
+  if (entry->ext_id_.state () == ACE_Recyclable::CLOSED &&
       refcount == 0)
     {
       entry->int_id_->recycler (0, 0);
@@ -1001,44 +919,6 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::concurren
   return this->concurrency_strategy_;
 }
 
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
-                                                                             ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry)
-{
-  typedef ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
-                                       SVC_HANDLER *,
-                                       ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                       ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
-                                       ACE_Null_Mutex>
-    CONNECTION_MAP_BUCKET_ITERATOR;
-
-  CONNECTION_MAP_BUCKET_ITERATOR iterator (this->connection_map_,
-                                           search_addr);
-
-  CONNECTION_MAP_BUCKET_ITERATOR end (this->connection_map_,
-                                      search_addr,
-                                      1);
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      REFCOUNTED_HASH_RECYCLABLE_ADDRESS &addr = (*iterator).ext_id_;
-
-      if (addr.recycle_state () != ACE_RECYCLABLE_IDLE_AND_PURGABLE &&
-          addr.recycle_state () != ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE)
-        continue;
-
-      if (addr.subject () != search_addr.subject ())
-        continue;
-
-      entry = &(*iterator);
-      return 0;
-    }
-
-  return -1;
-}
-
 template <class SVC_HANDLER> void
 ACE_DLL_Strategy<SVC_HANDLER>::dump (void) const
 {
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index ab700219755..fdb2ad5ca96 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -649,17 +649,17 @@ public:
 
   ACE_Refcounted_Hash_Recyclable (const T &t,
                                   int refcount = 0,
-                                  ACE_Recyclable_State state = ACE_RECYCLABLE_UNKNOWN);
+                                  ACE_Recyclable::State state = ACE_Recyclable::UNKNOWN);
   // Constructor.
 
   virtual ~ACE_Refcounted_Hash_Recyclable (void);
   // Destructor
 
   int operator== (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const;
-  int operator!= (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const;
   // Compares two instances.
 
-  T &subject ();
+  int operator== (const T &rhs) const;
+  // Compares two instances.
 
 protected:
   u_long hash_i (void) const;
@@ -682,8 +682,6 @@ class ACE_Cached_Connect_Strategy : public ACE_Connection_Recycling_Strategy, pu
   //     It's added value is re-use of established connections.
 public:
 
-  typedef ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX> SELF;
-
   ACE_Cached_Connect_Strategy (ACE_Creation_Strategy<SVC_HANDLER> *cre_s = 0,
                                ACE_Concurrency_Strategy<SVC_HANDLER> *con_s = 0,
                                ACE_Recycling_Strategy<SVC_HANDLER> *rec_s = 0,
@@ -749,11 +747,6 @@ public:
   virtual int cache (const void *recycling_act);
   // Add to cache.
 
-  virtual int recycle_state (const void *recycling_act,
-                             ACE_Recyclable_State new_state);
-  virtual ACE_Recyclable_State recycle_state (const void *recycling_act) const;
-  // Get/Set <recycle_state>.
-
   virtual int mark_as_closed (const void *recycling_act);
   // Mark as closed.
 
@@ -775,15 +768,13 @@ public:
   // = Typedefs for managing the map
   typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>
           REFCOUNTED_HASH_RECYCLABLE_ADDRESS;
-  typedef ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex>
+  typedef ACE_Hash_Map_Manager <REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex>
           CONNECTION_MAP;
-  typedef ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex>
+  typedef ACE_Hash_Map_Iterator <REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex>
           CONNECTION_MAP_ITERATOR;
   typedef ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *>
           CONNECTION_MAP_ENTRY;
 
-  typedef ACE_Reverse_Lock<MUTEX> REVERSE_MUTEX;
-
   // = Strategy accessors
   virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy (void) const;
   virtual ACE_Recycling_Strategy<SVC_HANDLER> *recycling_strategy (void) const;
@@ -791,30 +782,12 @@ public:
 
 protected:
 
-  virtual int new_connection (SVC_HANDLER *&sh,
-                              const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                              ACE_Time_Value *timeout,
-                              const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                              int reuse_addr,
-                              int flags,
-                              int perms);
-  // Creates a new connection.
-
-  int find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
-            ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry);
-  // Find an idle handle.
-
   virtual int purge_i (const void *recycling_act);
   // Remove from cache (non-locking version).
 
   virtual int cache_i (const void *recycling_act);
   // Add to cache (non-locking version).
 
-  virtual int recycle_state_i (const void *recycling_act,
-                               ACE_Recyclable_State new_state);
-  virtual ACE_Recyclable_State recycle_state_i (const void *recycling_act) const;
-  // Get/Set <recycle_state> (non-locking version).
-
   virtual int mark_as_closed_i (const void *recycling_act);
   // Mark as closed (non-locking version).
 
@@ -832,6 +805,15 @@ protected:
                     ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
                     int &found);
 
+  virtual int connect_svc_handler_i (SVC_HANDLER *&sh,
+                             const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                             ACE_Time_Value *timeout,
+                             const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                             int reuse_addr,
+                             int flags,
+                             int perms,
+                             int &found);
+
   int find_or_create_svc_handler_i (SVC_HANDLER *&sh,
                                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                                     ACE_Time_Value *timeout,
@@ -842,16 +824,7 @@ protected:
                                     ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
                                     int &found);
 
-  virtual int connect_svc_handler_i (SVC_HANDLER *&sh,
-                                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                                     ACE_Time_Value *timeout,
-                                     const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                                     int reuse_addr,
-                                     int flags,
-                                     int perms,
-                                     int &found);
-
-  CONNECTION_MAP connection_map_;
+  CONNECTION_MAP connection_cache_;
   // Table that maintains the cache of connected <SVC_HANDLER>s.
 
   MUTEX *lock_;
@@ -860,9 +833,6 @@ protected:
   int delete_lock_;
   // Mutual exclusion for this object.
 
-  REVERSE_MUTEX *reverse_lock_;
-  // Reverse lock.
-
   // = Strategy objects.
 
   CREATION_STRATEGY *creation_strategy_;
diff --git a/ace/Strategies_T.i b/ace/Strategies_T.i
index 80932a5ea73..dae0ed6bd10 100644
--- a/ace/Strategies_T.i
+++ b/ace/Strategies_T.i
@@ -333,7 +333,7 @@ template <class T> ASYS_INLINE
 ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (void)
   : ACE_Refcountable (0),
     ACE_Hashable (),
-    ACE_Recyclable (ACE_RECYCLABLE_UNKNOWN),
+    ACE_Recyclable (ACE_Recyclable::UNKNOWN),
     t_ ()
 {
 }
@@ -341,7 +341,7 @@ ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (void)
 template <class T> ASYS_INLINE
 ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (const T &t,
                                                                    int refcount,
-                                                                   ACE_Recyclable_State state)
+                                                                   ACE_Recyclable::State state)
   : ACE_Refcountable (refcount),
     ACE_Hashable (),
     ACE_Recyclable (state),
@@ -360,23 +360,24 @@ ACE_Refcounted_Hash_Recyclable<T>::hash_i (void) const
   return this->t_.hash ();
 }
 
-template <class T> ASYS_INLINE T &
-ACE_Refcounted_Hash_Recyclable<T>::subject (void)
-{
-  return this->t_;
-}
-
 template <class T> ASYS_INLINE int
 ACE_Refcounted_Hash_Recyclable<T>::operator== (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const
 {
-  return this->recycle_state () == rhs.recycle_state () &&
-         this->t_ == rhs.t_;
+  if (this->state () != ACE_Recyclable::IDLE_AND_PURGABLE &&
+      this->state () != ACE_Recyclable::IDLE_BUT_NOT_PURGABLE)
+    return 0;
+  else
+    return this->t_ == rhs.t_;
 }
 
 template <class T> ASYS_INLINE int
-ACE_Refcounted_Hash_Recyclable<T>::operator!= (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const
+ACE_Refcounted_Hash_Recyclable<T>::operator== (const T &rhs) const
 {
-  return !this->operator== (rhs);
+  if (this->state () != ACE_Recyclable::IDLE_AND_PURGABLE &&
+      this->state () != ACE_Recyclable::IDLE_BUT_NOT_PURGABLE)
+    return 0;
+  else
+    return this->t_ == rhs;
 }
 
 template <class SVC_HANDLER> ASYS_INLINE int
diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp
index ce9a3f1861e..83262666129 100644
--- a/ace/Svc_Handler.cpp
+++ b/ace/Svc_Handler.cpp
@@ -300,25 +300,6 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::idle (u_long flags)
     return this->close (flags);
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (ACE_Recyclable_State new_state)
-{
-  if (this->recycler ())
-    return this->recycler ()->recycle_state (this->recycling_act_,
-                                             new_state);
-
-  return 0;
-}
-
-template <PR_ST_1, ACE_SYNCH_DECL> ACE_Recyclable_State
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (void) const
-{
-  if (this->recycler ())
-    return this->recycler ()->recycle_state (this->recycling_act_);
-
-  return ACE_RECYCLABLE_UNKNOWN;
-}
-
 template <PR_ST_1, ACE_SYNCH_DECL> void
 ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycler (ACE_Connection_Recycling_Strategy *recycler,
                                                    const void *recycling_act)
diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h
index c15a97c5009..a1251999404 100644
--- a/ace/Svc_Handler.h
+++ b/ace/Svc_Handler.h
@@ -71,13 +71,6 @@ public:
   // instead of closing it.  If the object does not have a recycler,
   // it will be closed.
 
-  virtual ACE_Recyclable_State recycle_state (void) const;
-  virtual int recycle_state (ACE_Recyclable_State new_state);
-  // Call this method if you want to get/set the state of the
-  // <Svc_Handler>.  If the object does not have a recycler, this call
-  // will have no effect (and the accessor will return
-  // ACE_RECYCLABLE_UNKNOWN).
-
   virtual void cleanup_hint (void);
   // When the svc_handle is no longer needed around as a hint, call
   // this method.
@@ -145,7 +138,7 @@ public:
 
 public:
 
-  // = The following methods are not suppose to be public.
+  // = The following methods are not suppose to be public.  
 
   // Because friendship is *not* inherited in C++, these methods have
   // to be public.
@@ -245,7 +238,7 @@ protected:
 
   size_t current_buffer_size_;
   // Current size in bytes of the <Message_Queue> contents.
-
+  
   ACE_Time_Value next_timeout_;
   // Timeout value used to control when the buffer is flushed.
 
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index 3219887276a..2c75b420838 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -39,6 +39,8 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (void)
 template <class ACE_LOCKING_MECHANISM>
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock (void)
 {
+  if (this->delete_lock_)
+    delete this->lock_;
 }
 
 template <class ACE_LOCK, class TYPE>
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index fecba0de29d..b89d1b0a707 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -108,14 +108,14 @@ class ACE_Reverse_Lock : public ACE_Lock
   //     on the lock, and release() on this class calls acquire() on
   //     the lock.
   //
-  //     One motivation for this class is when we temporarily want to
-  //     release a lock (which we have already acquired) but then
-  //     reaquire it soon after.  An alternative design would be to
-  //     add a Anti_Guard or Reverse_Guard class which would release()
-  //     on construction and acquire() destruction.  However, there
-  //     are *many* varieties of the Guard class and this design
-  //     choice would lead to at least 6 new classes.  One new
-  //     ACE_Reverse_Lock class seemed more reasonable.
+  //  	 One motivation for this class is when we temporarily want to
+  //  	 release a lock (which we have already acquired) but then
+  //  	 reaquire it soon after.  An alternative design would be to
+  //  	 add a Anti_Guard or Reverse_Guard class which would release()
+  //  	 on construction and acquire() destruction.  However, there
+  //  	 are *many* varieties of the Guard class and this design
+  //  	 choice would lead to at least 6 new classes.  One new
+  //  	 ACE_Reverse_Lock class seemed more reasonable.
 public:
   typedef ACE_LOCKING_MECHANISM ACE_LOCK;
 
@@ -154,8 +154,12 @@ public:
   // Explicitly destroy the lock.
 
 private:
-  ACE_LOCKING_MECHANISM &lock_;
+  ACE_LOCKING_MECHANISM *lock_;
   // The concrete locking mechanism that all the methods delegate to.
+
+  int delete_lock_;
+  // This flag keep track of whether we are responsible for deleting
+  // the lock
 };
 
 template <class ACE_LOCK, class TYPE>
diff --git a/ace/Synch_T.i b/ace/Synch_T.i
index cb190580243..52445c8750b 100644
--- a/ace/Synch_T.i
+++ b/ace/Synch_T.i
@@ -163,7 +163,8 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write (void)
 
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock)
-  : lock_ (lock)
+  : lock_ (&lock),
+    delete_lock_ (0)
 {
 }
 
@@ -171,56 +172,56 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::ACE_Reverse_Lock (ACE_LOCKING_MECHANISM
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::remove (void)
 {
-  return this->lock_.remove ();
+  return this->lock_->remove ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire (void)
 {
-  return this->lock_.release ();
+  return this->lock_->release ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire (void)
 {
-  return this->lock_.tryacquire ();
+  return this->lock_->tryacquire ();
 }
 
 // Acquire the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::release (void)
 {
-  return this->lock_.acquire ();
+  return this->lock_->acquire ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_read (void)
 {
-  return this->lock_.acquire_read ();
+  return this->lock_->acquire_read ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_write (void)
 {
-  return this->lock_.acquire_write ();
+  return this->lock_->acquire_write ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_read (void)
 {
-  return this->lock_.tryacquire_read ();
+  return this->lock_->tryacquire_read ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write (void)
 {
-  return this->lock_.tryacquire_write ();
+  return this->lock_->tryacquire_write ();
 }
 
 #if defined (ACE_HAS_THREADS)
diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp
index 897f09a27ab..f50449e9b98 100644
--- a/ace/TP_Reactor.cpp
+++ b/ace/TP_Reactor.cpp
@@ -130,13 +130,6 @@ ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time)
       return -1;
     }
 
-  // After acquiring the lock, check if we have been deactivated.
-  if (this->deactivated_)
-    {
-      ACE_MT (this->token_.release ());
-      return -1;
-    }
-
   // We got the lock, lets handle some events.  Note: this method will
   // *not* dispatch any handlers.  It will dispatch timeouts and
   // signals.
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index 37abc509eda..560cf96f404 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -615,10 +615,23 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
 
   // Create a new thread running <func>.  *Must* be called with the
   // <lock_> held...
+#if 1
   auto_ptr<ACE_Thread_Descriptor> new_thr_desc (this->thread_desc_freelist_.remove ());
   new_thr_desc->thr_state_ = ACE_THR_IDLE;
   // Get a "new" Thread Descriptor from the freelist.
 
+  new_thr_desc->sync_->acquire ();
+  // Acquire the <sync_> lock to block the spawned thread from
+  // removing this Thread Descriptor before it gets put into our
+  // thread table.
+#else
+  ACE_Thread_Descriptor *new_thr_desc = 0;
+
+  ACE_NEW_RETURN (new_thr_desc,
+                  ACE_Thread_Descriptor,
+                  -1);
+#endif /* 1 */
+
   ACE_Thread_Adapter *thread_args = 0;
 # if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
   ACE_NEW_RETURN (thread_args,
@@ -640,6 +653,13 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
                   -1);
 # endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
 
+  // @@ Memory leak if the previous new failed, need an auto pointer here.
+  if (thread_args == 0)
+    {
+      this->thr_list_.insert_head (new_thr_desc.release ());
+      return -1;
+    }
+
   ACE_TRACE ("ACE_Thread_Manager::spawn_i");
   ACE_hthread_t thr_handle;
 
@@ -668,11 +688,6 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
     t_id = &thr_id;
 #endif /* ! VXWORKS */
 
-  new_thr_desc->sync_->acquire ();
-  // Acquire the <sync_> lock to block the spawned thread from
-  // removing this Thread Descriptor before it gets put into our
-  // thread table.
-
   int result = ACE_Thread::spawn (func,
                                   args,
                                   flags,
@@ -684,14 +699,10 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
                                   thread_args);
 
   if (result != 0)
-    {
-      // _Don't_ clobber errno here!  result is either 0 or -1, and
-      // ACE_OS::thr_create () already set errno!  D. Levine 28 Mar 1997
-      // errno = result;
-      ACE_Errno_Guard guard (errno);     // Lock release may smash errno
-      new_thr_desc->sync_->release ();
-      return -1;
-    }
+    // _Don't_ clobber errno here!  result is either 0 or -1, and
+    // ACE_OS::thr_create () already set errno!  D. Levine 28 Mar 1997
+    // errno = result;
+    return -1;
   else
     {
 #if defined (ACE_HAS_WTHREADS)
diff --git a/ace/Timer_Queue.i b/ace/Timer_Queue.i
deleted file mode 100644
index 41e4324e61e..00000000000
--- a/ace/Timer_Queue.i
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- C++ -*- */
-
-template <class TYPE, class FUNCTOR> ACE_INLINE void
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (const ACE_Time_Value &skew)
-{
-  timer_skew_ = skew;
-}
-
-template <class TYPE, class FUNCTOR> ACE_INLINE const ACE_Time_Value &
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (void) const
-{
-  return timer_skew_;
-}
-
-template <class TYPE, class FUNCTOR> ACE_INLINE int
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::expire (void)
-{
-  if (!this->is_empty ())
-    return this->expire (this->gettimeofday () + timer_skew_);
-  else
-    return 0;
-}
diff --git a/ace/Version.h b/ace/Version.h
index 63f35fbb750..5def819a690 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -3,5 +3,5 @@
 
 #define ACE_MAJOR_VERSION 4
 #define ACE_MINOR_VERSION 6
-#define ACE_BETA_VERSION 46
-#define ACE_VERSION "4.6.46"
+#define ACE_BETA_VERSION 43
+#define ACE_VERSION "4.6.43"
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index c41cf1ffa91..6fea6727a00 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -185,8 +185,8 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks,
 
 int
 ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
-                                               ACE_Reactor_Mask mask,
-                                               int &changes_required)
+					       ACE_Reactor_Mask mask,
+					       int &changes_required)
 {
   int error = 0;
 
@@ -257,7 +257,7 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
 
 int
 ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot,
-                                                       ACE_Reactor_Mask to_be_removed_masks)
+						       ACE_Reactor_Mask to_be_removed_masks)
 {
   // I/O entries
   if (this->current_info_[slot].io_entry_)
@@ -274,8 +274,8 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot,
       // think we can do anything about errors here, so I will not
       // check this.
       ::WSAEventSelect ((SOCKET) this->current_info_[slot].io_handle_,
-                        this->current_handles_[slot],
-                        this->current_info_[slot].network_events_);
+			this->current_handles_[slot],
+			this->current_info_[slot].network_events_);
     }
   // Normal event entries.
   else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
@@ -295,7 +295,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot,
       // Remember the mask
       this->current_info_[slot].close_masks_ = to_be_removed_masks;
       // Increment the handle count
-      this->handles_to_be_deleted_++;
+          this->handles_to_be_deleted_++;
     }
 
   // Since it is not a complete removal, we'll call handle_close
@@ -315,7 +315,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot,
 
 int
 ACE_WFMO_Reactor_Handler_Repository::remove_suspended_handler_i (size_t slot,
-                                                                 ACE_Reactor_Mask to_be_removed_masks)
+								 ACE_Reactor_Mask to_be_removed_masks)
 {
   // I/O entries
   if (this->current_suspended_info_[slot].io_entry_)
@@ -332,8 +332,8 @@ ACE_WFMO_Reactor_Handler_Repository::remove_suspended_handler_i (size_t slot,
       // think we can do anything about errors here, so I will not
       // check this.
       ::WSAEventSelect ((SOCKET) this->current_suspended_info_[slot].io_handle_,
-                        this->current_suspended_info_[slot].event_handle_,
-                        this->current_suspended_info_[slot].network_events_);
+			this->current_suspended_info_[slot].event_handle_,
+			this->current_suspended_info_[slot].network_events_);
     }
   // Normal event entries.
   else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
@@ -389,8 +389,8 @@ ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t slot,
       // think we can do anything about errors here, so I will not
       // check this.
       ::WSAEventSelect ((SOCKET) this->to_be_added_info_[slot].io_handle_,
-                        this->to_be_added_info_[slot].event_handle_,
-                        this->to_be_added_info_[slot].network_events_);
+			this->to_be_added_info_[slot].event_handle_,
+			this->to_be_added_info_[slot].network_events_);
     }
   // Normal event entries.
   else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
@@ -429,7 +429,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t slot,
 
 int
 ACE_WFMO_Reactor_Handler_Repository::suspend_handler_i (ACE_HANDLE handle,
-                                                        int &changes_required)
+							int &changes_required)
 {
   // Remember this value; only if it changes do we need to wakeup
   // the other threads
@@ -478,7 +478,7 @@ ACE_WFMO_Reactor_Handler_Repository::suspend_handler_i (ACE_HANDLE handle,
 
 int
 ACE_WFMO_Reactor_Handler_Repository::resume_handler_i (ACE_HANDLE handle,
-                                                       int &changes_required)
+						       int &changes_required)
 {
   // Remember this value; only if it changes do we need to wakeup
   // the other threads
@@ -564,11 +564,11 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_all (void)
 
 int
 ACE_WFMO_Reactor_Handler_Repository::bind_i (int io_entry,
-                                             ACE_Event_Handler *event_handler,
-                                             long network_events,
-                                             ACE_HANDLE io_handle,
-                                             ACE_HANDLE event_handle,
-                                             int delete_event)
+					     ACE_Event_Handler *event_handler,
+					     long network_events,
+					     ACE_HANDLE io_handle,
+					     ACE_HANDLE event_handle,
+					     int delete_event)
 {
   // Make sure that the <handle> is valid
   if (event_handle == ACE_INVALID_HANDLE)
@@ -587,11 +587,11 @@ ACE_WFMO_Reactor_Handler_Repository::bind_i (int io_entry,
       // Cache this set into the <to_be_added_info_>, till we come
       // around to actually adding this to the <current_info_>
       this->to_be_added_info_[this->handles_to_be_added_].set (event_handle,
-                                                               io_entry,
-                                                               event_handler,
-                                                               io_handle,
-                                                               network_events,
-                                                               delete_event);
+							       io_entry,
+							       event_handler,
+							       io_handle,
+							       network_events,
+							       delete_event);
 
       this->handles_to_be_added_++;
 
@@ -620,7 +620,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos (void)
       int last_valid_slot = this->max_handlep1_ - 1;
 
       for (int i = last_valid_slot; i >= 0; i--)
-        {
+	{
           // This stuff is necessary here, since we should not make
           // the upcall until all the internal data structures have
           // been updated.  This is to protect against upcalls that
@@ -629,75 +629,75 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos (void)
           ACE_Reactor_Mask masks = ACE_Event_Handler::NULL_MASK;
           ACE_Event_Handler *event_handler = 0;
 
-          // See if this entry is scheduled for deletion
-          if (this->current_info_[i].delete_entry_)
-            {
-              // Calling the <handle_close> method here will ensure that we
-              // will only call it once per deregistering <Event_Handler>.
-              // This is essential in the case when the <Event_Handler> will
-              // do something like delete itself and we have multiple
-              // threads in WFMO_Reactor.
-              //
-              // Make sure that the DONT_CALL mask is not set
-              masks = this->current_info_[i].close_masks_;
-              if (ACE_BIT_ENABLED (masks, ACE_Event_Handler::DONT_CALL) == 0)
-                {
-                  // Grab the correct handle depending on the type entry
-                  if (this->current_info_[i].io_entry_)
-                    handle = this->current_info_[i].io_handle_;
-                  else
-                    handle = this->current_handles_[i];
-
-                  // Event handler
-                  event_handler = this->current_info_[i].event_handler_;
-                }
-
-              // If <WFMO_Reactor> created the event, we need to clean it up
-              if (this->current_info_[i].delete_event_)
-                ACE_OS::event_destroy (&this->current_handles_[i]);
-
-              // Reduce count by one
-              this->handles_to_be_deleted_--;
-            }
-
-          // See if this entry is scheduled for suspension
-          else if (this->current_info_[i].suspend_entry_)
-            {
-              this->current_suspended_info_ [this->suspended_handles_].set (this->current_handles_[i],
-                                                                            this->current_info_[i]);
-              // Increase number of suspended handles
-              this->suspended_handles_++;
-
-              // Reduce count by one
-              this->handles_to_be_suspended_--;
-            }
-
-          // See if this entry is scheduled for deletion or suspension
-          // If so we need to clean up
-          if (this->current_info_[i].delete_entry_ || this->current_info_[i].suspend_entry_)
-            {
-              if (i == last_valid_slot)
-                // If this is the last handle in the set, no need to swap
-                // places. Simply remove it.
-                {
-                  // Reset the info in this slot
-                  this->current_info_[i].reset ();
-                  this->current_handles_[i] = ACE_INVALID_HANDLE;
-                }
-              else
-                // Swap this handle with the last valid handle
-                {
-                  // Struct copy
-                  this->current_info_[i] = this->current_info_[last_valid_slot];
-                  this->current_handles_[i] = this->current_handles_[last_valid_slot];
-                  // Reset the info in the last slot
-                  this->current_info_[last_valid_slot].reset ();
-                  this->current_handles_[last_valid_slot] = ACE_INVALID_HANDLE;
-                }
-              // Reset the last valid slot and clean up the entry in the
-              // <to_be_deleted_set_>
-              last_valid_slot--;
-            }
+	  // See if this entry is scheduled for deletion
+	  if (this->current_info_[i].delete_entry_)
+	    {
+	      // Calling the <handle_close> method here will ensure that we
+	      // will only call it once per deregistering <Event_Handler>.
+	      // This is essential in the case when the <Event_Handler> will
+	      // do something like delete itself and we have multiple
+	      // threads in WFMO_Reactor.
+	      //
+	      // Make sure that the DONT_CALL mask is not set
+	      masks = this->current_info_[i].close_masks_;
+	      if (ACE_BIT_ENABLED (masks, ACE_Event_Handler::DONT_CALL) == 0)
+		{
+		  // Grab the correct handle depending on the type entry
+		  if (this->current_info_[i].io_entry_)
+		    handle = this->current_info_[i].io_handle_;
+		  else
+		    handle = this->current_handles_[i];
+
+		  // Event handler
+		  event_handler = this->current_info_[i].event_handler_;
+		}
+
+	      // If <WFMO_Reactor> created the event, we need to clean it up
+	      if (this->current_info_[i].delete_event_)
+		ACE_OS::event_destroy (&this->current_handles_[i]);
+
+	      // Reduce count by one
+	      this->handles_to_be_deleted_--;
+	    }
+
+	  // See if this entry is scheduled for suspension
+	  else if (this->current_info_[i].suspend_entry_)
+	    {
+	      this->current_suspended_info_ [this->suspended_handles_].set (this->current_handles_[i],
+									    this->current_info_[i]);
+	      // Increase number of suspended handles
+	      this->suspended_handles_++;
+
+	      // Reduce count by one
+	      this->handles_to_be_suspended_--;
+	    }
+
+	  // See if this entry is scheduled for deletion or suspension
+	  // If so we need to clean up
+	  if (this->current_info_[i].delete_entry_ || this->current_info_[i].suspend_entry_)
+	    {
+	      if (i == last_valid_slot)
+		// If this is the last handle in the set, no need to swap
+		// places. Simply remove it.
+		{
+		  // Reset the info in this slot
+		  this->current_info_[i].reset ();
+		  this->current_handles_[i] = ACE_INVALID_HANDLE;
+		}
+	      else
+		// Swap this handle with the last valid handle
+		{
+		  // Struct copy
+		  this->current_info_[i] = this->current_info_[last_valid_slot];
+		  this->current_handles_[i] = this->current_handles_[last_valid_slot];
+		  // Reset the info in the last slot
+		  this->current_info_[last_valid_slot].reset ();
+		  this->current_handles_[last_valid_slot] = ACE_INVALID_HANDLE;
+		}
+	      // Reset the last valid slot and clean up the entry in the
+	      // <to_be_deleted_set_>
+	      last_valid_slot--;
+	    }
 
           // Now that all internal structures have been updated, make
           // the upcall.
@@ -721,7 +721,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos (void)
     {
       int last_valid_slot = this->suspended_handles_ - 1;
       for (i = last_valid_slot; i >= 0; i--)
-        {
+	{
           // This stuff is necessary here, since we should not make
           // the upcall until all the internal data structures have
           // been updated.  This is to protect against upcalls that
@@ -730,71 +730,71 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos (void)
           ACE_Reactor_Mask masks = ACE_Event_Handler::NULL_MASK;
           ACE_Event_Handler *event_handler = 0;
 
-          // See if this entry is scheduled for deletion
-          if (this->current_suspended_info_[i].delete_entry_)
-            {
-              // Calling the <handle_close> method here will ensure that we
-              // will only call it once per deregistering <Event_Handler>.
-              // This is essential in the case when the <Event_Handler> will
-              // do something like delete itself and we have multiple
-              // threads in WFMO_Reactor.
-              //
-              // Make sure that the DONT_CALL mask is not set
+	  // See if this entry is scheduled for deletion
+	  if (this->current_suspended_info_[i].delete_entry_)
+	    {
+	      // Calling the <handle_close> method here will ensure that we
+	      // will only call it once per deregistering <Event_Handler>.
+	      // This is essential in the case when the <Event_Handler> will
+	      // do something like delete itself and we have multiple
+	      // threads in WFMO_Reactor.
+	      //
+	      // Make sure that the DONT_CALL mask is not set
               masks = this->current_suspended_info_[i].close_masks_;
-              if (ACE_BIT_ENABLED (masks, ACE_Event_Handler::DONT_CALL) == 0)
-                {
-                  // Grab the correct handle depending on the type entry
-                  if (this->current_suspended_info_[i].io_entry_)
-                    handle = this->current_suspended_info_[i].io_handle_;
-                  else
-                    handle = this->current_suspended_info_[i].event_handle_;
-
-                  // Upcall
-                  event_handler = this->current_suspended_info_[i].event_handler_;
-                }
-
-              // If <WFMO_Reactor> created the event, we need to clean it up
-              if (this->current_suspended_info_[i].delete_event_)
-                ACE_OS::event_destroy (&this->current_suspended_info_[i].event_handle_);
-
-              // Reduce count by one
-              this->handles_to_be_deleted_--;
-            }
-
-          else if (this->current_suspended_info_[i].resume_entry_)
-            {
-              // Add to the end of the current handles set
-              this->current_handles_[this->max_handlep1_] = this->current_suspended_info_[i].event_handle_;
-              // Struct copy
-              this->current_info_[this->max_handlep1_].set (this->current_suspended_info_[i]);
-              this->max_handlep1_++;
-
-              // Reduce count by one
-              this->handles_to_be_resumed_--;
-            }
-
-          if (this->current_suspended_info_[i].resume_entry_ ||
-              this->current_suspended_info_[i].delete_entry_)
-            {
-              // Is this the last entry
-              if (i == last_valid_slot)
-                // Reset the <suspended> arrays entries
-                this->current_suspended_info_[i].reset ();
-              else
-                {
-                  // Struct copy
-                  this->current_suspended_info_[i] = this->current_suspended_info_[last_valid_slot];
-                  this->current_suspended_info_[last_valid_slot].reset ();
-                }
-              // Reduce the number of suspended handles
-              last_valid_slot--;
-            }
+	      if (ACE_BIT_ENABLED (masks, ACE_Event_Handler::DONT_CALL) == 0)
+		{
+		  // Grab the correct handle depending on the type entry
+		  if (this->current_suspended_info_[i].io_entry_)
+		    handle = this->current_suspended_info_[i].io_handle_;
+		  else
+		    handle = this->current_suspended_info_[i].event_handle_;
+
+		  // Upcall
+		  event_handler = this->current_suspended_info_[i].event_handler_;
+		}
+
+	      // If <WFMO_Reactor> created the event, we need to clean it up
+	      if (this->current_suspended_info_[i].delete_event_)
+		ACE_OS::event_destroy (&this->current_suspended_info_[i].event_handle_);
+
+	      // Reduce count by one
+	      this->handles_to_be_deleted_--;
+	    }
+
+	  else if (this->current_suspended_info_[i].resume_entry_)
+	    {
+	      // Add to the end of the current handles set
+	      this->current_handles_[this->max_handlep1_] = this->current_suspended_info_[i].event_handle_;
+	      // Struct copy
+	      this->current_info_[this->max_handlep1_].set (this->current_suspended_info_[i]);
+	      this->max_handlep1_++;
+
+	      // Reduce count by one
+	      this->handles_to_be_resumed_--;
+	    }
+
+	  if (this->current_suspended_info_[i].resume_entry_ ||
+	      this->current_suspended_info_[i].delete_entry_)
+	    {
+	      // Is this the last entry
+	      if (i == last_valid_slot)
+		// Reset the <suspended> arrays entries
+		this->current_suspended_info_[i].reset ();
+	      else
+		{
+		  // Struct copy
+		  this->current_suspended_info_[i] = this->current_suspended_info_[last_valid_slot];
+		  this->current_suspended_info_[last_valid_slot].reset ();
+		}
+	      // Reduce the number of suspended handles
+	      last_valid_slot--;
+	    }
 
           // Now that all internal structures have been updated, make
           // the upcall.
           if (event_handler != 0)
             event_handler->handle_close (handle, masks);
-        }
+	}
 
       // Reset <this->suspended_handles_>
       this->suspended_handles_ = last_valid_slot + 1;
@@ -960,7 +960,7 @@ ACE_WFMO_Reactor::work_pending (const ACE_Time_Value &)
 }
 
 ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh,
-                                    ACE_Timer_Queue *tq)
+				    ACE_Timer_Queue *tq)
   : signal_handler_ (0),
     delete_signal_handler_ (0),
     timer_queue_ (0),
@@ -979,17 +979,16 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh,
     active_threads_ (0),
     owner_ (ACE_Thread::self ()),
     change_state_thread_ (0),
-    open_for_business_ (0),
-    deactivated_ (0)
+    open_for_business_ (0)
 {
   if (this->open (ACE_WFMO_Reactor::DEFAULT_SIZE, 0, sh, tq) == -1)
     ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("WFMO_Reactor")));
 }
 
 ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size,
-                                    int unused,
-                                    ACE_Sig_Handler *sh,
-                                    ACE_Timer_Queue *tq)
+				    int unused,
+				    ACE_Sig_Handler *sh,
+				    ACE_Timer_Queue *tq)
   : signal_handler_ (0),
     delete_signal_handler_ (0),
     timer_queue_ (0),
@@ -1024,9 +1023,9 @@ ACE_WFMO_Reactor::current_info (ACE_HANDLE, size_t &)
 
 int
 ACE_WFMO_Reactor::open (size_t size,
-                        int unused,
-                        ACE_Sig_Handler *sh,
-                        ACE_Timer_Queue *tq,
+			int unused,
+			ACE_Sig_Handler *sh,
+			ACE_Timer_Queue *tq,
                         int disable_notify_pipe,
                         ACE_Reactor_Notify *notify)
 {
@@ -1086,8 +1085,8 @@ ACE_WFMO_Reactor::open (size_t size,
   // purposes
   if (this->handler_rep_.open (size + 2) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("opening handler repository")),
-                      -1);
+		       ASYS_TEXT ("opening handler repository")),
+		      -1);
   else
     this->delete_handler_rep_ = 1;
 
@@ -1112,16 +1111,16 @@ ACE_WFMO_Reactor::open (size_t size,
   if (this->notify_handler_->open (this, this->timer_queue_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("opening notify handler ")),
-                      -1);
+		       ASYS_TEXT ("opening notify handler ")),
+		      -1);
 
   // Register for <wakeup_all_threads> event
   if (this->register_handler (&this->wakeup_all_threads_handler_,
-                              this->wakeup_all_threads_.handle ()) == -1)
+			      this->wakeup_all_threads_.handle ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("registering thread wakeup handler")),
-                      -1);
+		       ASYS_TEXT ("registering thread wakeup handler")),
+		      -1);
 
   // Since we have added two handles into the handler repository,
   // update the <handler_repository_>
@@ -1214,9 +1213,9 @@ ACE_WFMO_Reactor::~ACE_WFMO_Reactor (void)
 
 int
 ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
-                                      ACE_HANDLE io_handle,
-                                      ACE_Event_Handler *event_handler,
-                                      ACE_Reactor_Mask new_masks)
+				      ACE_HANDLE io_handle,
+				      ACE_Event_Handler *event_handler,
+				      ACE_Reactor_Mask new_masks)
 {
   // If this is a Winsock 1 system, the underlying event assignment will
   // not work, so don't try. Winsock 1 must use ACE_Select_Reactor for
@@ -1264,8 +1263,8 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
     }
 
   int result = ::WSAEventSelect ((SOCKET) io_handle,
-                                 event_handle,
-                                 new_network_events);
+				 event_handle,
+				 new_network_events);
   // If we had found the <Event_Handler> there is nothing more to do
   if (found)
     return result;
@@ -1348,10 +1347,10 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
     if (io_handle == this->current_info_[i].io_handle_ &&
         !this->current_info_[i].delete_entry_)
       {
-        found = 1;
-        modified_network_events = &this->current_info_[i].network_events_;
-        delete_event = this->current_info_[i].delete_event_;
-        event_handle = this->current_handles_[i];
+	found = 1;
+	modified_network_events = &this->current_info_[i].network_events_;
+	delete_event = this->current_info_[i].delete_event_;
+	event_handle = this->current_handles_[i];
       }
 
   // Then pass through the suspended handles
@@ -1362,10 +1361,10 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
     if (io_handle == this->current_suspended_info_[i].io_handle_ &&
         !this->current_suspended_info_[i].delete_entry_)
       {
-        found = 1;
-        modified_network_events = &this->current_suspended_info_[i].network_events_;
-        delete_event = this->current_suspended_info_[i].delete_event_;
-        event_handle = this->current_suspended_info_[i].event_handle_;
+	found = 1;
+	modified_network_events = &this->current_suspended_info_[i].network_events_;
+	delete_event = this->current_suspended_info_[i].delete_event_;
+	event_handle = this->current_suspended_info_[i].event_handle_;
       }
 
   // Then check the to_be_added handles
@@ -1376,10 +1375,10 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
     if (io_handle == this->to_be_added_info_[i].io_handle_ &&
         !this->to_be_added_info_[i].delete_entry_)
       {
-        found = 1;
-        modified_network_events = &this->to_be_added_info_[i].network_events_;
-        delete_event = this->to_be_added_info_[i].delete_event_;
-        event_handle = this->to_be_added_info_[i].event_handle_;
+	found = 1;
+	modified_network_events = &this->to_be_added_info_[i].network_events_;
+	delete_event = this->to_be_added_info_[i].delete_event_;
+	event_handle = this->to_be_added_info_[i].event_handle_;
       }
 
   old_masks = this->bit_ops (*modified_network_events,
@@ -1395,12 +1394,12 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
 // max_wait_time expired, or the number of events that were dispatched.
 int
 ACE_WFMO_Reactor::event_handling (ACE_Time_Value *max_wait_time,
-                                  int alertable)
+				  int alertable)
 {
   ACE_TRACE ("ACE_WFMO_Reactor::event_handling");
 
   // Make sure we are not closed
-  if (!this->open_for_business_ || this->deactivated_)
+  if (!this->open_for_business_)
     return -1;
 
   // Stash the current time -- the destructor of this object will
@@ -1430,7 +1429,7 @@ ACE_WFMO_Reactor::event_handling (ACE_Time_Value *max_wait_time,
 
   // Wait for event to happen
   int wait_status = this->wait_for_multiple_events (timeout,
-                                                    alertable);
+						    alertable);
 
   // Upcall
   result = this->safe_dispatch (wait_status);
@@ -1440,7 +1439,7 @@ ACE_WFMO_Reactor::event_handling (ACE_Time_Value *max_wait_time,
 
 int
 ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
-                              int alertable)
+			      int alertable)
 {
   // Calculate the max time we should spend here
   //
@@ -1457,15 +1456,15 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
       // PharLap doesn't implement WaitForMultipleObjectsEx, and doesn't
       // do async I/O, so it's not needed in this case anyway.
       result = ::WaitForMultipleObjects (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE),
-                                         this->atomic_wait_array_,
-                                         TRUE,
-                                         timeout);
+					 this->atomic_wait_array_,
+					 TRUE,
+					 timeout);
 #else
       result = ::WaitForMultipleObjectsEx (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE),
-                                           this->atomic_wait_array_,
-                                           TRUE,
-                                           timeout,
-                                           alertable);
+					   this->atomic_wait_array_,
+					   TRUE,
+					   timeout,
+					   alertable);
 #endif /* ACE_HAS_PHARLAP */
 
       if (result != WAIT_IO_COMPLETION)
@@ -1501,15 +1500,15 @@ ACE_WFMO_Reactor::wait_for_multiple_events (int timeout,
   // WaitForMultipleObjectsEx, so use WaitForMultipleObjects.
   ACE_UNUSED_ARG (alertable);
   return ::WaitForMultipleObjects (this->handler_rep_.max_handlep1 (),
-                                   this->handler_rep_.handles (),
-                                   FALSE,
-                                   timeout);
+				   this->handler_rep_.handles (),
+				   FALSE,
+				   timeout);
 #else
   return ::WaitForMultipleObjectsEx (this->handler_rep_.max_handlep1 (),
-                                     this->handler_rep_.handles (),
-                                     FALSE,
-                                     timeout,
-                                     alertable);
+				     this->handler_rep_.handles (),
+				     FALSE,
+				     timeout,
+				     alertable);
 #endif /* ACE_HAS_PHARLAP */
 }
 
@@ -1602,11 +1601,11 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status)
     {
       bool ok = (
 #if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530))
-                 // wait_status is unsigned in Borland;
-                 // This >= is always true, with a warning.
-                 wait_status >= WAIT_OBJECT_0 &&
+		 // wait_status is unsigned in Borland;
+		 // This >= is always true, with a warning.
+		 wait_status >= WAIT_OBJECT_0 &&
 #endif
-                 wait_status <= (WAIT_OBJECT_0 + nCount));
+		 wait_status <= (WAIT_OBJECT_0 + nCount));
       if (ok)
         dispatch_slot += wait_status - WAIT_OBJECT_0;
       else
@@ -1622,7 +1621,7 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status)
 
       // We're done.
       if (dispatch_slot >= max_handlep1)
-        return number_of_handlers_dispatched;
+	return number_of_handlers_dispatched;
 
       // Readjust nCount
       nCount = max_handlep1 - dispatch_slot;
@@ -1630,14 +1629,14 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status)
       // Check the remaining handles
       wait_status = this->poll_remaining_handles (dispatch_slot);
       switch (wait_status)
-        {
-        case WAIT_FAILED: // Failure.
+	{
+	case WAIT_FAILED: // Failure.
           ACE_OS::set_errno_to_last_error ();
-          /* FALLTHRU */
-        case WAIT_TIMEOUT:
-          // There are no more handles ready, we can return.
-          return number_of_handlers_dispatched;
-        }
+	  /* FALLTHRU */
+	case WAIT_TIMEOUT:
+	  // There are no more handles ready, we can return.
+	  return number_of_handlers_dispatched;
+	}
     }
 }
 
@@ -1673,7 +1672,7 @@ ACE_WFMO_Reactor::dispatch_handler (size_t slot,
 
 int
 ACE_WFMO_Reactor::simple_dispatch_handler (int slot,
-                                           ACE_HANDLE event_handle)
+					   ACE_HANDLE event_handle)
 {
   // This dispatch is used for non-I/O entires
 
@@ -1693,7 +1692,7 @@ ACE_WFMO_Reactor::simple_dispatch_handler (int slot,
 
 int
 ACE_WFMO_Reactor::complex_dispatch_handler (int slot,
-                                            ACE_HANDLE event_handle)
+					    ACE_HANDLE event_handle)
 {
   // This dispatch is used for I/O entires.
 
@@ -1713,9 +1712,9 @@ ACE_WFMO_Reactor::complex_dispatch_handler (int slot,
 
 ACE_Reactor_Mask
 ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
-                          ACE_HANDLE io_handle,
-                          ACE_HANDLE event_handle,
-                          long interested_events)
+			  ACE_HANDLE io_handle,
+			  ACE_HANDLE event_handle,
+			  long interested_events)
 {
   // This method figures out what exactly has happened to the socket
   // and then calls appropriate methods.
@@ -1723,8 +1722,8 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
   WSANETWORKEVENTS events;
 
   if (::WSAEnumNetworkEvents ((SOCKET) io_handle,
-                              event_handle,
-                              &events) == SOCKET_ERROR)
+			      event_handle,
+			      &events) == SOCKET_ERROR)
     // Remove all masks
     return ACE_Event_Handler::ALL_EVENTS_MASK;
   else
@@ -1749,8 +1748,8 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
         ACE_SET_BITS (problems, ACE_Event_Handler::WRITE_MASK);
 
       if (interested_events & actual_events & FD_CONNECT)
-        {
-          if (events.iErrorCode[FD_CONNECT_BIT] == 0)
+	{
+	  if (events.iErrorCode[FD_CONNECT_BIT] == 0)
             {
               // Successful connect
               if (event_handler->handle_output (io_handle) == -1)
@@ -1758,9 +1757,9 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
                               ACE_Event_Handler::CONNECT_MASK);
             }
           // Unsuccessful connect
-          else if (event_handler->handle_input (io_handle) == -1)
+	  else if (event_handler->handle_input (io_handle) == -1)
             ACE_SET_BITS (problems, ACE_Event_Handler::CONNECT_MASK);
-        }
+	}
 
       if ((interested_events & actual_events & FD_OOB)
           && event_handler->handle_exception (io_handle) == -1)
@@ -1792,44 +1791,44 @@ ACE_WFMO_Reactor::update_state (void)
   if (this->handler_rep_.changes_required () || this->new_owner ())
     {
       if (this->change_state_thread_ == 0)
-        // Try to become the thread which will be responsible for the
-        // changes
-        {
-          this->change_state_thread_ = ACE_Thread::self ();
-          // Make sure no new threads are allowed to enter
-          this->ok_to_wait_.reset ();
-
-          if (this->active_threads_ > 0)
-            // Check for other active threads
-            {
-              // Wake up all other threads
-              this->wakeup_all_threads_.signal ();
-              // Release <lock_>
-              monitor.release ();
-              // Go to sleep waiting for all other threads to get done
-              this->waiting_to_change_state_.wait ();
-              // Re-acquire <lock_> again
-              monitor.acquire ();
-            }
-
-          if (this->handler_rep_.changes_required ())
-            // Make necessary changes to the handler repository
-            this->handler_rep_.make_changes ();
-          if (this->new_owner ())
-            // Update the owner
-            this->change_owner ();
-          // Turn off <wakeup_all_threads_>
-          this->wakeup_all_threads_.reset ();
-          // Let everyone know that it is ok to go ahead
-          this->ok_to_wait_.signal ();
-          // Reset this flag
-          this->change_state_thread_ = 0;
-        }
+	// Try to become the thread which will be responsible for the
+	// changes
+	{
+	  this->change_state_thread_ = ACE_Thread::self ();
+	  // Make sure no new threads are allowed to enter
+	  this->ok_to_wait_.reset ();
+
+	  if (this->active_threads_ > 0)
+	    // Check for other active threads
+	    {
+	      // Wake up all other threads
+	      this->wakeup_all_threads_.signal ();
+	      // Release <lock_>
+	      monitor.release ();
+	      // Go to sleep waiting for all other threads to get done
+	      this->waiting_to_change_state_.wait ();
+	      // Re-acquire <lock_> again
+	      monitor.acquire ();
+	    }
+
+	  if (this->handler_rep_.changes_required ())
+	    // Make necessary changes to the handler repository
+	    this->handler_rep_.make_changes ();
+	  if (this->new_owner ())
+	    // Update the owner
+	    this->change_owner ();
+	  // Turn off <wakeup_all_threads_>
+	  this->wakeup_all_threads_.reset ();
+	  // Let everyone know that it is ok to go ahead
+	  this->ok_to_wait_.signal ();
+	  // Reset this flag
+	  this->change_state_thread_ = 0;
+	}
       else if (this->active_threads_ == 0)
-        // This thread did not get a chance to become the change
-        // thread. If it is the last one out, it will wakeup the
-        // change thread
-        this->waiting_to_change_state_.signal ();
+	// This thread did not get a chance to become the change
+	// thread. If it is the last one out, it will wakeup the
+	// change thread
+	this->waiting_to_change_state_.signal ();
     }
   // This is if we were woken up explicitily by the user and there are
   // no state changes required.
@@ -1883,7 +1882,7 @@ ACE_WFMO_Reactor_Notify::ACE_WFMO_Reactor_Notify (void)
 
 int
 ACE_WFMO_Reactor_Notify::open (ACE_Reactor_Impl *wfmo_reactor,
-                               ACE_Timer_Queue *timer_queue,
+			       ACE_Timer_Queue *timer_queue,
                                int ignore_notify)
 {
   timer_queue_ = timer_queue;
@@ -1900,8 +1899,8 @@ ACE_WFMO_Reactor_Notify::get_handle (void) const
 
 int
 ACE_WFMO_Reactor_Notify::handle_signal (int signum,
-                                        siginfo_t *siginfo,
-                                        ucontext_t *)
+					siginfo_t *siginfo,
+					ucontext_t *)
 {
   ACE_UNUSED_ARG (signum);
 
@@ -1919,65 +1918,65 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
       ACE_Message_Block *mb = 0;
 
       if (this->message_queue_.dequeue_head
-          (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-        {
-          if (errno == EWOULDBLOCK)
-            // We've reached the end of the processing, return
-            // normally.
-            return 0;
-          else
-            return -1; // Something weird happened...
-        }
+	  (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
+	{
+	  if (errno == EWOULDBLOCK)
+	    // We've reached the end of the processing, return
+	    // normally.
+	    return 0;
+	  else
+	    return -1; // Something weird happened...
+	}
       else
-        {
-          ACE_Notification_Buffer *buffer =
-            (ACE_Notification_Buffer *) mb->base ();
-
-          // If eh == 0 then we've got major problems!  Otherwise, we
-          // need to dispatch the appropriate handle_* method on the
-          // ACE_Event_Handler pointer we've been passed.
-
-          if (buffer->eh_ != 0)
-            {
-              int result = 0;
-
-              switch (buffer->mask_)
-                {
-                case ACE_Event_Handler::READ_MASK:
-                case ACE_Event_Handler::ACCEPT_MASK:
-                  result = buffer->eh_->handle_input (ACE_INVALID_HANDLE);
-                  break;
-                case ACE_Event_Handler::WRITE_MASK:
-                  result = buffer->eh_->handle_output (ACE_INVALID_HANDLE);
-                  break;
-                case ACE_Event_Handler::EXCEPT_MASK:
-                  result = buffer->eh_->handle_exception (ACE_INVALID_HANDLE);
-                  break;
-                case ACE_Event_Handler::QOS_MASK:
-                  result = buffer->eh_->handle_qos (ACE_INVALID_HANDLE);
-                  break;
-                case ACE_Event_Handler::GROUP_QOS_MASK:
-                  result = buffer->eh_->handle_group_qos (ACE_INVALID_HANDLE);
-                  break;
-                default:
-                  ACE_ERROR ((LM_ERROR,
+	{
+	  ACE_Notification_Buffer *buffer =
+	    (ACE_Notification_Buffer *) mb->base ();
+
+	  // If eh == 0 then we've got major problems!  Otherwise, we
+	  // need to dispatch the appropriate handle_* method on the
+	  // ACE_Event_Handler pointer we've been passed.
+
+	  if (buffer->eh_ != 0)
+	    {
+	      int result = 0;
+
+	      switch (buffer->mask_)
+		{
+		case ACE_Event_Handler::READ_MASK:
+		case ACE_Event_Handler::ACCEPT_MASK:
+		  result = buffer->eh_->handle_input (ACE_INVALID_HANDLE);
+		  break;
+		case ACE_Event_Handler::WRITE_MASK:
+		  result = buffer->eh_->handle_output (ACE_INVALID_HANDLE);
+		  break;
+		case ACE_Event_Handler::EXCEPT_MASK:
+		  result = buffer->eh_->handle_exception (ACE_INVALID_HANDLE);
+		  break;
+		case ACE_Event_Handler::QOS_MASK:
+		  result = buffer->eh_->handle_qos (ACE_INVALID_HANDLE);
+		  break;
+		case ACE_Event_Handler::GROUP_QOS_MASK:
+		  result = buffer->eh_->handle_group_qos (ACE_INVALID_HANDLE);
+		  break;
+		default:
+		  ACE_ERROR ((LM_ERROR,
                               ASYS_TEXT ("invalid mask = %d\n"),
                               buffer->mask_));
-                  break;
-                }
-              if (result == -1)
-                buffer->eh_->handle_close (ACE_INVALID_HANDLE,
-                                           ACE_Event_Handler::EXCEPT_MASK);
-            }
-
-          // Make sure to delete the memory regardless of success or
-          // failure!
-          mb->release ();
-
-          // Bail out if we've reached the <max_notify_iterations_>.
-          // Note that by default <max_notify_iterations_> is -1, so
-          // we'll loop until we're done.
-          if (i == this->max_notify_iterations_)
+		  break;
+		}
+	      if (result == -1)
+		buffer->eh_->handle_close (ACE_INVALID_HANDLE,
+					   ACE_Event_Handler::EXCEPT_MASK);
+	    }
+
+	  // Make sure to delete the memory regardless of success or
+	  // failure!
+	  mb->release ();
+
+	  // Bail out if we've reached the <max_notify_iterations_>.
+	  // Note that by default <max_notify_iterations_> is -1, so
+	  // we'll loop until we're done.
+	  if (i == this->max_notify_iterations_)
             {
               // If there are still notification in the queue, we need
               // to wake up again
@@ -1987,7 +1986,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
               // Break the loop as we have reached max_notify_iterations_
               return 0;
             }
-        }
+	}
     }
 }
 
@@ -1997,8 +1996,8 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
 
 int
 ACE_WFMO_Reactor_Notify::notify (ACE_Event_Handler *eh,
-                                 ACE_Reactor_Mask mask,
-                                 ACE_Time_Value *timeout)
+				 ACE_Reactor_Mask mask,
+				 ACE_Time_Value *timeout)
 {
   if (eh != 0)
     {
@@ -2008,7 +2007,7 @@ ACE_WFMO_Reactor_Notify::notify (ACE_Event_Handler *eh,
                       -1);
 
       ACE_Notification_Buffer *buffer =
-        (ACE_Notification_Buffer *) mb->base ();
+	(ACE_Notification_Buffer *) mb->base ();
       buffer->eh_ = eh;
       buffer->mask_ = mask;
 
@@ -2016,14 +2015,14 @@ ACE_WFMO_Reactor_Notify::notify (ACE_Event_Handler *eh,
       // current time of day.  This is what <ACE_Message_Queue>
       // expects.
       if (timeout != 0)
-        *timeout += timer_queue_->gettimeofday ();
+	*timeout += timer_queue_->gettimeofday ();
 
       if (this->message_queue_.enqueue_tail
-          (mb, timeout) == -1)
-        {
-          mb->release ();
-          return -1;
-        }
+	  (mb, timeout) == -1)
+	{
+	  mb->release ();
+	  return -1;
+	}
     }
 
   return this->wakeup_one_thread_.signal ();
@@ -2082,8 +2081,8 @@ ACE_WFMO_Reactor::max_notify_iterations (void)
 #if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0)
 int
 WSAEventSelect (SOCKET s,
-                WSAEVENT hEventObject,
-                long lNetworkEvents)
+		WSAEVENT hEventObject,
+		long lNetworkEvents)
 {
   ACE_UNUSED_ARG (s);
   ACE_UNUSED_ARG (hEventObject);
@@ -2094,8 +2093,8 @@ WSAEventSelect (SOCKET s,
 
 int
 WSAEnumNetworkEvents (SOCKET s,
-                      WSAEVENT hEventObject,
-                      LPWSANETWORKEVENTS lpNetworkEvents)
+		      WSAEVENT hEventObject,
+		      LPWSANETWORKEVENTS lpNetworkEvents)
 {
   ACE_UNUSED_ARG (s);
   ACE_UNUSED_ARG (hEventObject);
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index a9863b094d4..8b046c9730d 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -609,18 +609,6 @@ public:
   // <WaitForMultipleObjects> for the <bAlertable> option.
 
 
-  // = Event handling control.
-
-  virtual int deactivated (void);
-  // Return the status of Reactor.  If this function returns 0, the reactor is
-  // actively handling events.  If it returns non-zero, <handling_events> and
-  // <handle_alertable_events> return -1 immediately.
-
-  virtual void deactivate (int do_stop);
-  // Control whether the Reactor will handle any more incoming events or not.
-  // If <do_stop> == 1, the Reactor will be disabled.  By default, a reactor
-  // is in active state and can be deactivated/reactived as wish.
-
   // = Register and remove Handlers.
 
   virtual int register_handler (ACE_Event_Handler *event_handler,
@@ -1084,10 +1072,6 @@ protected:
   int open_for_business_;
   // This flag is used to keep track of whether we are already closed.
 
-  sig_atomic_t deactivated_;
-  // This flag is used to keep track of whether we are actively handling
-  // events or not.
-
 private:
   ACE_WFMO_Reactor (const ACE_WFMO_Reactor &);
   ACE_WFMO_Reactor &operator = (const ACE_WFMO_Reactor &);
diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i
index 3a4215119be..ec27a225fb6 100644
--- a/ace/WFMO_Reactor.i
+++ b/ace/WFMO_Reactor.i
@@ -821,19 +821,6 @@ ACE_WFMO_Reactor::alertable_handle_events (ACE_Time_Value *how_long)
 }
 
 ACE_INLINE int
-ACE_WFMO_Reactor::deactivated (void)
-{
-  return this->deactivated_;
-}
-
-ACE_INLINE void
-ACE_WFMO_Reactor::deactivate (int do_stop)
-{
-  this->deactivated_ = do_stop;
-  this->wakeup_all_threads ();
-}
-
-ACE_INLINE int
 ACE_WFMO_Reactor::owner (ACE_thread_t *t)
 {
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
diff --git a/ace/ace-dll.icc b/ace/ace-dll.icc
index 67f5e97e22f..2a084e896ae 100644
--- a/ace/ace-dll.icc
+++ b/ace/ace-dll.icc
@@ -1,28 +1,28 @@
 if $__TOS_WIN__ {
-        option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"),
-                 define ("WIN32","1"),
-                 define ("_WINDOWS","1")
-        TARG = "aced.dll"
+	option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"),
+	         define ("WIN32","1"),
+        	 define ("_WINDOWS","1")
+	TARG = "aced.dll"
 }
 if $__TOS_AIX__ {
-        option PlatformOptions = null
-        TARG = "libACEshr.a"
-        option report(disable, "CPPC1125")
+	option PlatformOptions = null
+	TARG = "aced.shr.a"
 }
 
 option
-         PlatformOptions,
-         define ("__ACE_INLINE__","0"),
+	 PlatformOptions,
+         incl(searchPath,'H:\ACE_wrappers'),
+       	 define ("__ACE_INLINE__","0"),
          define("ACE_HAS_DLL","0"),
          link(exportAll),
          link(linkwithsharedlib),
-         link(linkWithMultiThreadLib,yes),
-         incl(searchpath, "..")
+         link(linkWithMultiThreadLib,yes)
          {
                target type (dll) TARG
                 {
                        option macros(global)
                         {
+                             source type(cpp) "ACE.h"
                              source type(cpp) "OS.h"
                         }
                  source type(cpp) "Log_Msg.cpp"
@@ -188,12 +188,17 @@ option
                  source type(cpp) "WIN32_Proactor.cpp"
                  source type(cpp) "XtReactor.cpp"
                  source type(cpp) "Active_Map_Manager_T.cpp"
+                 source type(cpp) "Cache_Hash_T.cpp"
+                 source type(cpp) "Cache_Heap_T.cpp"
+                 source type(cpp) "Cache_Manager_T.cpp"
                  source type(cpp) "Containers_T.cpp"
                  source type(cpp) "Dump_T.cpp"
                  source type(cpp) "Env_Value_T.cpp"
                  source type(cpp) "Event_Handler_T.cpp"
                  source type(cpp) "Functor_T.cpp"
+                 source type(cpp) "Hash_Bucket_T.cpp"
                  source type(cpp) "Hash_Map_Manager_T.cpp"
+                 source type(cpp) "Hash_Purgable_Map_Manager_T.cpp"
                  source type(cpp) "IOStream_T.cpp"
                  source type(cpp) "Local_Name_Space_T.cpp"
                  source type(cpp) "Malloc_T.cpp"
@@ -227,6 +232,7 @@ option
                  source type (cpp) "Functor_T.cpp"
                  source type (cpp) "Future.cpp"
                  source type (cpp) "Hash_Map_Manager_T.cpp"
+                 source type (cpp) "Hash_Purgable_Map_Manager_T.cpp"
                  source type (cpp) "IOStream_T.cpp"
                  source type (cpp) "LOCK_SOCK_Acceptor.cpp"
                  source type (cpp) "Local_Name_Space_T.cpp"
@@ -256,19 +262,19 @@ option
                  source type (cpp) "Typed_SV_Message.cpp"
                  source type (cpp) "Typed_SV_Message_Queue.cpp"
 
-                  // Libraries needed during linking
-                if $__TOS_WIN__ {
-                        source type (lib) "advapi32.lib"
-                        source type (lib) "user32.lib"
-                        source type (lib) "ws2_32.lib"
-                        source type (lib) "wsock32.lib"
-                        source type (lib) "mswsock.lib"
-                }
-                if $__TOS_AIX__ {
+		  // Libraries needed during linking
+		if $__TOS_WIN__ {
+			source type (lib) "advapi32.lib"
+                 	source type (lib) "user32.lib"
+		  	source type (lib) "ws2_32.lib"
+		  	source type (lib) "wsock32.lib"
+		  	source type (lib) "mswsock.lib"
+		}
+		if $__TOS_AIX__ {
                         source type (lib) "libtli_r.a"
                         source type (lib) "libpthreads.a"
                         source type (lib) "libc_r.a"
                         source type (lib) "libdl.a"
-                }
+		}
         }
 }
diff --git a/ace/ace-lib.icc b/ace/ace-lib.icc
index 6911c45e6c1..4552416ede5 100644
--- a/ace/ace-lib.icc
+++ b/ace/ace-lib.icc
@@ -6,12 +6,12 @@ if $__TOS_WIN__ {
 }
 if $__TOS_AIX__ {
 	option PlatformOptions = null
-	TARG = "libACE.a"
+	TARG = "aced.a"
 }
 
 option
 	 PlatformOptions,
-         incl(searchPath,'..'),
+         incl(searchPath,'H:\ACE_wrappers'),
        	 define ("__ACE_INLINE__","0"),
          define("ACE_HAS_DLL","0"),
          link(exportAll),
@@ -22,6 +22,7 @@ option
                 {
                        option macros(global)
                         {
+                             source type(cpp) "ACE.h"
                              source type(cpp) "OS.h"
                         }
                  source type(cpp) "Log_Msg.cpp"
@@ -187,12 +188,17 @@ option
                  source type(cpp) "WIN32_Proactor.cpp"
                  source type(cpp) "XtReactor.cpp"
                  source type(cpp) "Active_Map_Manager_T.cpp"
+                 source type(cpp) "Cache_Hash_T.cpp"
+                 source type(cpp) "Cache_Heap_T.cpp"
+                 source type(cpp) "Cache_Manager_T.cpp"
                  source type(cpp) "Containers_T.cpp"
                  source type(cpp) "Dump_T.cpp"
                  source type(cpp) "Env_Value_T.cpp"
                  source type(cpp) "Event_Handler_T.cpp"
                  source type(cpp) "Functor_T.cpp"
+                 source type(cpp) "Hash_Bucket_T.cpp"
                  source type(cpp) "Hash_Map_Manager_T.cpp"
+                 source type(cpp) "Hash_Purgable_Map_Manager_T.cpp"
                  source type(cpp) "IOStream_T.cpp"
                  source type(cpp) "Local_Name_Space_T.cpp"
                  source type(cpp) "Malloc_T.cpp"
@@ -226,6 +232,7 @@ option
                  source type (cpp) "Functor_T.cpp"
                  source type (cpp) "Future.cpp"
                  source type (cpp) "Hash_Map_Manager_T.cpp"
+                 source type (cpp) "ace/Hash_Purgable_Map_Manager_T.cpp"
                  source type (cpp) "IOStream_T.cpp"
                  source type (cpp) "LOCK_SOCK_Acceptor.cpp"
                  source type (cpp) "Local_Name_Space_T.cpp"
diff --git a/ace/ace.rc b/ace/ace.rc
deleted file mode 100644
index ede20b12cdf..00000000000
--- a/ace/ace.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "Version.h"
-
-1 VERSIONINFO
- FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
- PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "ACE\0"
-            VALUE "FileVersion", ACE_VERSION "\0"
-            VALUE "InternalName", "ACEDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "ACE.DLL\0"
-            VALUE "ProductName", "ACE\0"
-            VALUE "ProductVersion", ACE_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index 38fa47e09a5..9738415c47a 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -5,19 +5,19 @@
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

 

-CFG=ACE DLL - Win32 MFC Debug

+CFG=ACE DLL - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "ace_dll.mak".

-!MESSAGE 

+!MESSAGE

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "ace_dll.mak" CFG="ACE DLL - Win32 MFC Debug"

-!MESSAGE 

+!MESSAGE

+!MESSAGE NMAKE /f "ace_dll.mak" CFG="ACE DLL - Win32 Debug"

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

+!MESSAGE

 !MESSAGE "ACE DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "ACE DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "ACE DLL - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")

@@ -26,12 +26,9 @@ CFG=ACE DLL - Win32 MFC Debug
 !MESSAGE "ACE DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE "ACE DLL - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE "ACE DLL - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "ACE DLL - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ACE DLL - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

+!MESSAGE

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

 

@@ -63,7 +60,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o".\ace.bsc"

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\aced.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept

+# ADD LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

@@ -94,7 +91,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o".\ace.bsc"

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace.pdb" /machine:I386 /out:"..\bin\ace.dll"

+# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:I386 /out:"..\bin\ace.dll"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

@@ -125,7 +122,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o".\ace.bsc"

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceud.pdb" /debug /machine:I386 /out:"..\bin\aceud.dll" /pdbtype:sept

+# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /debug /machine:I386 /out:"..\bin\aceud.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

@@ -156,7 +153,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o".\ace.bsc"

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /machine:I386 /out:"..\bin\aceu.dll"

+# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:I386 /out:"..\bin\aceu.dll"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

@@ -173,12 +170,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "_DEBUG" /FD /MDd /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

+CPP=cl.exe

+# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "_DEBUG" /FD /MDd /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -188,7 +185,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:ALPHA /out:"..\bin\aced.dll" /pdbtype:sept

 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\aced.pdb" /debug /machine:ALPHA /out:"..\bin\aced.dll" /pdbtype:sept

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:ALPHA /out:"..\bin\aced.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

@@ -205,12 +202,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

+CPP=cl.exe

+# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -220,7 +217,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:ALPHA /out:"..\bin\ace.dll"

 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\ace.pdb" /machine:ALPHA /out:"..\bin\ace.dll"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:ALPHA /out:"..\bin\ace.dll"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

@@ -237,12 +234,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Unicode_Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

+CPP=cl.exe

+# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -252,7 +249,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /debug /machine:ALPHA /out:"..\bin\aceud.dll" /pdbtype:sept

 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceud.pdb" /debug /machine:ALPHA /out:"..\bin\aceud.dll" /pdbtype:sept

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /debug /machine:ALPHA /out:"..\bin\aceud.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

@@ -269,80 +266,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Unicode_Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c

-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo /o".\ace.bsc"

-# ADD BSC32 /nologo /o".\ace.bsc"

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:ALPHA /out:"..\bin\aceu.dll"

-# SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /machine:ALPHA /out:"..\bin\aceu.dll"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "ACE_DLL___Win32_MFC_Debug"

-# PROP BASE Intermediate_Dir "ACE_DLL___Win32_MFC_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\MFC_Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

-# SUBTRACT BASE CPP /YX /Yc /Yu

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo /o".\ace.bsc"

-# ADD BSC32 /nologo /o".\ace.bsc"

-LINK32=link.exe

-# ADD BASE LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept

-# SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\acemfcd.pdb" /debug /machine:I386 /out:"..\bin\acemfcd.dll" /pdbtype:sept

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "ACE_DLL___Win32_MFC_Release"

-# PROP BASE Intermediate_Dir "ACE_DLL___Win32_MFC_Release"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\MFC_Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c

-# SUBTRACT CPP /YX

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

+# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c

+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -350,12 +279,12 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo /o".\ace.bsc"

 # ADD BSC32 /nologo /o".\ace.bsc"

 LINK32=link.exe

-# ADD BASE LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:I386 /out:"..\bin\ace.dll"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:ALPHA /out:"..\bin\aceu.dll"

 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\acemfc.pdb" /machine:I386 /out:"..\bin\acemfc.dll"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:ALPHA /out:"..\bin\aceu.dll"

 # SUBTRACT LINK32 /pdb:none

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

@@ -367,4384 +296,656 @@ LINK32=link.exe
 # Name "ACE DLL - Win32 Alpha Release"

 # Name "ACE DLL - Win32 Alpha Unicode Debug"

 # Name "ACE DLL - Win32 Alpha Unicode Release"

-# Name "ACE DLL - Win32 MFC Debug"

-# Name "ACE DLL - Win32 MFC Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\ACE.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Activation_Queue.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Active_Map_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Arg_Shifter.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\ARGV.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO_Impl.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

-SOURCE=.\Based_Pointer_Repository.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

+SOURCE=.\Basic_Types.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Basic_Types.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

+SOURCE=.\Based_Pointer_Repository.cpp

 # End Source File

 # Begin Source File

 

 SOURCE=.\CDR_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Containers.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Handler.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Ref.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Date_Time.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dirent.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\DLL.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dump.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic_Service.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Event_Handler.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Event_Handler_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv_Msg.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send_Msg.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Filecache.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Functor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Get_Opt.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Handle_Set.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Map_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\High_Res_Timer.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\INET_Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_Cntl_Msg.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_SAP.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOStream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\IPC_SAP.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Name_Space.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Tokens.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Record.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_CODgram.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Dgram.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Mem_Map.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Memory_Pool.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Block.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Queue.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Method_Request.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Msg_WFMO_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Multiplexor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Proxy.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Request_Reply.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Space.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Naming_Context.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\NT_Service.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Obstack.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pair.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Parse_Node.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pipe.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Priority_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Proactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Profile_Timer.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Read_Buffer.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry_Name_Space.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Name_Space.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Tokens.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sched_Params.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor_Base.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Config.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Object.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Repository.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Types.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_MM.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_SV.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Object.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Signal.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_CODgram.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Bcast.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Mcast.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SString.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stats.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Strategies.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message_Queue.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Complex.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Simple.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Shared_Memory.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_l.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_y.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Handler.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch_Options.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\System_Time.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Task.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Template_Instantiations.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Time_Request_Reply.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timeprobe.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Hash.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Heap.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_List.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue_Adapters.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Wheel.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Collection.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Invariants.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Request_Reply.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TP_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trace.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\TTY_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message_Queue.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UNIX_Addr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\WFMO_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Asynch_IO.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Proactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\XtReactor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-!ENDIF 

-

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -4800,7 +1001,7 @@ SOURCE=.\Auto_Ptr.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Base_Pointer_T.h

+SOURCE=.\Basic_Types.h

 # End Source File

 # Begin Source File

 

@@ -4808,7 +1009,7 @@ SOURCE=.\Based_Pointer_Repository.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Basic_Types.h

+SOURCE=.\Base_Pointer_T.h

 # End Source File

 # Begin Source File

 

@@ -6293,2060 +2494,212 @@ SOURCE=.\WIN32_Proactor.i
 # Begin Source File

 

 SOURCE=.\Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Active_Map_Manager_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Auto_Ptr.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Base_Pointer_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Cache_Map_Manager_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Cached_Connect_Strategy_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Caching_Strategies_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Caching_Utility_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Cleanup_Strategies_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Connector.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Containers_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dump_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Free_List.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Functor_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Future.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Cache_Map_Manager_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Map_Manager_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Map_With_Allocator_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOStream_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Name_Space_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Managed_Object.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map_Manager.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Block_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Queue_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Module.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pair_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\RB_Tree.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Singleton.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Strategies_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stream.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stream_Modules.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Task_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Hash_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Heap_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_List_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Wheel_T.cpp

-

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # End Group

 # Begin Group "Documentation"

diff --git a/ace/config-aix-4.1.x.h b/ace/config-aix-4.1.x.h
index 1ebd21479b8..0f74d39a0c1 100644
--- a/ace/config-aix-4.1.x.h
+++ b/ace/config-aix-4.1.x.h
@@ -1,11 +1,4 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (ACE_AIX_MAJOR_VERS)
-# define ACE_AIX_MAJOR_VERS 4
-#endif
-#if !defined (ACE_AIX_MINOR_VERS)
-# define ACE_AIX_MINOR_VERS 1
-#endif
-
 #include "ace/config-aix-4.x.h"
diff --git a/ace/config-aix-4.2.x.h b/ace/config-aix-4.2.x.h
index 25672351a0c..0f74d39a0c1 100644
--- a/ace/config-aix-4.2.x.h
+++ b/ace/config-aix-4.2.x.h
@@ -1,11 +1,4 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (ACE_AIX_MAJOR_VERS)
-# define ACE_AIX_MAJOR_VERS 4
-#endif
-#if !defined (ACE_AIX_MINOR_VERS)
-# define ACE_AIX_MINOR_VERS 2
-#endif
-
 #include "ace/config-aix-4.x.h"
diff --git a/ace/config-aix-4.3.x.h b/ace/config-aix-4.3.x.h
deleted file mode 100644
index dae15950e06..00000000000
--- a/ace/config-aix-4.3.x.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#if !defined (ACE_AIX_MAJOR_VERS)
-# define ACE_AIX_MAJOR_VERS 4
-#endif
-#if !defined (ACE_AIX_MINOR_VERS)
-# define ACE_AIX_MINOR_VERS 3
-#endif
-
-#include "ace/config-aix-4.x.h"
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 2b65f4ac411..2ba01f9526f 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -9,7 +9,7 @@
 #define ACE_CONFIG_H
 
 #if defined (__xlC__) || (__IBMCPP__)
-   // AIX xlC, IBM C/C++, and Visual Age C++ compilers
+   // AIX xlC compiler
    //********************************************************************
    //
    // Compiler-related definitions.  These are set for C Set ++ V3
@@ -19,21 +19,18 @@
 
    // Keep an eye on this as the compiler and standards converge...
 #  define ACE_LACKS_LINEBUFFERED_STREAMBUF
-#  define ACE_LACKS_PRAGMA_ONCE
+#if defined (__IBMCPP__)
+   #define ACE_TEMPLATES_REQUIRE_SOURCE
+#endif /* __IBMCPP__ */
+
+#if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
+#undef WIFEXITED
+#undef WEXITSTATUS
+#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */
 
-   // C Set++ 3.1 and IBM C/C++ 3.6
-#  if defined (__xlC__)
-#    define ACE_TEMPLATES_REQUIRE_PRAGMA
-#  endif
+#  define ACE_TEMPLATES_REQUIRE_PRAGMA
 
-   // These are for Visual Age C++ only
-#  if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-#    define ACE_TEMPLATES_REQUIRE_SOURCE
-#    define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-#    define ACE_HAS_TYPENAME_KEYWORD
-#    undef WIFEXITED
-#    undef WEXITSTATUS
-#  endif /* __IBMCPP__ */
+#  define ACE_LACKS_PRAGMA_ONCE
 
 #elif defined (__GNUG__)
 # include "ace/config-g++-common.h"
@@ -214,7 +211,6 @@
 // send email to ace-users@cs.wustl.edu reporting this.
 // #define ACE_LACKS_CONDATTR_PSHARED
 // #define ACE_LACKS_MUTEXATTR_PSHARED
-#  define ACE_LACKS_SETSCHED
 #endif /* ACE_AIX_MINOR_VERS >= 3 */
 
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
diff --git a/ace/config-cray.h b/ace/config-cray.h
index e9ab5630593..5ad6d571449 100644
--- a/ace/config-cray.h
+++ b/ace/config-cray.h
@@ -5,12 +5,12 @@
 #define ACE_CONFIG_CRAY_H
 
 /*
-    The following predefined macros are used within ACE ifdefs.
+    The following predefined macros are used within ACE ifdefs.  
     These are defined when using the Cray compilers.  _CRAYMPP
     is defined, for example, if you are running on a Cray T3E
     massively parallel machine.  Moreover, in the case of the T3E,
     _CRAYT3E will be defined.  This is used to determine the
-    ACE_SIZEOF defines for primitive types.
+    ACE_SIZEOF defines for primitive types.  
 
     _UNICOS is defined as either the major version of UNICOS being run,
     e.g. 9 or 10 on the vector machines (e.g. C90, T90, J90, YMP, ...)
@@ -23,10 +23,10 @@
     _CRAYT3E  (defined specifically if compiling on a Cray T3E)
     _UNICOS   (defined if running UNICOS or UNICOS/mk)
 
-    Tested on UNICOS 10.0.0.5, UNICOS/mk 2.0.4.57
+    Tested on UNICOS 10.0.0.2, UNICOS/mk 2.0.3.10
     Compiles on UNICOS 9.0.2.8, but some tests deadlock
 
-    Contributed by Doug Anderson <dla@home.com>
+    Contributed by Doug Anderson <doug@clark.net>
 */
 
 #if defined (_UNICOS) && !defined (MAXPATHLEN)
@@ -46,7 +46,7 @@
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
 // using cray's autoinstantiation gives C++ prelinker: error: instantiation loop
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
@@ -69,7 +69,7 @@
 // UNICOS versions sport Draft 7 threads.
 
 #if _UNICOS > 9
-# define ACE_HAS_PTHREADS_STD
+# define ACE_HAS_PTHREADS_STD  
 #else
 # define ACE_HAS_PTHREADS_DRAFT7
 # define ACE_LACKS_THREAD_STACK_SIZE
@@ -78,6 +78,7 @@
 # define SCHED_OTHER 0
 # define SCHED_FIFO 1
 # define SCHED_RR 2
+# define pthread_sigmask sigprocmask
 #endif
 
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
@@ -117,9 +118,7 @@
 
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 
-#if _UNICOS > 9
-# define ACE_HAS_SIGWAIT
-#endif
+#define ACE_HAS_SIGWAIT
 
 #define ACE_HAS_SIG_ATOMIC_T
 
@@ -207,27 +206,27 @@
 
 #ifndef _CRAYMPP
 
-# define ACE_SIZEOF_CHAR        1
-# define ACE_SIZEOF_SHORT       8
-# define ACE_SIZEOF_INT         8
-# define ACE_SIZEOF_LONG        8
-# define ACE_SIZEOF_LONG_LONG   8
-# define ACE_SIZEOF_FLOAT       8
-# define ACE_SIZEOF_DOUBLE      8
-# define ACE_SIZEOF_LONG_DOUBLE 16
-# define ACE_SIZEOF_VOID_P      8
+# define ACE_SIZEOF_CHAR	1
+# define ACE_SIZEOF_SHORT	8
+# define ACE_SIZEOF_INT		8
+# define ACE_SIZEOF_LONG	8
+# define ACE_SIZEOF_LONG_LONG	8
+# define ACE_SIZEOF_FLOAT	8
+# define ACE_SIZEOF_DOUBLE	8
+# define ACE_SIZEOF_LONG_DOUBLE	16
+# define ACE_SIZEOF_VOID_P	8
 
 #elif defined(_CRAYT3E)
 
-# define ACE_SIZEOF_CHAR        1
-# define ACE_SIZEOF_SHORT       4
-# define ACE_SIZEOF_INT         8
-# define ACE_SIZEOF_LONG        8
-# define ACE_SIZEOF_LONG_LONG   8
-# define ACE_SIZEOF_FLOAT       4
-# define ACE_SIZEOF_DOUBLE      8
-# define ACE_SIZEOF_LONG_DOUBLE 8
-# define ACE_SIZEOF_VOID_P      8
+# define ACE_SIZEOF_CHAR	1
+# define ACE_SIZEOF_SHORT	4
+# define ACE_SIZEOF_INT		8
+# define ACE_SIZEOF_LONG	8
+# define ACE_SIZEOF_LONG_LONG	8
+# define ACE_SIZEOF_FLOAT	4
+# define ACE_SIZEOF_DOUBLE	8
+# define ACE_SIZEOF_LONG_DOUBLE	8
+# define ACE_SIZEOF_VOID_P	8
 
 #endif
 
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index 7464876215c..78f3c24c554 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -8,8 +8,7 @@
 #ifndef ACE_GNUG_COMMON_H
 #define ACE_GNUG_COMMON_H
 
-#if __GNUC__ > 2  ||  ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)  || \
-    (defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x540)
+#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
   // egcs or g++ >= 2.8.0
 
 # define ACE_HAS_ANSI_CASTS
diff --git a/ace/config-ghs-common.h b/ace/config-ghs-common.h
index 16729ff28a8..9e49f971191 100644
--- a/ace/config-ghs-common.h
+++ b/ace/config-ghs-common.h
@@ -20,11 +20,9 @@
 #   define ACE_LACKS_AUTO_PTR
 #   define ACE_LACKS_CHAR_RIGHT_SHIFTS
 #   define ACE_LACKS_UNBUFFERED_STREAMBUF
-#   define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-# else
-#   define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 # endif /* __STANDARD_CXX */
 
+# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 # define ACE_HAS_WCHAR_TYPEDEFS_CHAR
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 # define ACE_LACKS_LONGLONG_T
diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h
index 0a7c2de101a..c399a403fa1 100644
--- a/ace/config-hpux-10.x-hpc++.h
+++ b/ace/config-hpux-10.x-hpc++.h
@@ -46,14 +46,6 @@
 #  define volatile
 
 #else  // aC++ definitions
- 
-// Parts of TAO (at least) use __HP_aCC to detect this compiler, but the
-// macro is not set until A.01.18. If it's not set, set it - it won't be an
-// HP-advertised value, but we don't check the value/version - just whether
-// it's set or not.
-#  if !defined (__HP_aCC)
-#    define __HP_aCC
-#  endif /* __HP_aCC */
 
 // Compiler supports to-be-ANSI casts
 #  define ACE_HAS_ANSI_CASTS
diff --git a/ace/config-hpux-11.x-hpc++.h b/ace/config-hpux-11.x-hpc++.h
index 84dc1d8f5f1..1913e68c707 100644
--- a/ace/config-hpux-11.x-hpc++.h
+++ b/ace/config-hpux-11.x-hpc++.h
@@ -37,14 +37,6 @@
 #  define volatile
 
 #else  // aC++ definitions
- 
-// Parts of TAO (at least) use __HP_aCC to detect this compiler, but the
-// macro is not set until A.03.13. If it's not set, set it - it won't be an
-// HP-advertised value, but we don't check the value/version - just whether
-// it's set or not.
-#  if !defined (__HP_aCC)
-#    define __HP_aCC
-#  endif /* __HP_aCC */
 
 // Compiler supports ANSI casts
 #  define ACE_HAS_ANSI_CASTS
diff --git a/ace/config-irix6.x-sgic++-nothreads.h b/ace/config-irix6.x-sgic++-nothreads.h
index 6990d608a9d..dbc6e41c9df 100644
--- a/ace/config-irix6.x-sgic++-nothreads.h
+++ b/ace/config-irix6.x-sgic++-nothreads.h
@@ -67,7 +67,6 @@
 #if _COMPILER_VERSION >= 720
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-#define ACE_HAS_USING_KEYWORD
 #else
 #define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 #endif /* _COMPILER_VERSION >= 720 */
diff --git a/ace/config-kcc-common.h b/ace/config-kcc-common.h
index ed84e0efa40..0f864be27f5 100644
--- a/ace/config-kcc-common.h
+++ b/ace/config-kcc-common.h
@@ -60,7 +60,6 @@
 #define ACE_LACKS_UNBUFFERED_STREAMBUF 1
 #define ACE_HAS_EXCEPTIONS 1
 #define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_NEW_THROWS_EXCEPTIONS
 
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
 
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 25caddcf43c..c988bf8c3ca 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -31,6 +31,8 @@
 # define ACE_HAS_ALLOCA_H
 # define ACE_HAS_PENTIUM
 #elif defined (__powerpc__)
+  // fork ()/exec () don't seem to work well on PPC.
+# define ACE_LACKS_FORK
   // It looks like the default stack size is 15000.
   // ACE's Recursive_Mutex_Test needs more.
 # define ACE_NEEDS_HUGE_THREAD_STACKSIZE 32000
diff --git a/ace/config-mvs.h b/ace/config-mvs.h
index d87bba5b8c0..4eb1f8bdd33 100644
--- a/ace/config-mvs.h
+++ b/ace/config-mvs.h
@@ -21,6 +21,10 @@
 
 #define ACE_MVS
 
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+#define ACE_HAS_NONCONST_SELECT_TIMEVAL
+
 // See the README file in this directory
 // for a description of the following ACE_ macros
 
@@ -30,22 +34,22 @@
 #else
 # define ACE_LACKS_UCONTEXT_H
 #endif /* __COMPILER_VER__ >= 0x21020000 */
-
 #define ACE_HAS_BROKEN_CTIME
+#define ACE_HAS_UALARM
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_HAS_DIRENT
-#define ACE_HAS_EXCEPTIONS
 #define ACE_HAS_GETPAGESIZE
 #define ACE_HAS_GETRUSAGE
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_LIMITED_RUSAGE_T
 #define ACE_HAS_MSG
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
 #define ACE_HAS_NONSCALAR_THREAD_KEY_T
 #define ACE_HAS_POLL
 #define ACE_HAS_POSIX_NONBLOCK
 #define ACE_HAS_POSIX_TIME
+
+// Platform defines struct timespec but not timespec_t
+#define ACE_LACKS_TIMESPEC_T
+
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_DRAFT6
 #define ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP
@@ -60,18 +64,15 @@
 #define ACE_HAS_STRERROR
 #define ACE_HAS_STRINGS
 #define ACE_HAS_SYSV_IPC
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
 #define ACE_HAS_THREADS
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_THR_C_DEST
 #define ACE_HAS_THR_C_FUNC
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
-#define ACE_HAS_UALARM
 #define ACE_HAS_UTIME
 #define ACE_HAS_VOIDPTR_MMAP
 #define ACE_HAS_VOIDPTR_SOCKOPT
 #define ACE_HAS_XPG4_MULTIBYTE_CHAR
-
 #define ACE_LACKS_CONDATTR_PSHARED
 #define ACE_LACKS_MUTEXATTR_PSHARED
 #define ACE_LACKS_IOSTREAM_FX
@@ -82,23 +83,21 @@
 #define ACE_LACKS_MSGBUF_T
 #define ACE_LACKS_PARAM_H
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-#define ACE_LACKS_READDIR_R
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SETSCHED
 #define ACE_LACKS_SIGINFO_H
 #define ACE_LACKS_STRRECVFD
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_SYS_NERR
 #define ACE_LACKS_TCP_H
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_LACKS_THREAD_STACK_ADDR
-#define ACE_LACKS_TIMESPEC_T
-
 #if !defined (ACE_MT_SAFE)
 # define ACE_MT_SAFE 1
 #endif
-
 #define ACE_NEEDS_DEV_IO_CONVERSION
+#define ACE_LACKS_SYSTIME_H
+#define ACE_TEMPLATES_REQUIRE_SOURCE
+#define ACE_HAS_TEMPLATE_SPECIALIZATION
 
 #if !defined (ACE_NTRACE)
 # define ACE_NTRACE 1
@@ -107,7 +106,7 @@
 #define ACE_SIZEOF_FLOAT 4
 #define ACE_SIZEOF_DOUBLE 8
 #define ACE_SIZEOF_LONG_DOUBLE 16
-
-#define ACE_TEMPLATES_REQUIRE_SOURCE
+#define ACE_HAS_DIRENT
+#define ACE_LACKS_READDIR_R
 
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index 8321aedbb6e..32a1ed81b1a 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -1,17 +1,14 @@
 /* -*- C++ -*- */
 // $Id$
 
-// NOTE:  if you are using Digital UNIX V4.0f or later, you must
-// use config-tru64.h instead of directly using this config file.
-
 // The following configuration file is designed to work for the
-// Digital UNIX V4.0a through V4.0d with either the GNU g++, DEC
+// Digital UNIX V4.0a and later platforms with either the GNU g++, DEC
 // cxx 5.4 and later, Rational RCC (2.4.1) compilers, or KAI 3.3
 // compilers.  It is configured to use the IEEE Std 1003.1c-1995,
 // POSIX System Application Program Interface, or DCE threads (with
 // cxx only); it automatically selects the proper thread interface
 // depending on whether the cxx -pthread or -threads option was
-// specified.  By 4.0a, the version is meant that is called "V4.0 464"
+// specified.  By 4.0a the version is meant that is called "V4.0 464"
 // by uname -a.
 
 #ifndef ACE_CONFIG_H
@@ -83,10 +80,10 @@
 #     pragma message disable intconlosbit
 #   endif /* __DECCXX_VER >= 60190029 */
 
-#   if defined (DIGITAL_UNIX)  &&  DIGITAL_UNIX >= 0x40F
+#   if defined (DIGITAL_UNIX)  &&  DIGITAL_UNIX == 5
       // variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
 #     pragma message disable declbutnotref
-#   endif /* DIGITAL_UNIX >= 4.0f */
+#   endif /* DIGITAL_UNIX 5 */
 
 #   if defined (ACE_HAS_EXCEPTIONS)
 #     pragma message disable unrfunprm
@@ -122,7 +119,7 @@
 # define ACE_LACKS_T_ERRNO
 # define ACE_POLL_IS_BROKEN
 # if !defined (DIGITAL_UNIX)
-#   define DIGITAL_UNIX 0x400
+#   define DIGITAL_UNIX
 # endif /* ! DIGITAL_UNIX */
   // DJT removed this due to some minor issues related to the
   // definitions of timestruc_t and tid_t in procfs.h not sure what
diff --git a/ace/config-osf1.h b/ace/config-osf1.h
new file mode 100644
index 00000000000..1e6541392c7
--- /dev/null
+++ b/ace/config-osf1.h
@@ -0,0 +1,21 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for the
+// Digital UNIX V4.0a and later platforms.  It relies on
+// config-osf1-4.0.h, and adds deltas for newer platforms.
+
+#ifndef ACE_CONFIG_OSF1_H
+#define ACE_CONFIG_OSF1_H
+
+#if defined (DIGITAL_UNIX)
+#  include "ace/config-osf1-4.0.h"
+#  if DIGITAL_UNIX >= 5
+#    define _LIBC_POLLUTION_H_
+#    define ACE_LACKS_SYSTIME_H
+#  endif /* DIGITAL_UNIX >= 5 */
+#else  /* ! DIGITAL_UNIX */
+#  include "ace/config-osf1-3.2.h"
+#endif /* ! DIGITAL_UNIX */
+
+#endif /* ACE_CONFIG_OSF1_H */
diff --git a/ace/config-qnx-neutrino.h b/ace/config-qnx-neutrino.h
index 6d2850959d9..cea218e345b 100644
--- a/ace/config-qnx-neutrino.h
+++ b/ace/config-qnx-neutrino.h
@@ -6,14 +6,6 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
-#define _POSIX_C_SOURCE 199506
-#define _QNX_SOURCE
-
-// These constants are in i386-nto/include/limits.h, but egcs
-// picks up its own limits.h instead:
-#define _POSIX_NAME_MAX     14      /*  Max bytes in a filename             */
-#define _POSIX_PATH_MAX     256     /*  Num. bytes in pathname (excl. NULL) */
-
 // gcc can do inline
 #if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
 # if !defined (__ACE_INLINE__)
@@ -37,8 +29,8 @@
 //  ace expects 128 & 1024 respectively
 //  to set the following macros in ace/Basic_Types.h
 //  These macros are:
-// #define ACE_SIZEOF_DOUBLE   8
-// #define ACE_SIZEOF_FLOAT    4
+#define ACE_SIZEOF_DOUBLE   8
+#define ACE_SIZEOF_FLOAT    4
 
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
@@ -51,8 +43,10 @@
 #define ACE_HAS_GETPAGESIZE
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER
+#define ACE_HAS_IDTYPE_T
 #define ACE_HAS_INLINED_OSCALLS
 #define ACE_HAS_IP_MULTICAST
+#define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
 #define ACE_HAS_MSG
 #define ACE_HAS_MT_SAFE_MKTIME
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
@@ -90,6 +84,7 @@
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MSGBUF_T
+#define ACE_LACKS_MUTEXATTR_PSHARED
 #define ACE_LACKS_NAMED_POSIX_SEM
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
@@ -122,7 +117,7 @@
 #define ACE_NEEDS_FUNC_DEFINITIONS
 #define ACE_NEEDS_HUGE_THREAD_STACKSIZE 64000
 #define ACE_TEMPLATES_REQUIRE_SOURCE
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
 
 #if !defined (ACE_NTRACE)
 # define ACE_NTRACE 1
diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h
index 4204e74b5bf..96ae7e1dbce 100644
--- a/ace/config-sco-5.0.0.h
+++ b/ace/config-sco-5.0.0.h
@@ -13,7 +13,6 @@
 #define MAXPATHLEN 1023
 #endif /* SCO */
 
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
 #define ACE_HAS_SIG_MACROS
 #define ACE_LACKS_CONST_TIMESPEC_PTR
 #define ACE_LACKS_SYSCALL
@@ -84,7 +83,7 @@
 #define ACE_HAS_SELECT_H
 
 // Platform has prototypes for ACE_TLI.
-#define ACE_HAS_TLI_PROTOTYPES
+//#define ACE_HAS_TLI_PROTOTYPES
 // Platform has the XLI version of ACE_TLI.
 // #define ACE_HAS_XLI
 
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 55bd54ae98c..27c6d14931d 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -307,7 +307,7 @@
 #define ACE_HAS_STL_QUEUE_CONFLICT
 #define ACE_HAS_IDTYPE_T
 
-// #define ACE_HAS_POSITION_INDEPENDENT_MALLOC
+  // #define ACE_HAS_POSITION_INDEPENDENT_MALLOC
 
 #define ACE_HAS_GPERF
 #define ACE_HAS_DIRENT
diff --git a/ace/config-sunos5.6-sunc++-4.x.h b/ace/config-sunos5.6-sunc++-4.x.h
deleted file mode 100644
index 7f63838fb78..00000000000
--- a/ace/config-sunos5.6-sunc++-4.x.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for SunOS 5.6
-// platforms using the SunC++ 4.x compiler.
-
-#if !defined (ACE_CONFIG_H)
-
-// ACE_CONFIG_H is defined by the following #included header.
-
-// At this point, there's no difference between our SunOS 5.5 and 5.6
-// configurations.
-#if defined (__SUNPRO_CC)
-# include "ace/config-sunos5.5-sunc++-4.x.h"
-#elif defined (__GNUG__)
-# include "ace/config-sunos5.5-g++.h"
-#else  /* ! __SUNPRO_CC__ && ! __GNUG__ */
-# error unsupported compiler in ace/config-sunos5.6.h
-#endif /* ! __SUNPRO_CC__ && ! __GNUG__ */
-
-// Additional SunOS 5.6 capabilities . . .
-#define ACE_HAS_AIO_CALLS
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-tru64.h b/ace/config-tru64.h
index 2806261cd34..1e6541392c7 100644
--- a/ace/config-tru64.h
+++ b/ace/config-tru64.h
@@ -5,19 +5,17 @@
 // Digital UNIX V4.0a and later platforms.  It relies on
 // config-osf1-4.0.h, and adds deltas for newer platforms.
 
-#ifndef ACE_CONFIG_TRU64_H
-#define ACE_CONFIG_TRU64_H
+#ifndef ACE_CONFIG_OSF1_H
+#define ACE_CONFIG_OSF1_H
 
 #if defined (DIGITAL_UNIX)
 #  include "ace/config-osf1-4.0.h"
-#  if DIGITAL_UNIX >= 0x40F
-#    define ACE_LACKS_SYSTIME_H
-#  endif /* DIGITAL_UNIX >= 0x40F */
-#  if DIGITAL_UNIX >= 0x500
+#  if DIGITAL_UNIX >= 5
 #    define _LIBC_POLLUTION_H_
-#  endif /* DIGITAL_UNIX >= 0x500 */
+#    define ACE_LACKS_SYSTIME_H
+#  endif /* DIGITAL_UNIX >= 5 */
 #else  /* ! DIGITAL_UNIX */
 #  include "ace/config-osf1-3.2.h"
 #endif /* ! DIGITAL_UNIX */
 
-#endif /* ACE_CONFIG_TRU64_H */
+#endif /* ACE_CONFIG_OSF1_H */
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index 24f0171ceab..1a66ffab953 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -49,14 +49,16 @@
   // Processor type, if necessary.  Green Hills defines "ppc".
 # if defined (ppc)
 #   define ACE_HAS_POWERPC_TIMER
-# elif defined (i386) || defined (__i386__)
+# endif /* ppc */
+
+# if defined (i386) || defined (__i386__)
     // If running an Intel, assume that it's a Pentium so that
     // ACE_OS::gethrtime () can use the RDTSC instruction.  If
     // running a 486 or lower, be sure to comment this out.
     // (If not running an Intel CPU, this #define will not be seen
     //  because of the i386 protection, so it can be ignored.)
 #   define ACE_HAS_PENTIUM
-# endif /* ppc || i386 */
+# endif /* i386 */
 
 # define ACE_CONFIG_INCLUDE_GHS_COMMON
 # include "ace/config-ghs-common.h"
@@ -71,7 +73,6 @@
 
 #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768
 #define ACE_DEFAULT_THREAD_KEYS 16
-#define ACE_HAS_BROKEN_ACCEPT_ADDR
 #define ACE_HAS_BROKEN_SENDMSG
 #define ACE_HAS_BROKEN_WRITEV
 #define ACE_HAS_CHARPTR_SOCKOPT
@@ -90,7 +91,6 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
-#define ACE_HAS_STRDUP_EMULATION
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_TSS_EMULATION
@@ -108,7 +108,6 @@
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MALLOC_H
 #define ACE_LACKS_MEMORY_H
-#define ACE_LACKS_MKFIFO
 #define ACE_LACKS_MKTEMP
 #define ACE_LACKS_MMAP
 #define ACE_LACKS_MPROTECT
@@ -129,7 +128,6 @@
 #define ACE_LACKS_STRCASECMP
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SYSCALL
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_SYSV_MSG_H
 #define ACE_LACKS_SYSV_SHMEM
 #define ACE_LACKS_SYS_NERR
@@ -139,22 +137,22 @@
 #define ACE_LACKS_UCONTEXT_H
 #define ACE_LACKS_UNIX_SIGNALS
 #define ACE_LACKS_UTSNAME_T
-#define ACE_PAGE_SIZE 4096
-#define ACE_THR_PRI_FIFO_DEF 101
-#define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF
-
 #if !defined (ACE_MT_SAFE)
 # define ACE_MT_SAFE 1
 #endif
-
-#if !defined (ACE_NEEDS_HUGE_THREAD_STACKSIZE)
-# define ACE_NEEDS_HUGE_THREAD_STACKSIZE 64000
-#endif /* ACE_NEEDS_HUGE_THREAD_STACKSIZE */
+#define ACE_LACKS_SYSTIME_H
+#define ACE_PAGE_SIZE 4096
+#define ACE_THR_PRI_FIFO_DEF 101
+#define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF
 
 #if !defined (ACE_NTRACE)
 # define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#define ACE_HAS_STRDUP_EMULATION
+#define ACE_LACKS_MKFIFO
+#define ACE_HAS_BROKEN_ACCEPT_ADDR
+
 // By default, don't include RCS Id strings in object code.
 #if !defined (ACE_USE_RCSID)
 #define ACE_USE_RCSID 0
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index da4f60494a2..e4ab0c8daea 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -97,16 +97,6 @@
 #     endif /* defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) */
 #     define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 
-#     if defined (ACE_NEW_THROWS_EXCEPTIONS)
-#       undef ACE_NEW_THROWS_EXCEPTIONS
-#     endif /* defined (ACE_NEW_THROWS_EXCEPTIONS) */
-#     define ACE_NEW_THROWS_EXCEPTIONS 1
-
-#     if defined (ACE_HAS_ANSI_CASTS)
-#       undef ACE_HAS_ANSI_CASTS
-#     endif /* defined (ACE_HAS_ANSI_CASTS) */
-#     define ACE_HAS_ANSI_CASTS 1
-
 #   endif /* (__BORLANDC__ >= 0x0530) */
 
 /*
@@ -158,12 +148,6 @@
 #       undef ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 #     endif /* defined (ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR) */
 
-      /* include only forward declaration of iostreams */
-#     if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-#       undef ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
-#     endif /* defined (ACE_HAS_STDCPP_STL_INCLUDES) */
-#     define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION 1
-
       /* need to ensure these are included before <iomanip> */
 #     include <time.h>
 #     include <stdlib.h>
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 60c42bdca11..907f7ec5b44 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -55,17 +55,13 @@ typedef unsigned __int64 ACE_UINT64;
 # define ACE_LACKS_PRAGMA_ONCE
 #endif /* _MSC_VER < 1000 */
 
-// Only >= MSVC 5.0 definitions
+// Only MSVC 5.0 definitions
 #if (_MSC_VER >= 1100)
   #if !defined (ACE_HAS_WINCE)
     #define ACE_HAS_SIG_ATOMIC_T
   #endif /* ACE_HAS_WINCE */
-#endif /* _MSC_VER >= 1100 */
-
-// Only >= MSVC 6.0 definitions
-#if (_MSC_VER >= 1200)
 #define ACE_HAS_TYPENAME_KEYWORD
-#endif /* _MSC_VER >= 1200 */
+#endif /* _MSC_VER >= 1100 */
 
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
@@ -89,6 +85,9 @@ typedef unsigned __int64 ACE_UINT64;
 // Compiler/platform has correctly prototyped header files.
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
+// Platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+
 // Platform contains <poll.h>.
 //define ACE_HAS_POLL
 
@@ -274,7 +273,7 @@ typedef unsigned __int64 ACE_UINT64;
 #endif /* NOMINMAX */
 
 #if defined (ACE_HAS_MOSTLY_UNICODE_APIS) && !defined (UNICODE)
-#define UNICODE
+#defined UNICODE
 #endif /* ACE_HAS_MOSTLY_UNICODE_APIS && !UNICODE */
 
 #if defined (_UNICODE)
@@ -411,11 +410,6 @@ typedef unsigned __int64 ACE_UINT64;
         #define ACE_WSOCK_VERSION 1, 1
 #endif /* ACE_HAS_WINSOCK2 */
 
-// Platform supports IP multicast on Winsock 2
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-# define ACE_HAS_IP_MULTICAST
-#endif /* ACE_HAS_WINSOCK2 */
-
 #if defined (_MSC_VER)
         #pragma warning(default: 4201)  /* winnt.h uses nameless structs */
 #endif /* _MSC_VER */
diff --git a/ace/config-win32.h b/ace/config-win32.h
index ac50b3fb85f..955d42a2061 100644
--- a/ace/config-win32.h
+++ b/ace/config-win32.h
@@ -166,28 +166,16 @@
 
 // By default, we use non-static object manager on Win32.  That is,
 // the object manager is allocated in main's stack memory.  If this
-// does not suit your need, i.e., if your programs depend on the use
-// of static object manager, you neet to disable the behavior by
-// defining ACE_HAS_NONSTATIC_OBJECT_MANAGER=0.
+// does not suit your need, you can disable the behavior by defining
+// ACE_HAS_NONSTATIC_OBJECT_MANAGER to 0.
 //
-// MFC users: the main function is defined within a MFC library and
-// therefore, ACE won't be able to meddle with main function and
-// instantiate the non-static object manager for you.  To solve the
-// problem, you'll need to instantiate the ACE_Object_Manager by
-// either:
+// MFC users: Since the main function is defined withing MFC library,
+// you'll need to instantiate the ACE_Object_Manager by doing either,
 //
-// 1. Using static object manager (as described above), however, using
-// the non-static object manager is prefered, therefore,
-// 2. Instantiate the non-static object manager yourself by either 1)
-//    call ACE::init () at the beginning and ACE::fini () at the end,
-//    _or_ 2) instantiate the ACE_Object_Manager in your CWinApp
-//    derived class.
+// 1. Using static object manager (as described above.)
+// 2. Instantiate Object Manager in your CApplication derived class
+//    and define ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER.
 //
-// Optionally, you can #define
-// ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER in your
-// ace/config.h and always take care of the business by yourself.
-// ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER has no effect when
-// using static object managers.
 #if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
 # define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 #elif (ACE_HAS_NONSTATIC_OBJECT_MANAGER == 0)
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index a9158f7d003..00000000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,2994 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl -------------------------------------------------------------------------
-dnl       $Id$
-dnl 
-dnl       ACE M4 include file which contains general M4 macros
-dnl       to be used by the ACE configure script.
-dnl
-dnl       The macros in this file were designed for ACE but should be
-dnl       general enough for general use.
-dnl 
-dnl -------------------------------------------------------------------------
-
-dnl  Copyright (C) 1998, 1999  Ossama Othman
-dnl
-dnl  All Rights Reserved
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the current ACE distribution terms.
-dnl 
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-
-dnl miscellaneous macros
-
-dnl Prevent the configure script continuing any further if a CVS control
-dnl directory is found.  The idea is to prevent files generated during
-dnl configuration and build from be checked in to the CVS repository that
-dnl the sources are checked into.  This should only be an issue for
-dnl maintainers, not end-users.  Maintainers should configure and build in
-dnl a directory that doesn't contain any CVS controlled sources and files,
-dnl i.e. that doesn't contain a CVS directory.
-dnl
-dnl Usage: ACE_CHECK_FOR_CVS_DIR
-AC_DEFUN(ACE_CHECK_FOR_CVS_DIR,
-[
- if test -d CVS; then
-   AC_MSG_ERROR(
-     [
-      This error is meant for maintainers:
-
-      Please configure and build in a non-CVS controlled directory.
-      Doing so will prevent accidentally committing automatically
-      generated files into the CVS repository and help ensure that
-      the generated files and build scheme are correct.
-     ])
- fi
-])
-
-dnl Add compiler flags to the CXXFLAGS and CFLAGS variables when doing an
-dnl AC_TRY_COMPILE (not ACE_TRY_COMPILE).
-dnl Use this macro when adding include directories to the compiler flags,
-dnl for example.
-dnl Usage: ACE_TRY_COMPILE(COMPILER-FLAGS, INCLUDES, FUNCTION-BODY,
-dnl                        [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
-AC_DEFUN(ACE_TRY_COMPILE, dnl
-[
- ace_pre_try_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $1"
-
- ace_pre_try_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $1"
-
- AC_TRY_COMPILE($2, $3, $4, $5)
-
- dnl Restore the C++ and C flags
- CXXFLAGS="$ace_pre_try_CXXFLAGS"
- CFLAGS="$ace_pre_try_CFLAGS"
-
-])
-
-dnl Create a temporary empty file and remove it after commands are done using
-dnl it.  The directory in which the temporary file will be created in must
-dnl exist.  Files will be created under the source directory, not the build
-dnl directory.
-dnl Use this macro when you need a particular file available but want it to be
-dnl empty.  This is useful to prevent conflicts with autoconf's confdefs.h
-dnl header when doing an AC_TRY_COMPILE.
-dnl Usage: ACE_USE_TEMP_FILE(TEMP-FILE-TO-CREATE, COMMANDS-THAT-WILL-USE-IT)
-AC_DEFUN(ACE_USE_TEMP_FILE, dnl
-[
- if test -f ${srcdir}/$1; then
-   mv ${srcdir}/$1 ${srcdir}/$1.conf
- fi
-
- touch ${srcdir}/$1
-
- $2
-
- if test -f ${srcdir}/$1.conf; then
-   mv ${srcdir}/$1.conf ${srcdir}/$1
- else
-   rm ${srcdir}/$1
- fi
-])
-
-dnl Run given test(s) with warnings converted to errors
-dnl Usage: ACE_CONVERT_WARNINGS_TO_ERRORS(TEST-BLOCK)
-AC_DEFUN(ACE_CONVERT_WARNINGS_TO_ERRORS, dnl
-[
-dnl If we are using GNU C++, add the "-Werror" compiler flag to the 
-dnl current set of flags so that compiler warnings become errors.  We
-dnl do this to cause certain tests to fail when they are supposed to
-dnl fail.  Some of the tests pass because the GNU C++ compiler issues
-dnl warnings instead of errors when errors should occur.
-dnl Other "treat warnings as errors" flags for other compilers should
-dnl be added if possible.
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  $1
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
-])
-
-dnl Wrapper around AC_CACHE_VAL used to ensure "ACTION-IF" commands are run
-dnl even if results have been previously cached.
-dnl Usage: ACE_CACHE_CHECK(MESSAGE, CACHE-ID, COMMANDS-TO-SET-CACHE-VAL,
-dnl                        ACTION-IF-CACHE-ID-IS-YES,
-dnl                        ACTION-IF-CACHE-ID-IS-NO)
-dnl The COMMANDS-TO-SET-CACHE-VAL should set the CACHE-ID to yes or "no,"
-dnl otherwise the "ACTION-IF*" commands may not run.  The
-dnl COMMANDS-TO-SET-CACHE-VAL should only set the CACHE value.  For example,
-dnl no AC_DEFINES should be placed in the COMMANDS-TO-SET-CACHE-VAL.
-AC_DEFUN(ACE_CACHE_CHECK,
-[
-  AC_MSG_CHECKING([$1])
-  AC_CACHE_VAL([$2], [$3])
-  AC_MSG_RESULT([$]$2)
-  if test "[$]$2" != no; then
-    ace_just_a_place_holder=fixme
-ifelse([$4], , :, [$4])
-  else
-    ace_just_a_place_holder=fixme
-ifelse([$5], , , [$5
-])
-  fi
-])
-
-dnl   checks for programs
-
-dnl   checks for libraries
-
-dnl   checks for header files
-
-dnl   checks for typedefs
-
-dnl Check for specific typedef in given header file
-dnl Usage: ACE_CHECK_TYPE(TYPEDEF, INCLUDE,
-dnl                       [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl This macro can only check for one typedef in one header file at a time!!
-AC_DEFUN(ACE_CHECK_TYPE, dnl
-[
-dnl  AC_REQUIRE([AC_PROG_CXX])
-dnl  AC_REQUIRE([AC_PROG_CXXCPP])
-dnl  AC_REQUIRE([AC_LANG_CPLUSPLUS])
-
-  ACE_CACHE_CHECK(for $1 in $2, ace_cv_type_$1,
-    [
-     AC_TRY_COMPILE(
-       [
-#include <$2>
-       ],
-       [
-        $1 ace_$1;
-       ],
-       [
-        ace_cv_type_$1=yes
-       ],
-       [
-        ace_cv_type_$1=no
-       ])
-    ], $3, $4)
-])
-
-
-dnl   checks for structures
-
-dnl Check for specific struct in given header file
-dnl Usage: ACE_CHECK_STRUCT(STRUCTURE, INCLUDE,
-dnl                        [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl This macro can only check for one struct in one header file at a time!!
-AC_DEFUN(ACE_CHECK_STRUCT, dnl
-[
-dnl  AC_REQUIRE([AC_PROG_CXX])
-dnl  AC_REQUIRE([AC_PROG_CXXCPP])
-dnl  AC_REQUIRE([AC_LANG_CPLUSPLUS])
-
-dnl Do the transliteration at runtime so arg 1 can be a shell variable.
-dnl  ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
-
-  ACE_CACHE_CHECK(for struct $1 in $2, ace_cv_struct_$1,
-    [
-     ACE_TRY_COMPILE_STRUCT($1, $2,
-       [
-        ace_cv_struct_$1=yes
-       ],
-       [
-        ace_cv_struct_$1=no
-       ])
-    ], $3, $4)
-])
-
-dnl Check for specific struct in given header file by compiling a test
-dnl program.  This macro is used by ACE_CHECK_STRUCT.
-dnl Usage: ACE_TRY_COMPILE_STRUCT(STRUCTURE, INCLUDE,
-dnl                         [ACTION-IF-SUCCESSFUL[, ACTION-IF-NOT-SUCCESSFUL]])
-dnl This macro can only check for one struct in one header file at a time!!
-AC_DEFUN(ACE_TRY_COMPILE_STRUCT, dnl
-[
-dnl  AC_REQUIRE([AC_PROG_CXX])
-dnl  AC_REQUIRE([AC_PROG_CXXCPP])
-dnl  AC_REQUIRE([AC_LANG_CPLUSPLUS])
-
-     AC_TRY_COMPILE(
-       [
-#include <$2>
-       ],
-       [
-        struct $1 ace_$1;
-       ],
-       [
-        $3
-       ],
-       [
-dnl Some compilers don't like the "struct" but we need the struct for some
-dnl platforms to resolve ambiguities between functions and structures with
-dnl with the same name.  So, we try the same test but without "struct" if
-dnl the above test with "struct" fails.  If both tests fail, then we can
-dnl be reasonably sure that we don't have the structure we are testing for.
-        AC_TRY_COMPILE(
-          [
-#include <$2>
-          ],
-          [
-           $1 ace_$1;
-          ],
-          [
-           $3
-          ],
-          [
-           $4
-          ])
-       ])
-])
-
-dnl   checks for variables
-
-dnl   checks for compiler characteristics
-
-dnl   checks for library functions
-
-dnl Check for function using prototype in header
-dnl This macro is used if a function is called a different name in a given
-dnl library than what is in the header file but the difference is made
-dnl transparent to the user since the header may provide a macro to make
-dnl things "transparent."  If the given header does not exist then this
-dnl macro acts just like the standard AC_CHECK_FUNC macro.
-dnl Usage: ACE_CHECK_FUNC(FUNCTION, HEADER,
-dnl                        [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-AC_DEFUN(ACE_CHECK_FUNC, dnl
-[
-dnl  AC_REQUIRE([AC_PROG_CXX])
-dnl  AC_REQUIRE([AC_PROG_CXXCPP])
-dnl  AC_REQUIRE([AC_LANG_CPLUSPLUS])
-  AC_REQUIRE([AC_PROG_AWK])
-
-  AC_TRY_CPP(
-    [
-#include <$2>
-    ], ace_header_exists=yes, ace_header_exists=no)
-
-  cat > conftest.$ac_ext <<EOF
-
-#include <$2>
-  ACE_REAL_FUNCTION $1
-
-EOF
-
-  if test "$ace_header_exists" = yes; then
-    if test -z "$AWK"; then
-      AC_MSG_WARN(No awk program found.  "Real" function may not be found.)
-    fi
-
-    if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-       egrep "ACE_REAL_FUNCTION" | 
-       (eval "$AWK '{print \[$]2}' > conftest.awk 2>&1"); then
-         rm -f conftest.$ac_ext
-         ace_real_function=`cat conftest.awk`
-         rm -f conftest.awk
-    fi
-
-    if test $1 != "$ace_real_function"; then
-      AC_MSG_CHECKING(for real $1 from $2)
-      AC_MSG_RESULT($ace_real_function)
-    fi
-  else
-    ace_real_function=$1
-  fi dnl test "$ace_header_not_exist" != yes
-
-  AC_CHECK_FUNC($ace_real_function, $3, $4)
-])
-
-dnl Check for function in library using prototype in header
-dnl This macro is used if a function is called a different name in a given
-dnl library than what is in the header file but the difference is made
-dnl transparent to the user since the header may provide a macro to make
-dnl things "transparent."  If the given header does not exist then this
-dnl macro acts just like the standard AC_CHECK_LIB macro.
-dnl Usage: ACE_CHECK_LIB(LIBRARY, FUNCTION, HEADER,
-dnl                        [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-AC_DEFUN(ACE_CHECK_LIB, dnl
-[
-dnl  AC_REQUIRE([AC_PROG_CXX])
-dnl  AC_REQUIRE([AC_PROG_CXXCPP])
-dnl  AC_REQUIRE([AC_LANG_CPLUSPLUS])
-  AC_REQUIRE([AC_PROG_AWK])
-
-  AC_TRY_CPP(
-    [
-#include <$3>
-    ], ace_header_exists=yes, ace_header_exists=no)
-
-  cat > conftest.$ac_ext <<EOF
-
-#include <$3>
-  ACE_REAL_FUNCTION $2
-
-EOF
-
-  if test "$ace_header_exists" = yes; then
-    if test -z "$AWK"; then
-      AC_MSG_WARN(No awk program found.  "Real" function in library may not be found.)
-    fi
-
-    if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-       egrep "ACE_REAL_FUNCTION" |
-       eval "$AWK '{print \[$]2}'" > conftest.awk 2>&1; then
-        rm -f conftest.$ac_ext
-        ace_real_function=`cat conftest.awk`
-        rm -f conftest.awk
-    fi
-
-    if test $2 != "$ace_real_function"; then
-      AC_MSG_CHECKING(for real $2 from $3)
-      AC_MSG_RESULT($ace_real_function)
-    fi
-  else
-    ace_real_function=$2
-  fi dnl test "$ace_header_not_exist" != yes
-
-  AC_CHECK_LIB($1, $ace_real_function, $4, $5)
-])
-
-
-dnl   checks for structures
-
-dnl   checks for system services
-
-
-dnl *********************** SPECIAL SECTION *******************************
-dnl
-dnl This section contains my own *re*implementation of the functionality
-dnl provided by some tests/macros found in GNU Autoconf since the ones found
-dnl in Autoconf don't appear to work as expected.
-dnl
-dnl                -Ossama Othman <ossama@debian.org>
-dnl
-dnl The copyright for the following macros is listed below.
-dnl Note that all macros listed prior to this section are copyrighted
-dnl by Ossama Othman, not the Free Software Foundation.  Nevertheless,
-dnl all software found in this file is free software.  Please read the
-dnl distribution terms found at the top of this file and the ones below.
-
-dnl Parameterized macros.
-dnl Requires GNU m4.
-dnl This file is part of Autoconf.
-dnl Copyright (C) 1992, 93, 94, 95, 96, 1998 Free Software Foundation, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-dnl
-dnl As a special exception, the Free Software Foundation gives unlimited
-dnl permission to copy, distribute and modify the configure scripts that
-dnl are the output of Autoconf.  You need not follow the terms of the GNU
-dnl General Public License when using or distributing such scripts, even
-dnl though portions of the text of Autoconf appear in them.  The GNU
-dnl General Public License (GPL) does govern all other use of the material
-dnl that constitutes the Autoconf program.
-dnl
-dnl Certain portions of the Autoconf source text are designed to be copied
-dnl (in certain cases, depending on the input) into the output of
-dnl Autoconf.  We call these the "data" portions.  The rest of the Autoconf
-dnl source text consists of comments plus executable code that decides which
-dnl of the data portions to output in any given case.  We call these
-dnl comments and executable code the "non-data" portions.  Autoconf never
-dnl copies any of the non-data portions into its output.
-dnl
-dnl This special exception to the GPL applies to versions of Autoconf
-dnl released by the Free Software Foundation.  When you make and
-dnl distribute a modified version of Autoconf, you may extend this special
-dnl exception to the GPL to apply to your modified version as well, *unless*
-dnl your modified version has the potential to copy into its output some
-dnl of the text that was the non-data portion of the version that you started
-dnl with.  (In other words, unless your change moves or copies text from
-dnl the non-data portions to the data portions.)  If your modification has
-dnl such potential, you must delete any notice of this special exception
-dnl to the GPL from your modified version.
-dnl
-dnl Written by David MacKenzie, with help from
-dnl Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor,
-dnl Roland McGrath, Noah Friedman, david d zuhn, and many others.
-
-
-dnl Usage: ACE_SEARCH_LIBS(FUNCTION, SEARCH-LIBS [, ACTION-IF-FOUND
-dnl                        [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
-dnl Search for a library defining FUNCTION, if it's not already available.
-AC_DEFUN(ACE_SEARCH_LIBS,
-[
- AC_CACHE_CHECK(for library containing $1, ac_cv_search_$1,
-   [
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_$1="no"
-
-    ACE_TRY_LINK_FUNC([$1], [ac_cv_search_$1="none required"])
-
-    test "$ac_cv_search_$1" = "no" && for i in $2; do
-      LIBS="-l$i $5 $ac_func_search_save_LIBS"
-      ACE_TRY_LINK_FUNC($1,
-        [
-         ac_cv_search_$1="-l$i"
-         break
-        ])
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   ])
-
-  if test "$ac_cv_search_$1" != "no"; then
-    test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
-    $3
-  else :
-    $4
-  fi
-])
-
-dnl Usage: ACE_TRY_LINK_FUNC(FUNCTION,[, ACTION-IF-FOUND
-dnl                          [, ACTION-IF-NOT-FOUND])
-dnl Search for a library defining FUNCTION, if it's not already available.
-AC_DEFUN(ACE_TRY_LINK_FUNC,
-[
-AC_TRY_LINK(
-dnl Don't include <ctype.h> because on OSF/1 3.0 it includes <sys/types.h>
-dnl which includes <sys/select.h> which contains a prototype for
-dnl select.  Similarly for bzero.
-[/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $1(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-extern "C"
-#endif
-])dnl
-[/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $1();
-], [
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$1) || defined (__stub___$1)
-choke me
-#else
-$1();
-#endif
-],[$2],[$3])
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-
-# Define a conditional.
-
-AC_DEFUN(AM_CONDITIONAL,
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-
-dnl AM_PROG_LEX
-dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
-AC_DEFUN(AM_PROG_LEX,
-[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
-AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
-AC_PROG_LEX
-AC_DECL_YYTEXT])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN(AM_MAINTAINER_MODE,
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-dnl -------------------------------------------------------------------------
-dnl       $Id$
-dnl 
-dnl       subsets.m4
-dnl
-dnl       ACE M4 include file which contains ACE specific M4 macros
-dnl       that set/determine which ACE subsets to build.
-dnl 
-dnl -------------------------------------------------------------------------
-
-dnl  Copyright (C) 1998, 1999  Ossama Othman
-dnl
-dnl  All Rights Reserved
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the current ACE distribution terms.
-dnl 
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-
-dnl Check for thread related libraries and compiler flags
-dnl Usage: ACE_CHECK_SUBSETS
-AC_DEFUN(ACE_CHECK_SUBSETS, dnl
-[
-
-dnl Begin ACE_CHECK_SUBSETS
-
-dnl Assume all subsets will be built, including the full ACE library.
-dnl If any of the components is explicitly enabled or disabled by the user
-dnl then do NOT build the full ACE library.
-AC_ARG_ENABLE(lib-all,
-              [  --enable-lib-all        build all ACE components        [default=yes]],
-              [
-               case "${enableval}" in
-                yes)
-                  ace_user_enable_lib_all=yes
-                  ;;
-                no)
-                  ace_user_enable_lib_all=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-all)
-                  ;;
-               esac
-              ],
-              [
-               ace_user_enable_lib_all=yes
-              ])
-
-AC_ARG_ENABLE(lib-full,
-              [  --enable-lib-full       build the full ACE library      [default=yes]],
-              [
-               case "${enableval}" in
-                yes)
-                  ace_user_enable_lib_full=yes
-                  ;;
-                no)
-                  ace_user_enable_lib_full=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-full)
-                  ;;
-               esac
-              ],
-              [
-               ace_user_enable_lib_full=yes
-              ])
-
-AC_ARG_ENABLE(lib-os,
-              [  --enable-lib-os         build libACE_OS library         ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_OS
-                  ;;
-                no)
-                  ace_user_enable_lib_os=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-os)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-utils,
-              [  --enable-lib-utils      build libACE_Utils library      ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_UTILS
-                  ;;
-                no)
-                  ace_user_enable_lib_utils=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-utils)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-logging,
-              [  --enable-lib-logging    build libACE_Logging library    ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_LOGGING
-                  ;;
-                no)
-                  ace_user_enable_lib_logging=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-logging)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-threads,
-              [  --enable-lib-threads    build libACE_Threads library    ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_THREADS
-                  ;;
-                no)
-                  ace_user_enable_lib_threads=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-threads)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-demux,
-              [  --enable-lib-demux      build libACE_Demux library      ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_DEMUX
-                  ;;
-                no)
-                  ace_user_enable_lib_demux=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-demux)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-connection,
-              [  --enable-lib-connection build libACE_Connection library ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_CONNECTION
-                  ;;
-                no)
-                  ace_user_enable_lib_connection=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-connection)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-sockets,
-              [  --enable-lib-sockets    build libACE_Sockets library    ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_SOCKETS
-                  ;;
-                no)
-                  ace_user_enable_lib_sockets=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-sockets)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-ipc,
-              [  --enable-lib-ipc        build libACE_IPC library        ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_IPC
-                  ;;
-                no)
-                  ace_user_enable_lib_ipc=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-ipc)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-svcconf,
-              [  --enable-lib-svcconf    build libACE_Svcconf library    ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_SVCCONF
-                  ;;
-                no)
-                  ace_user_enable_lib_svcconf=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-svcconf)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-streams,
-              [  --enable-lib-streams    build libACE_Streams library    ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_STREAMS
-                  ;;
-                no)
-                  ace_user_enable_lib_streams=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-streams)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-memory,
-              [  --enable-lib-memory     build libACE_Memory library     ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_MEMORY
-                  ;;
-                no)
-                  ace_user_enable_lib_memory=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-memory)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-token,
-              [  --enable-lib-token      build libACE_Token library      ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_TOKEN
-                  ;;
-                no)
-                  ace_user_enable_lib_token=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-token)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-AC_ARG_ENABLE(lib-other,
-              [  --enable-lib-other      build libACE_Other library      ],
-              [
-               case "${enableval}" in
-                yes)
-                  ACE_CREATE_LIBACE_OTHER
-                  ;;
-                no)
-                  ace_user_enable_lib_other=no
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-lib-other)
-                  ;;
-               esac
-
-               dnl Disable full ACE library build
-               ace_user_enable_lib_full=no
-              ],)
-
-
-dnl If no ACE subsets were explicitly enabled or disabled then build
-dnl all of them.
-if test $ace_user_enable_lib_all = yes; then
-
-  ACE_CREATE_ALL_COMPONENTS
-
-elif test $ace_user_enable_lib_all = no; then
-
-  ACE_DISABLE_ALL_COMPONENTS
-
-fi
-
-if test $ace_user_enable_lib_full = no &&
-   test $ace_user_enable_lib_os = no &&
-   test $ace_user_enable_lib_utils = no &&
-   test $ace_user_enable_lib_logging = no &&
-   test $ace_user_enable_lib_threads = no &&
-   test $ace_user_enable_lib_demux = no &&
-   test $ace_user_enable_lib_connection = no &&
-   test $ace_user_enable_lib_sockets = no &&
-   test $ace_user_enable_lib_ipc = no &&
-   test $ace_user_enable_lib_svcconf = no &&
-   test $ace_user_enable_lib_streams = no &&
-   test $ace_user_enable_lib_memory = no &&
-   test $ace_user_enable_lib_token = no &&
-   test $ace_user_enable_lib_other = no; then
-
-  dnl If we get here then no ACE libraries will be built!
-  AC_MSG_ERROR(no ACE components will be built.  Specify which components to build)
-
-fi  dnl No components will be built!
-
-dnl Set which ACE subsets to build
-AM_CONDITIONAL(BUILD_OS_FILES,
-               test X$ace_user_enable_lib_os = Xyes)
-
-AM_CONDITIONAL(BUILD_UTILS_FILES,
-               test X$ace_user_enable_lib_utils = Xyes)
-
-AM_CONDITIONAL(BUILD_LOGGING_FILES,
-               test X$ace_user_enable_lib_logging = Xyes)
-
-AM_CONDITIONAL(BUILD_THREADS_FILES,
-               test X$ace_user_enable_lib_threads = Xyes)
-
-AM_CONDITIONAL(BUILD_DEMUX_FILES,
-               test X$ace_user_enable_lib_demux = Xyes)
-
-AM_CONDITIONAL(BUILD_CONNECTION_FILES,
-               test X$ace_user_enable_lib_connection = Xyes)
-
-AM_CONDITIONAL(BUILD_SOCKETS_FILES,
-               test X$ace_user_enable_lib_sockets = Xyes)
-
-AM_CONDITIONAL(BUILD_IPC_FILES,
-               test X$ace_user_enable_lib_ipc = Xyes)
-
-AM_CONDITIONAL(BUILD_SVCCONF_FILES,
-               test X$ace_user_enable_lib_svcconf = Xyes)
-
-AM_CONDITIONAL(BUILD_STREAMS_FILES,
-               test X$ace_user_enable_lib_streams = Xyes)
-
-AM_CONDITIONAL(BUILD_MEMORY_FILES,
-               test X$ace_user_enable_lib_memory = Xyes)
-
-AM_CONDITIONAL(BUILD_TOKEN_FILES,
-               test X$ace_user_enable_lib_token = Xyes)
-
-AM_CONDITIONAL(BUILD_OTHER_FILES,
-               test X$ace_user_enable_lib_other = Xyes)
-
-AM_CONDITIONAL(BUILD_FULL_LIBRARY,
-               test X$ace_user_enable_lib_full = Xyes)
-
-dnl End ACE_CHECK_SUBSETS
-])
-
-dnl Set the component dependencies for the libACE_OS library
-dnl Usage: ACE_CREATE_LIBACE_OS
-AC_DEFUN(ACE_CREATE_LIBACE_OS,
-[
- ace_user_enable_lib_os=yes
-])
-
-dnl Set the component dependencies for the libACE_Utils library
-dnl Usage: ACE_CREATE_LIBACE_UTILS
-AC_DEFUN(ACE_CREATE_LIBACE_UTILS,
-[
- ace_user_enable_lib_utils=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
-])
-
-dnl Set the component dependencies for the libACE_Logging library
-dnl Usage: ACE_CREATE_LIBACE_Logging
-AC_DEFUN(ACE_CREATE_LIBACE_LOGGING,
-[
- ace_user_enable_lib_logging=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
-])
-
-dnl Set the component dependencies for the libACE_Threads library
-dnl Usage: ACE_CREATE_LIBACE_THREADS
-AC_DEFUN(ACE_CREATE_LIBACE_THREADS,
-[
- ace_user_enable_lib_threads=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
-])
-
-dnl Set the component dependencies for the libACE_Demux library
-dnl Usage: ACE_CREATE_LIBACE_DEMUX
-AC_DEFUN(ACE_CREATE_LIBACE_DEMUX,
-[
- ace_user_enable_lib_demux=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
- ACE_CREATE_LIBACE_THREADS
-])
-
-dnl Set the component dependencies for the libACE_Connection library
-dnl Usage: ACE_CREATE_LIBACE_CONNECTION
-AC_DEFUN(ACE_CREATE_LIBACE_CONNECTION,
-[
- ace_user_enable_lib_connection=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
- ACE_CREATE_LIBACE_THREADS
- ACE_CREATE_LIBACE_DEMUX
-])
-
-dnl Set the component dependencies for the libACE_Sockets library
-dnl Usage: ACE_CREATE_LIBACE_SOCKETS
-AC_DEFUN(ACE_CREATE_LIBACE_SOCKETS,
-[
- ace_user_enable_lib_sockets=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
-])
-
-dnl Set the component dependencies for the libACE_IPC library
-dnl Usage: ACE_CREATE_LIBACE_IPC
-AC_DEFUN(ACE_CREATE_LIBACE_IPC,
-[
- ace_user_enable_lib_ipc=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
- ACE_CREATE_LIBACE_SOCKETS
-])
-
-dnl Set the component dependencies for the libACE_Svcconf library
-dnl Usage: ACE_CREATE_LIBACE_SVCCONF
-AC_DEFUN(ACE_CREATE_LIBACE_SVCCONF,
-[
- ace_user_enable_lib_svcconf=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
- ACE_CREATE_LIBACE_THREADS
- ACE_CREATE_LIBACE_DEMUX
- ACE_CREATE_LIBACE_SOCKETS
-])
-
-dnl Set the component dependencies for the libACE_Streams library
-dnl Usage: ACE_CREATE_LIBACE_STREAMS
-AC_DEFUN(ACE_CREATE_LIBACE_STREAMS,
-[
- ace_user_enable_lib_streams=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
- ACE_CREATE_LIBACE_THREADS
- ACE_CREATE_LIBACE_DEMUX
-])
-
-dnl Set the component dependencies for the libACE_Memory library
-dnl Usage: ACE_CREATE_LIBACE_MEMORY
-AC_DEFUN(ACE_CREATE_LIBACE_MEMORY,
-[
- ace_user_enable_lib_memory=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
-])
-
-dnl Set the component dependencies for the libACE_Token library
-dnl Usage: ACE_CREATE_LIBACE_TOKEN
-AC_DEFUN(ACE_CREATE_LIBACE_TOKEN,
-[
- ace_user_enable_lib_token=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
- ACE_CREATE_LIBACE_UTILS
- ACE_CREATE_LIBACE_LOGGING
- ACE_CREATE_LIBACE_THREADS
- ACE_CREATE_LIBACE_DEMUX
- ACE_CREATE_LIBACE_CONNECTION
- ACE_CREATE_LIBACE_SOCKETS
- ACE_CREATE_LIBACE_IPC
- ACE_CREATE_LIBACE_SVCCONF
- ACE_CREATE_LIBACE_STREAMS
- ACE_CREATE_LIBACE_MEMORY
- dnl ACE_CREATE_LIBACE_OTHER
-])
-
-dnl Set the component dependencies for the libACE_Utils library
-dnl Usage: ACE_CREATE_LIBACE_OTHER
-AC_DEFUN(ACE_CREATE_LIBACE_OTHER,
-[
- ace_user_enable_lib_other=yes
-
- dnl Be careful not to go into a circular/recursive loop with these macros!
- ACE_CREATE_LIBACE_OS
- ACE_CREATE_LIBACE_UTILS
- ACE_CREATE_LIBACE_LOGGING
- ACE_CREATE_LIBACE_THREADS
- ACE_CREATE_LIBACE_DEMUX
- ACE_CREATE_LIBACE_CONNECTION
- ACE_CREATE_LIBACE_SOCKETS
- ACE_CREATE_LIBACE_IPC
- ACE_CREATE_LIBACE_SVCCONF
- ACE_CREATE_LIBACE_STREAMS
- ACE_CREATE_LIBACE_MEMORY
- dnl ACE_CREATE_LIBACE_TOKEN
-])
-
-dnl Build all ACE component libraries
-dnl Usage: ACE_CREATE_ALL_COMPONENTS
-AC_DEFUN(ACE_CREATE_ALL_COMPONENTS,
-[
- ace_user_enable_lib_os=yes
- ace_user_enable_lib_utils=yes
- ace_user_enable_lib_logging=yes
- ace_user_enable_lib_threads=yes
- ace_user_enable_lib_demux=yes
- ace_user_enable_lib_connection=yes
- ace_user_enable_lib_sockets=yes
- ace_user_enable_lib_ipc=yes
- ace_user_enable_lib_svcconf=yes
- ace_user_enable_lib_streams=yes
- ace_user_enable_lib_memory=yes
- ace_user_enable_lib_token=yes
- ace_user_enable_lib_other=yes
-])
-
-dnl Disable all ACE component libraries
-dnl Usage: ACE_CREATE_ALL_COMPONENTS
-AC_DEFUN(ACE_DISABLE_ALL_COMPONENTS,
-[
- ace_user_enable_lib_os=no
- ace_user_enable_lib_utils=no
- ace_user_enable_lib_logging=no
- ace_user_enable_lib_threads=no
- ace_user_enable_lib_demux=no
- ace_user_enable_lib_connection=no
- ace_user_enable_lib_sockets=no
- ace_user_enable_lib_ipc=no
- ace_user_enable_lib_svcconf=no
- ace_user_enable_lib_streams=no
- ace_user_enable_lib_memory=no
- ace_user_enable_lib_token=no
- ace_user_enable_lib_other=no
-])
-
-dnl -------------------------------------------------------------------------
-dnl       $Id$
-dnl 
-dnl       compiler.m4
-dnl
-dnl       ACE M4 include file which contains ACE specific M4 macros
-dnl       that set/determine compiler configurations for ACE.
-dnl 
-dnl -------------------------------------------------------------------------
-
-dnl  Copyright (C) 1998, 1999  Ossama Othman
-dnl
-dnl  All Rights Reserved
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the current ACE distribution terms.
-dnl 
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-
-dnl Macros to set flags for a given compiler on a given platform.
-dnl The flags set here are generally only useful for _KNOWN_ compilers.
-
-dnl ACE_SET_COMPILER_FLAGS
-dnl Usage: ACE_SET_COMPILER_FLAGS
-AC_DEFUN(ACE_SET_COMPILER_FLAGS, dnl
-[
- AC_BEFORE([$0], [AM_PROG_LIBTOOL]) dnl
-
- dnl Make sure we know what C++ compiler and preprocessor we have!
- AC_REQUIRE([AC_PROG_CXX])
- AC_REQUIRE([AC_PROG_CXXCPP])
- AC_REQUIRE([AC_LANG_CPLUSPLUS])
-
- dnl Compiler Flag Key
- dnl    CXXFLAGS  - C++ flags to use during the configure script run and
- dnl                during ACE compilation.  The user may set this prior to
- dnl                running the configure script.  As such, it is important
- dnl                not to replace the existing value of CXXFLAGS; rather
- dnl                one should only add to it.
- dnl    ACE_CXXFLAGS - General C++ flags the configure script should set before
- dnl                   CXXFLAGS to allow the user override them.
- dnl    DCXXFLAGS - C++ debugging flags
- dnl    OCXXFLAGS - C++ optimization flags
-
- case "$target" in
-   *aix4.2* | *aix4.3*)
-     case "$CXX" in
-       xlC*)
-         CXXFLAGS="$CXXFLAGS"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS -qtempinc -qlanglvl=ansi -qflag=w:w -qinfo"
-         DCXXFLAGS="-g -qcheck=nobounds:div:null"
-         OCXXFLAGS="-qarch=com"
-         ;;
-       *)
-         if test -n "$GXX"; then
-           ACE_CXXFLAGS="-mcpu=common"
-         fi
-         ;;
-     esac
-     ;;
-   *aix4.1*)
-     case "$CXX" in
-       xlC*)
-         CXXFLAGS="$CXXFLAGS"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS -qxcall -qtempinc"
-         DCXXFLAGS="-g"
-         OCXXFLAGS="-qarch=ppc -qtune=604"
-         ;;
-       *)
-         if test -n "$GXX"; then
-           ACE_CXXFLAGS="-mcpu=common"
-         fi
-         ;;
-     esac
-     ;;
-   *chorus*)
-     ;;
-   *cray*)
-     ;;
-   *dgux*)
-     case "$CXX" in
-       ec++)
-         CXXFLAGS="$CXXFLAGS"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS -relax -v -eh"
-         DCXXFLAGS="-g"
-         OCXXFLAGS=""
-         ;;
-       *)
-         if test -n "$GXX"; then
-           ACE_CXXFLAGS="$ACE_CXXFLAGS"
-         fi
-         ;;
-     esac
-     ;;
-   *freebsd*)
-     case "$CXX" in
-       *)
-         if test -n "$GXX"; then       
-           CXXFLAGS="$CXXFLAGS"
-           ACE_CXXFLAGS="$ACE_CXXFLAGS -w -fno-strict-prototypes"
-           DCXXFLAGS=""
-           OCXXFLAGS=""
-         fi
-         ;;
-     esac
-     ;;
-   *hpux*)
-     case "$CXX" in
-       CC)
-         CXXFLAGS="$CXXFLAGS -pta -ti,/bin/true -tr,/bin/true"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS -Aa -z +a1"
-         DCXXFLAGS="-g"
-         OCXXFLAGS=""
-         ;;
-       aCC)
-         CXXFLAGS="$CXXFLAGS"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS +W829,302"
-         DCXXFLAGS="-g"
-         OCXXFLAGS=""
-         ;;
-       *)
-         if test -n "$GXX"; then
-           ACE_CXXFLAGS="$ACE_CXXFLAGS -w"
-         fi
-         ;;
-     esac
-     ;;
-   *irix*)
-
-     ;;
-   *linux*)
-     case "$CXX" in
-       *)
-         if test -n "$GXX"; then
-           CXXFLAGS="$CXXFLAGS"
-           ACE_CXXFLAGS="$ACE_CXXFLAGS"
-           DCXXFLAGS="$DCXXFLAGS"
-           OCXXFLAGS="-O3"
-         fi
-         ;;
-     esac
-     ;;
-   *lynxos*)
-     ;;
-   *m88k*)
-     ;;
-   *mvs*)
-     ;;
-   *netbsd*)
-     ;;
-   *osf*)
-     ;;
-   *psos*)
-     ;;
-   *sco*)
-     ;;
-   *sunos4*)
-     ;;
-   *solaris2*)
-     case "$CXX" in
-       CC)
-         dnl Some flags only work with Sun C++ 4.2
-         if (CC -V 2>&1 | egrep 'Compilers 4\.2' > /dev/null); then
-           CXXFLAGS="$CXXFLAGS -features=castop"
-           if test "$ace_user_enable_rtti" = yes; then
-             CXXFLAGS="$CXXFLAGS -features=rtti"
-           fi 
-         fi
-
-         if test "$ace_user_enable_exceptions" != yes; then
-           CXXFLAGS="$CXXFLAGS -noex"
-         fi
-
-         CXXFLAGS="$CXXFLAGS"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS"
-         DCXXFLAGS="$DCXXFLAGS -g"
-         OCXXFLAGS="$OCXXFLAGS -O"
-         LDFLAGS="$LDFLAGS -xildoff"
-         ;;
-     esac
-     ;;
-   *tandem*)
-     ;;
-   *unixware*)
-     ;;
-   *vxworks*)
-     ;;
-   *)
-     CXXFLAGS="$CXXFLAGS"
-     ACE_CXXFLAGS="$ACE_CXXFLAGS"
-     DCXXFLAGS="-g"
-     OCXXFLAGS="-O"
-     ;;
- esac
-])
-
-
-# serial 40 AC_PROG_LIBTOOL
-AC_DEFUN(AC_PROG_LIBTOOL,
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN(AC_LIBTOOL_SETUP,
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-dnl
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AC_ENABLE_SHARED, [dnl
-define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AC_ENABLE_STATIC, [dnl
-define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
-define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AC_PROG_LD,
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
-    # Accept absolute paths.
-changequote(,)dnl
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-changequote([,])dnl
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(ac_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN(AC_PROG_LD_GNU,
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi])
-])
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AC_PROG_NM,
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(ac_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  ac_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$ac_dir/nm -B"
-	break
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$ac_dir/nm -p"
-	break
-      else
-	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-fi])
-NM="$ac_cv_path_NM"
-AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN(AC_CHECK_LIBM,
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case "$host" in
-*-*-beos* | *-*-cygwin*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library, adds --enable-ltdl-convenience to
-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-# '${top_builddir}/' (note the single quotes!) if your package is not
-# flat, and, if you're not using automake, define top_builddir as
-# appropriate in the Makefiles.
-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case "$enable_ltdl_convenience" in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
-  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library, and adds --enable-ltdl-install to
-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-# '${top_builddir}/' (note the single quotes!) if your package is not
-# flat, and, if you're not using automake, define top_builddir as
-# appropriate in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
-    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-dnl old names
-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-dnl -------------------------------------------------------------------------
-dnl       $Id$
-dnl 
-dnl       threads.m4
-dnl 
-dnl       ACE M4 include file which contains ACE specific M4 macros
-dnl       for configuring thread support.  This file is to be used
-dnl       with the configure script.
-dnl 
-dnl -------------------------------------------------------------------------
-
-dnl  Copyright (C) 1998, 1999  Ossama Othman
-dnl
-dnl  All Rights Reserved
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the current ACE distribution terms.
-dnl 
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-dnl Make sure thread library exists
-dnl We need to be careful when tests for other thread libraries are
-dnl added that we don't screw up handling of "ace_user_enable_threads"
-dnl Tests should probably be more platform specific later on.
-
-dnl Check for thread related libraries and compiler flags
-dnl Usage: ACE_CHECK_THREADS
-AC_DEFUN(ACE_CHECK_THREADS, dnl
-[
-dnl  AC_REQUIRE([AC_PROG_CXX])
-dnl  AC_REQUIRE([AC_PROG_CXXCPP])
-dnl  AC_REQUIRE([AC_LANG_CPLUSPLUS])
-
-dnl Check if compiler accepts specific flag to enable threads
- ACE_CACHE_CHECK(if compiler may need a thread flag,
-   ace_cv_feature_may_need_thread_flag,
-   [
-    ACE_CHECK_THREAD_FLAGS(
-      [
-       ace_cv_feature_may_need_thread_flag=no
-      ],
-      [
-       ace_cv_feature_may_need_thread_flag=yes
-      ])
-   ],
-   [
-    dnl The compiler/platform has no thread support linked in by default
-    dnl so search for a usable compiler flag to enable thread support.
-    dnl If no thread flag is found then the remaining tests should still
-    dnl figure out how to enable thread support via library checks.
-    ACE_SEARCH_THREAD_FLAGS(
-      [mt pthread pthreads mthreads threads Kthread -thread_safe],,)
-      dnl NOTE: "-thread_safe" is correct, not "thread_safe."
-      dnl       KAI C++ uses the flag "--thread_safe" which is why
-      dnl       "-thread_safe" is passed as the flag to test.
-   ],
-   [
-    dnl Do nothing
-   ])
-
- dnl Check for UNIX International Threads -- STHREADS
- ACE_SEARCH_LIBS(thr_create, thread,
-   [
-    ace_has_sthreads=yes
-    AC_DEFINE(ACE_HAS_STHREADS)
-   ],
-   [
-    ace_has_sthreads=no
-   ])
-
- dnl Sometimes thr_create is actually found with explicitly linking against
- dnl -lthread, so try a more "exotic" function.
- ACE_SEARCH_LIBS(rwlock_destroy, thread,,)
-
- dnl Check for POSIX threads
- dnl
- dnl Check if platform provides pthreads backward compatibility macros
- dnl (Some platforms may define some pthread functions such as
- dnl  pthread_create() as macros when using a later implementation of
- dnl  pthreads.  For example, Digital Unix 4.0 #defines a pthread_create
- dnl  macro as "__pthread_create" to allow the new implemenation of
- dnl  pthread_create() to co-exist with the old implementation of
- dnl  of pthread_create().)
-
- ACE_CACHE_CHECK(for pthreads backward compatibility macros,
-   ace_cv_lib_pthread_compat_macros,
-   [
-    AC_EGREP_CPP(ACE_PTHREAD_MACROS,
-      [
-#include <pthread.h>
-
-#if defined (pthread_create)
-  ACE_PTHREAD_MACROS
-#endif
-      ],
-      [
-       ace_cv_lib_pthread_compat_macros=yes
-      ],
-      [
-       ace_cv_lib_pthread_compat_macros=no
-      ])
-   ],
-   [
-    dnl Check if pthread function names are mangled (e.g. DU 4.0)
-    dnl to maintain older Pthread Draft compatibility.
-    ACE_CHECK_FUNC(pthread_create, pthread.h,
-      [
-       ace_has_pthreads=yes
-       AC_DEFINE(ACE_HAS_PTHREADS)
-      ],
-      [
-       ACE_CHECK_LIB(pthread, pthread_create, pthread.h, dnl
-         [
-          ace_has_pthreads=yes
-          dnl Since we AC_DEFINE(ACE_HAS_PTHREADS), the default behavior
-          dnl of adding "-lpthread" to the "LIBS" variable no longer
-          dnl works, so we have to add it manually.
-          LIBS="$LIBS -lpthread"
-          AC_DEFINE(ACE_HAS_PTHREADS)
-         ],
-         [
-          ace_has_pthreads=yes
-         ])
-      ])
-   ],
-   [
-    ACE_SEARCH_LIBS(pthread_create, pthread pthreads c_r gthreads,
-      [
-       ace_has_pthreads=yes
-       AC_DEFINE(ACE_HAS_PTHREADS)
-      ],
-      [
-       ace_has_pthreads=no
-      ])
-   ])
-
-
- dnl If we don't have any thread library, then disable threading altogether!
- if test "$ace_has_pthreads" != yes && 
-    test "$ace_has_sthreads" != yes; then
-   ace_user_enable_threads=no
- fi
-])
-
-dnl This macro will check that the current compiler flags do something
-dnl useful in terms of thread libraries and/or functions.
-dnl Usage: ACE_CHECK_THREAD_FLAGS(ACTION-IF-USABLE [, ACTION-IF-NOT-USABLE]])
-AC_DEFUN(ACE_CHECK_THREAD_FLAGS, dnl
-[
-ACE_CONVERT_WARNINGS_TO_ERRORS([
-AC_TRY_LINK(
-[
-#ifndef _REENTRANT
-#error _REENTRANT was not defined
-THROW ME AN ERROR!
-#endif
-]
-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-extern "C"
-#endif
-])
-[
-char thr_create();
-], [
-thr_create();
-], [$1],
-[
-  AC_REQUIRE([AC_PROG_AWK])
-
-  AC_TRY_CPP(
-    [
-#include <pthread.h>
-    ],
-    [
-     cat > conftest.$ac_ext <<EOF
-
-#include <pthread.h>
-  ACE_REAL_FUNCTION pthread_create
-
-EOF
-
-     if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-        egrep "ACE_REAL_FUNCTION" | 
-        (eval "$AWK '{print \[$]2}' > conftest.awk 2>&1"); then
-          rm -f conftest.$ac_ext
-          ace_real_function=`cat conftest.awk`
-          rm -f conftest.awk
-     fi
-    ],
-    [
-     ace_real_function="pthread_create"
-    ])
-
-AC_TRY_LINK(
-[
-#ifndef _REENTRANT
-#error _REENTRANT was not defined
-THROW ME AN ERROR!
-#endif
-]
-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-extern "C"
-#endif
-])dnl
-[
-char $ace_real_function();
-], [
-$ace_real_function();
-], [$1],[$2])
-
-  ])
- ])
-])
-
-dnl Check what compiler thread flag may be used, if any, from the given list.
-dnl The flag list is separated by white space.
-dnl Usage: ACE_SEARCH_THREAD_FLAGS(THREAD-FLAG-LIST,
-dnl                                [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-AC_DEFUN(ACE_SEARCH_THREAD_FLAGS, dnl
-[
- ACE_CACHE_CHECK(for compiler thread flag,
-   ace_cv_thread_flag_search,
-   [
-    ace_save_CXXFLAGS="$CXXFLAGS"
-    ace_save_CFLAGS="$CFLAGS"
-
-    for i in $1; do
-      CXXFLAGS="$CXXFLAGS -$i"
-      CFLAGS="$CFLAGS -$i"
-
-      ACE_CHECK_THREAD_FLAGS(
-        [
-         ace_cv_thread_flag_search="-$i"
-
-         dnl A usable flag was found so break out of the loop.
-         break;
-        ],
-        [
-         ace_cv_thread_flag_search=no
-        ])
-
-      dnl Reset the flags for the next flag check.
-      CXXFLAGS="$ace_save_CXXFLAGS"
-      CFLAGS="$ace_save_CFLAGS"
-    done
-
-    dnl Reset the flags to a consistent state.
-    dnl This prevents duplicate flags from being added to
-    dnl the C/CXXFLAGS variable.
-    CXXFLAGS="$ace_save_CXXFLAGS"
-    CFLAGS="$ace_save_CFLAGS"
-   ],
-   [
-    dnl Add the found/cached thread flag to the C/CXXFLAGS variables
-    CXXFLAGS="$CXXFLAGS $ace_cv_thread_flag_search"
-    CFLAGS="$CFLAGS $ace_cv_thread_flag_search"
-
-    $2
-   ],
-   [
-    $3
-   ])
-])
-
-dnl -------------------------------------------------------------------------
-dnl       $Id$
-dnl 
-dnl       features.m4
-dnl
-dnl       ACE M4 include file which contains ACE specific M4 macros
-dnl       that determine availablility of certain OS features for ACE.
-dnl 
-dnl -------------------------------------------------------------------------
-
-dnl  Copyright (C) 1998, 1999  Ossama Othman
-dnl
-dnl  All Rights Reserved
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the current ACE distribution terms.
-dnl 
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-dnl Asynchronous IO check
-dnl Use this macro to determine if asynchronous IO is working on a
-dnl given platform.
-dnl Usage: ACE_CHECK_ASYNCH_IO
-AC_DEFUN(ACE_CHECK_ASYNCH_IO, dnl
-[
- AC_REQUIRE([AC_PROG_CXX])
- AC_REQUIRE([AC_PROG_CXXCPP])
- AC_REQUIRE([AC_LANG_CPLUSPLUS])
-
- dnl In case a library with the asynchronous libraries is found but
- dnl the asynchronous IO support is not functional then save a copy
- dnl of the list of libraries before the asynch IO function library
- dnl is added to the list so that we can revert the list to its
- dnl pre-asynch-IO check state.
- ace_save_LIBS="$LIBS"
-
- dnl Asynchronous IO library check
- dnl Some platforms, such as Solaris puts aio_read in -lposix4, for example.
- dnl In some cases, the thread library must be linked to in addition to the
- dnl real-time support library.  As such, make sure these checks are done
- dnl after the thread library checks.
- ACE_SEARCH_LIBS(aio_read, aio posix4 rt, dnl
-    ace_has_aio_funcs=yes, ace_has_aio_funcs=no)
-
-if test "$ace_has_aio_funcs" = yes; then
-  ACE_CACHE_CHECK(for working asynchronous IO,
-    ace_cv_feature_aio_calls,
-    [
-     AC_TRY_RUN(
-       [
-#ifndef ACE_LACKS_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#include <signal.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
-#include <iostream.h>
-
-#include <aio.h>
-
-class Test_Aio
-{
-public:
-  Test_Aio (void);
-  // Default constructor.
-
-  int init (void);
-  // Initting the output file and the buffer.
-
-  int do_aio (void);
-  // Doing the testing stuff.
-
-  ~Test_Aio (void);
-  // Destructor.
-private:
-  int out_fd_;
-  // Output file descriptor.
-
-  struct aiocb *aiocb_write_;
-  // For writing to the file.
-
-  struct aiocb *aiocb_read_;
-  // Reading stuff from the file.
-
-  char *buffer_write_;
-  // The buffer to be written to the out_fd.
-
-  char *buffer_read_;
-  // The buffer to be read back from the file.
-};
-
-Test_Aio::Test_Aio (void)
-  : aiocb_write_ (new struct aiocb),
-    aiocb_read_ (new struct aiocb),
-    buffer_write_ (0),
-    buffer_read_ (0)
-{
-}
-
-Test_Aio::~Test_Aio (void)
-{
-  delete aiocb_write_;
-  delete aiocb_read_;
-  delete buffer_write_;
-  delete buffer_read_;
-}
-
-// Init the output file and init the buffer.
-int
-Test_Aio::init (void)
-{
-  // Open the output file.
-  this->out_fd_ = open ("test_aio.log", O_RDWR | O_CREAT | O_TRUNC, 0666);
-  if (this->out_fd_ == 0)
-    {
-      //cout << "Error : Opening file" << endl;
-      return -1;
-    }
-
-  // Init the buffers.
-  this->buffer_write_ = strdup ("Welcome to the world of AIO... AIO Rules !!!");
-  // cout << "The buffer : " << this->buffer_write_ << endl;
-  this->buffer_read_ = new char [strlen (this->buffer_write_)];
-
-  return 0;
-}
-
-// Set the necessary things for the AIO stuff.
-// Write the buffer asynchly.hmm Disable signals.
-// Go on aio_suspend. Wait for completion.
-// Print out the result.
-int
-Test_Aio::do_aio (void)
-{
-  // = Write to the file.
-
-  // Setup AIOCB.
-  this->aiocb_write_->aio_fildes = this->out_fd_;
-  this->aiocb_write_->aio_offset = 0;
-  this->aiocb_write_->aio_buf = this->buffer_write_;
-  this->aiocb_write_->aio_nbytes = strlen (this->buffer_write_);
-  this->aiocb_write_->aio_reqprio = 0;
-  this->aiocb_write_->aio_sigevent.sigev_notify = SIGEV_NONE;
-  //this->this->aiocb_.aio_sigevent.sigev_signo = SIGRTMAX;
-  this->aiocb_write_->aio_sigevent.sigev_value.sival_ptr =
-    (void *) this->aiocb_write_;
-
-  // Fire off the aio write.
-  if (aio_write (this->aiocb_write_) != 0)
-    {
-      perror ("aio_write");
-      return -1;
-    }
-
-  // = Read from that file.
-
-  // Setup AIOCB.
-  this->aiocb_read_->aio_fildes = this->out_fd_;
-  this->aiocb_read_->aio_offset = 0;
-  this->aiocb_read_->aio_buf = this->buffer_read_;
-  this->aiocb_read_->aio_nbytes = strlen (this->buffer_write_);
-  this->aiocb_read_->aio_reqprio = 0;
-  this->aiocb_read_->aio_sigevent.sigev_notify = SIGEV_NONE;
-  //this->this->aiocb_.aio_sigevent.sigev_signo = SIGRTMAX;
-  this->aiocb_read_->aio_sigevent.sigev_value.sival_ptr =
-    (void *) this->aiocb_read_;
-
-  // Fire off the aio write. If it doesnt get queued, carry on to get
-  // the completion for the first one.
-  if (aio_read (this->aiocb_read_) < 0)
-    perror ("aio_read");
-  
-  // Wait for the completion on aio_suspend.
-  struct aiocb *list_aiocb[2];
-  list_aiocb [0] = this->aiocb_write_;
-  list_aiocb [1] = this->aiocb_read_;
-
-  // Do suspend till all the aiocbs in the list are done.
-  int done = 0;
-  int return_val = 0;
-  while (!done)
-    {
-      return_val = aio_suspend (list_aiocb,
-                                2,
-                                0);
-      cerr << "Return value :" << return_val << endl;
-
-      // Analyze return and error values.
-      if (aio_error (list_aiocb [0]) != EINPROGRESS)
-        {
-          if (aio_return (list_aiocb [0]) == -1)
-            {
-              perror ("aio_return");
-              return -1;
-            }
-          else
-            {
-              // Successful. Store the pointer somewhere and make the
-              // entry NULL in the list.
-              this->aiocb_write_ = list_aiocb [0];
-              list_aiocb [0] = 0;
-            }
-        }
-      else
-        //cout << "AIO in progress" << endl;
-
-      if (aio_error (list_aiocb [1]) != EINPROGRESS)
-        {
-          if (aio_return (list_aiocb [1]) == -1)
-            {
-              perror ("aio_return");
-              return -1;
-            }
-          else
-            {
-              // Successful. Store the pointer somewhere and make the
-              // entry NULL in the list.
-              this->aiocb_read_ = list_aiocb [1];
-              list_aiocb [1] = 0;
-            }
-        }
-      else
-        //cout << "AIO in progress" << endl;
-
-      // Is it done?
-      if ((list_aiocb [0] == 0) && (list_aiocb [1] == 0))
-        done = 1;
-    }
-
-  //cout << "Both the AIO operations done." << endl;
-  //cout << "The buffer is :" << this->buffer_read_ << endl;
-  
-  return 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  Test_Aio test_aio;
-
-  if (test_aio.init () != 0)
-    {
-      //printf ("AIOCB test failed:\n"
-      //        "ACE_POSIX_AIOCB_PROACTOR may not work in this platform\n");
-      return -1;
-    }
-  
-  if (test_aio.do_aio () != 0)
-    {
-      //printf ("AIOCB test failed:\n"
-      //        "ACE_POSIX_AIOCB_PROACTOR may not work in this platform\n"); 
-      return -1;
-    }
-  //printf ("AIOCB test successful:\n"
-  //        "ACE_POSIX_AIOCB_PROACTOR should work in this platform\n");
-  return 0;
-}
-       ],
-       [
-        dnl Now try another test
-        AC_TRY_RUN(
-          [
-#ifndef ACE_LACKS_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#include <signal.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
-
-#include <limits.h>
-
-#include <aio.h>
-
-
-int file_handle = -1;
-char mb1 [BUFSIZ + 1];
-char mb2 [BUFSIZ + 1];
-aiocb aiocb1, aiocb2;
-sigset_t completion_signal;
-
-// Function prototypes.
-int setup_signal_delivery (void);
-int issue_aio_calls (void);
-int query_aio_completions (void);
-int test_aio_calls (void);
-int setup_signal_handler (void);
-int setup_signal_handler (int signal_number);
-
-int 
-setup_signal_delivery (void)
-{
-  // Make the sigset_t consisting of the completion signal.
-  if (sigemptyset (&completion_signal) == -1)
-    {
-      perror ("Error:Couldnt init the RT completion signal set\n");
-      return -1;
-    }
-  
-  if (sigaddset (&completion_signal, SIGRTMIN) == -1)
-    {
-      perror ("Error:Couldnt init the RT completion signal set\n");
-      return -1;
-    }
-  
-  // Mask them.
-  if (pthread_sigmask (SIG_BLOCK, &completion_signal, 0) == -1)
-    {
-      perror ("Error:Couldnt maks the RT completion signals\n");
-      return -1;
-    }
-  
-  return setup_signal_handler (SIGRTMIN);
-}
-
-int
-issue_aio_calls (void)
-{
-  // Setup AIOCB.
-  aiocb1.aio_fildes = file_handle;
-  aiocb1.aio_offset = 0;
-  aiocb1.aio_buf = mb1;
-  aiocb1.aio_nbytes = BUFSIZ;
-  aiocb1.aio_reqprio = 0;
-  aiocb1.aio_sigevent.sigev_notify = SIGEV_SIGNAL;
-  aiocb1.aio_sigevent.sigev_signo = SIGRTMIN;
-  aiocb1.aio_sigevent.sigev_value.sival_ptr = (void *) &aiocb1; 
-  
-  // Fire off the aio write.
-  if (aio_read (&aiocb1) == -1)
-    {
-      // Queueing failed.
-      perror ("Error:Asynch_Read_Stream: aio_read queueing failed\n");
-      return -1;
-    }
-  
-  // Setup AIOCB.
-  aiocb2.aio_fildes = file_handle;
-  aiocb2.aio_offset = BUFSIZ + 1;
-  aiocb2.aio_buf = mb2;
-  aiocb2.aio_nbytes = BUFSIZ;
-  aiocb2.aio_reqprio = 0;
-  aiocb2.aio_sigevent.sigev_notify = SIGEV_SIGNAL;
-  aiocb2.aio_sigevent.sigev_signo = SIGRTMIN;
-  aiocb2.aio_sigevent.sigev_value.sival_ptr = (void *) &aiocb2; 
-  
-  // Fire off the aio write.
-  if (aio_read (&aiocb2) == -1)
-    {
-      // Queueing failed.
-      perror ("Error:Asynch_Read_Stream: aio_read queueing failed\n");
-      return -1;
-    }
-  return 0;
-}
-
-int
-query_aio_completions (void)
-{
-  int result = 0;
-  size_t number_of_compleions = 0;
-  for (number_of_compleions = 0;
-       number_of_compleions < 2;
-       number_of_compleions ++)
-    {
-      // Wait for <milli_seconds> amount of time.
-      // @@ Assigning <milli_seconds> to tv_sec.
-      timespec timeout;
-      timeout.tv_sec = INT_MAX;
-      timeout.tv_nsec = 0;
-  
-      // To get back the signal info.
-      siginfo_t sig_info;
-      
-      // Await the RT completion signal.
-      int sig_return = sigtimedwait (&completion_signal,
-                                     &sig_info,
-                                     &timeout);
-      
-      // Error case.
-      // If failure is coz of timeout, then return *0* but set
-      // errno appropriately. This is what the WinNT proactor
-      // does.
-      if (sig_return == -1)
-        {
-          perror ("Error:Error waiting for RT completion signals\n");
-          return -1;
-        }
-      
-      // RT completion signals returned.
-      if (sig_return != SIGRTMIN)
-        {
-          //printf ("Unexpected signal (%d) has been received while waiting for RT Completion Signals\n",
-          //        sig_return);
-          return -1;
-        }
-      
-      // @@ Debugging.
-      //printf ("Sig number found in the sig_info block : %d\n",
-      //        sig_info.si_signo);
-  
-      // Is the signo returned consistent?
-      if (sig_info.si_signo != sig_return)
-        {
-          //printf ("Inconsistent signal number (%d) in the signal info block\n",
-          //        sig_info.si_signo);
-          return -1;
-        }
-  
-      // @@ Debugging.
-      //printf ("Signal code for this signal delivery : %d\n",
-      //        sig_info.si_code);
-  
-      // Is the signal code an aio completion one?
-      if ((sig_info.si_code != SI_ASYNCIO) &&
-          (sig_info.si_code != SI_QUEUE))
-        {
-          //printf ("Unexpected signal code (%d) returned on completion querying\n",
-          //        sig_info.si_code);
-          return -1;
-        }
-  
-      // Retrive the aiocb.
-      aiocb* aiocb_ptr = (aiocb *) sig_info.si_value.sival_ptr;
-      
-      // Analyze error and return values. Return values are
-      // actually <errno>'s associated with the <aio_> call
-      // corresponding to aiocb_ptr.
-      int error_code = aio_error (aiocb_ptr);
-      if (error_code == -1)
-        {
-          perror ("Error:Invalid control block was sent to <aio_error> for compleion querying\n");
-          return -1;
-        }
-  
-      if (error_code != 0)
-        {
-          // Error occurred in the <aio_>call. Return the errno
-          // corresponding to that <aio_> call.
-          //printf ("Error:An AIO call has failed:Error code = %d\n",
-          //        error_code);
-          return -1;
-        }
-
-      // No error occured in the AIO operation.
-      int nbytes = aio_return (aiocb_ptr);
-      if (nbytes == -1)
-        {
-          perror ("Error:Invalid control block was send to <aio_return>\n");
-          return -1;
-        }
-      
-      if (number_of_compleions == 0)
-        // Print the buffer.
-        //printf ("Number of bytes transferred : %d\n The buffer : %s \n",
-        //        nbytes,
-        //        mb1);
-      else
-        // Print the buffer.
-        //printf ("Number of bytes transferred : %d\n The buffer : %s \n",
-        //        nbytes,
-        //        mb2);
-    }
-  return 0;
-}
-
-int
-test_aio_calls (void) 
-{
-  // Set up the input file.
-  // Open file (in SEQUENTIAL_SCAN mode)
-  file_handle = open ("test_aiosig.cpp", O_RDONLY);
-  
-  if (file_handle == -1)
-    {
-      perror ("Error:Opening the inputfile");
-      return -1;
-    }
-  
-  if (setup_signal_delivery () < 0)
-    return -1;
-  
-  if (issue_aio_calls () < 0)
-    return -1;
-  
-  if (query_aio_completions () < 0)
-    return -1;
-  
-  return 0;
-}
-
-int
-setup_signal_handler (int signal_number)
-{
-   // Setting up the handler(!) for these signals.
-  struct sigaction reaction;
-  sigemptyset (&reaction.sa_mask);   // Nothing else to mask.
-  reaction.sa_flags = SA_SIGINFO;    // Realtime flag.
-#if defined (SA_SIGACTION)
-  // Lynx says, it is better to set this bit to be portable.
-  reaction.sa_flags &= SA_SIGACTION;
-#endif /* SA_SIGACTION */      
-  reaction.sa_sigaction = null_handler;     // Null handler.
-  int sigaction_return = sigaction (SIGRTMIN,
-                                    &reaction,
-                                    0);
-  if (sigaction_return == -1)
-    {
-      perror ("Error:Proactor couldnt do sigaction for the RT SIGNAL");
-      return -1;
-    }
-  
-  return 0;
-}
-
-void
-null_handler (int         /* signal_number */,
-              siginfo_t * /* info */,
-              void *      /* context */)
-{
-}
-
-int
-main (int, char *[])
-{
-  if (test_aio_calls () == 0)
-    //printf ("RT SIG test successful:\n"
-    //        "ACE_POSIX_SIG_PROACTOR should work in this platform\n");
-  else
-    //printf ("RT SIG test failed:\n"
-    //        "ACE_POSIX_SIG_PROACTOR may not work in this platform\n");
-  return 0;
-}
-         ],
-         [
-          ace_cv_feature_aio_calls=yes
-         ],
-         [
-          ace_cv_feature_aio_calls=no
-         ],
-         [
-          dnl Don't bother doing anything for cross-compiling here
-          dnl since the outer run-time test will prevent this
-          dnl inner run-time test from ever running when cross-compiling.
-          dnl We just put something in here to prevent autoconf
-          dnl from complaining.
-          ace_just_a_place_holder=ignoreme
-         ])
-       ],
-       [
-        ace_cv_feature_aio_calls=no
-       ],
-       [
-        dnl Asynchronous IO test for cross-compiled platforms
-        dnl This test is weaker than the above run-time tests but it will
-        dnl have to do.
-        AC_TRY_COMPILE(
-          [
-#include <aio.h>
-          ],
-          [
-           aiocb* aiocb_ptr (void);
-          ],
-          [
-           ace_cv_feature_aio_calls=yes
-          ],
-          [
-           ace_cv_feature_aio_calls=no
-          ])
-       ])
-    ], AC_DEFINE(ACE_HAS_AIO_CALLS), LIBS="$ace_save_LIBS")
-fi dnl test "$ace_has_aio_funcs" = yes
-])
-
-dnl -------------------------------------------------------------------------
-dnl       $Id$
-dnl 
-dnl       platform.m4
-dnl
-dnl       ACE M4 include file which contains ACE specific M4 macros
-dnl       that set/determine which known platform specific C++ macros
-dnl       to define.
-dnl 
-dnl -------------------------------------------------------------------------
-
-dnl  Copyright (C) 1998, 1999  Ossama Othman
-dnl
-dnl  All Rights Reserved
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the current ACE distribution terms.
-dnl 
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-dnl Check for thread related libraries and compiler flags
-dnl Usage: ACE_SET_PLATFORM_MACROS
-AC_DEFUN(ACE_SET_PLATFORM_MACROS, dnl
-[
-dnl Begin ACE_SET_PLATFORM_MACROS
-
-dnl At some point the below platform specific settings should be automated
-dnl as much as possible!  We set things manually just to get things going
-dnl with the auto{conf,make}/libtool integration into the ACE source tree.
-
-dnl These settings need to be done _after_ the header, function and library
-dnl checks!
-
-dnl Platform specific flags
-case "$target" in
-  *aix3*)
-    AC_DEFINE(ACE_DEFAULT_BASE_ADDR, ((char *) 0x80000000))
-    ;;
-  *aix4.1*)
-    AC_DEFINE(AIX)
-    AC_DEFINE(ACE_DEFAULT_BASE_ADDR, ((char *) 0x80000000))
-    AC_DEFINE(ACE_HAS_AIX_BROKEN_SOCKET_HEADER)
-    ;;
-  *aix4.2*)
-    AC_DEFINE(AIX)
-    AC_DEFINE(ACE_DEFAULT_BASE_ADDR, ((char *) 0x80000000))
-dnl    AC_DEFINE(ACE_HAS_AIX_BROKEN_SOCKET_HEADER)
-    AC_DEFINE(ACE_TLI_TCP_DEVICE, "/dev/xti/tcp")
-    ;;
-  *cray*)
-    ;;
-  *dgux4.11*)
-    AC_DEFINE(ACE_DGUX)
-    AC_DEFINE(IP_ADD_MEMBERSHIP, 0x13)
-    AC_DEFINE(IP_DROP_MEMBERSHIP, 0x14)
-    ;;
-  *dgux4*)
-    AC_DEFINE(ACE_DGUX)
-    AC_DEFINE(IP_ADD_MEMBERSHIP, 0x13)
-    AC_DEFINE(IP_DROP_MEMBERSHIP, 0x14)
-    ;;
-  *freebsd*)
-    ;;
-  *fsu*)
-dnl FIXME: "FSU" isn't a platform!  We need to move this somewhere.
-    AC_DEFINE(PTHREAD_STACK_MIN, (1024*10))
-    ;;
-  *hpux9*)
-    AC_DEFINE(HPUX)
-    ;;
-  *hpux10*)
-    AC_DEFINE(HPUX)
-    AC_DEFINE(HPUX_10)
-    AC_DEFINE(ACE_DEFAULT_BASE_ADDR, ((char *) 0x80000000))
-    AC_DEFINE(ACE_TLI_TCP_DEVICE, "/dev/inet_cots")
-    ;;
-  *hpux11*)
-    AC_DEFINE(HPUX)
-    AC_DEFINE(HPUX_11)
-    AC_EGREP_CPP(ACE_ON_64BIT_HP,
-      [
-#ifdef __LP64__
-          ACE_ON_64BIT_HP
-#endif
-      ],
-      [
-       AC_DEFINE(ACE_DEFAULT_BASE_ADDR, ((char *) 0x0000001100000000))
-       AC_DEFINE(ACE_DEFAULT_BASE_ADDRL, ((char *) 0x0000001100000000))
-      ],
-      [
-       AC_DEFINE(ACE_DEFAULT_BASE_ADDR, ((char *) 0x80000000))
-      ])
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    ;;
-  *irix5.2*)
-    AC_DEFINE(IRIX5)
-    ;;
-  *irix5.3*)
-    AC_DEFINE(IRIX5)
-    ;;
-  *irix6*)
-    AC_DEFINE(IRIX6)
-    AC_DEFINE(ACE_HAS_IRIX62_THREADS)
-    AC_DEFINE(ACE_DEFAULT_BASE_ADDR, ((char *) (1024U * 1024 * 1024)))
-    if test "$ace_user_enable_threads" = yes; then
-      AC_DEFINE(ACE_HAS_IRIX62_THREADS)
-    fi
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    ;;
-  *linux*)
-    AC_DEFINE(ACE_DEFAULT_MAX_SOCKET_BUFSIZ, 65535)
-    AC_DEFINE(ACE_DEFAULT_SELECT_REACTOR_SIZE, 256)
-    AC_DEFINE(ACE_DEFAULT_BASE_ADDR, ((char *) 0x80000000))
-    AC_DEFINE(ACE_HAS_BIG_FD_SET) dnl FIXME: We need a test for this!
-    AC_DEFINE(ACE_UINT64_FORMAT_SPECIFIER, "%Lu")
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    ;;
-  *lynxos*)
-    AC_DEFINE(ACE_MALLOC_ALIGN, 8)
-    AC_DEFINE(ACE_MAP_PRIVATE, ACE_MAP_SHARED)
-    AC_DEFINE(ACE_USE_RCSID, 0)
-    AC_DEFINE(ACE_HAS_LYNXOS_SIGNALS)
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    ;;
-  *m88k*)
-    AC_DEFINE(m88k)
-    AC_DEFINE(__m88k__)
-    AC_DEFINE(IP_ADD_MEMBERSHIP, 0x13)
-    AC_DEFINE(IP_DROP_MEMBERSHIP, 0x14)
-    ;;
-  *mvs*)
-    ;;
-  *netbsd*)
-    AC_DEFINE(ACE_NETBSD)
-    ;;
-  *osf3.2*)
-    AC_EGREP_CPP(ACE_DEC_CXX,
-      [
-#if defined(__DECCXX)
-          ACE_DEC_CXX
-#endif
-      ],
-      [
-       AC_DEFINE(DEC_CXX)
-      ],)
-    ;;
-  *osf4.0*)
-dnl We need to add checks for g++, DEC C++ and Rational C++
-    AC_EGREP_CPP(ACE_DEC_CXX,
-      [
-#if defined(__DECCXX)
-          ACE_DEC_CXX
-#endif
-      ],
-      [
-       AC_DEFINE(DEC_CXX)
-      ],)
-dnl Check for _POSIX_C_SOURCE macro
-    AC_EGREP_CPP(ACE_ON_DEC_WITH_POS_SRC,
-      [
-       /* Include unistd.h to define _POSIX_C_SOURCE. */
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-
-#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 199506L)
-          ACE_ON_DEC_WITH_POS_SRC
-#endif
-      ],
-      [
-       AC_DEFINE(DIGITAL_UNIX)
-      ],)
-    AC_DEFINE(ACE_DEFAULT_BASE_ADDR, ((char *) 0x80000000))
-    AC_DEFINE(ACE_NEEDS_HUGE_THREAD_STACKSIZE, (1024 * 1024))
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    ;;
-  *psos*)
-    AC_DEFINE(ACE_PSOS)
-    AC_DEFINE(ACE_PSOSIM)
-    AC_DEFINE(ACE_PSOSTBD)
-    dnl need ACE_HAS_TSS_EMULATION for ACE_DEFAULT_THREAD_KEYS!
-    AC_EGREP_CPP(ACE_TSS_EMULATION,
-      [
-#if defined (ACE_HAS_TSS_EMULATION)
-         ACE_TSS_EMULATION
-#endif
-      ], AC_DEFINE(ACE_DEFAULT_THREAD_KEYS, 256),)
-    AC_DEFINE(ACE_MAIN, extern "C" void root)
-    AC_DEFINE(ACE_MALLOC_ALIGN, 8)
-    AC_DEFINE(ACE_USE_RCSID, 0)
-    ;;
-  *sco4.2*)
-    AC_DEFINE(SCO)
-    AC_DEFINE(ACE_DEFAULT_CLOSE_ALL_HANDLES, 0)
-    ;;
-  *sco5*)
-    AC_DEFINE(SCO)
-    AC_DEFINE(ACE_DEFAULT_CLOSE_ALL_HANDLES, 0)
-    AC_DEFINE(ACE_HAS_BIG_FD_SET) dnl FIXME: We need a test for this!
-    ;;
-  *sunos4*)
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    ;;
-  *solaris2.4*)
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    AC_DEFINE(ACE_NEEDS_LWP_PRIO_SET)
-    ;;
-  *solaris2.5*)
-    AC_DEFINE(ACE_MALLOC_ALIGN, 8)
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    AC_DEFINE(ACE_NEEDS_LWP_PRIO_SET)
-    ;;
-  *solaris2.6*)
-    AC_DEFINE(ACE_MALLOC_ALIGN, 8)
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    AC_DEFINE(ACE_NEEDS_LWP_PRIO_SET)
-    ;;
-  *solaris2.7*)
-    AC_DEFINE(ACE_MALLOC_ALIGN, 8)
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    AC_DEFINE(ACE_NEEDS_LWP_PRIO_SET)
-    ;;
-  *86*solaris*)
-    AC_DEFINE(ACE_HAS_X86_STAT_MACROS)
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    AC_DEFINE(ACE_NEEDS_LWP_PRIO_SET)
-    ;;
-  *tandem*)
-    AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
-    ;;
-  *unixware2.0*)
-    AC_DEFINE(UNIXWARE)
-    AC_DEFINE(UNIXWARE_2_0)
-    ;;
-  *unixware2.1*)
-    AC_DEFINE(UNIXWARE)
-    AC_DEFINE(UNIXWARE_2_1)
-    ;;
-  *vxworks*)
-    AC_DEFINE(VXWORKS)
-    AC_DEFINE(ACE_MAIN, ace_main)
-    AC_DEFINE(ACE_DEFAULT_MAX_SOCKET_BUFSIZ, 32768)
-    dnl need ACE_HAS_TSS_EMULATION for ACE_DEFAULT_THREAD_KEYS!
-    AC_EGREP_CPP(ACE_TSS_EMULATION,
-      [
-#if defined (ACE_HAS_TSS_EMULATION)
-         ACE_TSS_EMULATION
-#endif
-      ], AC_DEFINE(ACE_DEFAULT_THREAD_KEYS, 16),)
-    AC_DEFINE(ACE_THR_PRI_FIFO_DEF, 101)
-    AC_DEFINE(ACE_USE_RCSID, 0)
-    ;;
-  *cygwin32*)
-    ;;
-  *win32*)
-    AC_DEFINE(ACE_WIN32)
-    AC_DEFINE(ACE_UINT64_FORMAT_SPECIFIER, "%I64u")
-dnl    AC_DEFINE(ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL)
-    if test "$ace_u_long_long_typedef_set" != yes; then
-      ACE_UINT64="unsigned __int64"
-      ace_u_long_long_typedef_set=yes
-    fi  dnl "$ace_u_long_long_typedef_set" != yes
-    ;;
-  *)
-    ;;
-esac
-
-dnl End ACE_SET_PLATFORM_MACROS
-])
-
diff --git a/apps/Gateway/Gateway/Channel.cpp b/apps/Gateway/Gateway/Channel.cpp
deleted file mode 100644
index 99699a6ee87..00000000000
--- a/apps/Gateway/Gateway/Channel.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-// $Id$
-
-#include "Routing_Entry.h"
-#include "Channel_Connector.h"
-
-// Convenient short-hands.
-#define CO CONDITION
-#define MU MUTEX
-
-// = The total number of bytes sent/received on this channel.
-size_t 
-Channel::total_bytes (void)
-{
-  return this->total_bytes_;
-}
-
-void 
-Channel::total_bytes (size_t bytes)
-{
-  this->total_bytes_ += bytes;
-}
-
-Channel::Channel (ROUTING_TABLE *rt,
-                  Channel_Connector *cc,
-		  ACE_Thread_Manager *thr_mgr,
-		  int socket_queue_size)
-  : ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH> (thr_mgr),
-    routing_table_ (rt),
-    id_ (-1),
-    total_bytes_ (0),
-    state_ (Channel::IDLE),
-    connector_ (cc),
-    timeout_ (1),
-    max_timeout_ (Channel::MAX_RETRY_TIMEOUT), 
-    socket_queue_size_ (socket_queue_size)
-{
-}
-
-// Set the associated channel.
-
-void
-Channel::active (int a)
-{
-  this->state (a == 0 ? Channel::IDLE : Channel::ESTABLISHED);
-}
-
-// Get the associated channel.
-
-int
-Channel::active (void)
-{
-  return this->state () == Channel::ESTABLISHED;
-}
-
-// Set the direction.
-
-void
-Channel::direction (char d)
-{
-  this->direction_ = d;
-}
-
-// Get the direction.
-
-char
-Channel::direction (void)
-{
-  return this->direction_;
-}
-
-// Sets the timeout delay.
-
-void
-Channel::timeout (int to)
-{
-  if (to > this->max_timeout_)
-    to = this->max_timeout_;
-
-  this->timeout_ = to;
-}
-
-// Recalculate the current retry timeout delay using exponential
-// backoff.  Returns the original timeout (i.e., before the
-// recalculation).
-
-int
-Channel::timeout (void)
-{
-  int old_timeout = this->timeout_;
-  this->timeout_ *= 2;
-  
-  if (this->timeout_ > this->max_timeout_)
-    this->timeout_ = this->max_timeout_;
-
-  return old_timeout;
-}
-
-// Sets the max timeout delay.
-
-void
-Channel::max_timeout (int mto)
-{
-  this->max_timeout_ = mto;
-}
-
-// Gets the max timeout delay.
-
-int
-Channel::max_timeout (void)
-{
-  return this->max_timeout_;
-}
-
-// Restart connection asynchronously when timeout occurs.
-
-int
-Channel::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	     "(%t) attempting to reconnect Channel %d with timeout = %d\n", 
-             this->id (), this->timeout_));
-  return this->connector_->initiate_connection (this, ACE_Synch_Options::asynch);
-}
-
-// Restart connection (blocking_semantics dicates whether we
-// restart synchronously or asynchronously).
-
-int
-Channel::reinitiate_connection (void)
-{
-  // Skip over deactivated descriptors.
-  if (this->get_handle () != -1)
-    {
-      // Make sure to close down peer to reclaim descriptor.
-      this->peer ().close ();
-
-#if 0
-//      if (this->state () == FAILED)
-//        {
-      // Reinitiate timeout to improve reconnection time.
-//          this->timeout (1);
-#endif
-      
-      ACE_DEBUG ((LM_DEBUG, 
-		 "(%t) scheduling reinitiation of Channel %d\n",
-		 this->id ()));
-
-      // Reschedule ourselves to try and connect again.
-      if (ACE_Service_Config::reactor ()->schedule_timer (this, 0, 
-						   this->timeout ()) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-			  "schedule_timer"), -1);
-    }
-  return 0;
-}
-
-// Handle shutdown of the Channel object.
-
-int
-Channel::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) shutting down Channel %d on handle %d\n", 
-	     this->id (), this->get_handle ()));
-  
-  return this->reinitiate_connection ();
-}
-
-// Set the state of the channel.
-
-void
-Channel::state (Channel::State s)
-{
-  this->state_ = s;
-}
-
-// Perform the first-time initiation of a connection to the peer.
-
-int
-Channel::initialize_connection (void)
-{
-  this->state_ = Channel::ESTABLISHED;
-
-  // Restart the timeout to 1.
-  this->timeout (1);
-
-#if defined (ASSIGN_ROUTING_ID)
-  // Action that sends the route id to the peerd.
-
-  CONN_ID id = htons (this->id ());
-
-  ssize_t n = this->peer ().send ((const void *) &id, sizeof id);
-
-  if (n != sizeof id)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      n == 0 ? "gatewayd has closed down unexpectedly" : "send"), -1);
-#endif /* ASSIGN_ROUTING_ID */
-  return 0;
-}
-
-// Set the size of the socket queue.
-
-void
-Channel::socket_queue_size (void)
-{
-  if (this->socket_queue_size_ > 0)
-    {
-      int option = this->direction_ == 'I' ? SO_RCVBUF : SO_SNDBUF;
-
-      if (this->peer ().set_option (SOL_SOCKET, option,
-				  &this->socket_queue_size_, sizeof (int)) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "set_option"));
-    }
-}
-
-// Upcall from the ACE_Acceptor::handle_input() that
-// delegates control to our application-specific Channel.
-
-int
-Channel::open (void *a)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Channel's fd = %d\n", this->peer ().get_handle ()));
-
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn on non-blocking I/O.
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call down to the base class to activate and register this handler.
-  if (this->ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH>::open (a) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "activate"), -1);
-
-  return this->initialize_connection ();
-}
-
-// Return the current state of the channel.
-
-Channel::State
-Channel::state (void)
-{
-  return this->state_;
-}
-
-void
-Channel::id (CONN_ID id)
-{
-  this->id_ = id;
-}
-
-CONN_ID
-Channel::id (void)
-{
-  return this->id_;
-}
-
-// Set the peer's address information.
-int 
-Channel::bind (const ACE_INET_Addr &remote_addr, 
-	       const ACE_INET_Addr &local_addr,
-	       CONN_ID id)
-{
-  this->remote_addr_ = remote_addr;
-  this->local_addr_ = local_addr;
-  this->id_ = id;
-  return 0;
-}
-
-ACE_INET_Addr &
-Channel::remote_addr (void)
-{
-  return this->remote_addr_;
-}
-
-ACE_INET_Addr &
-Channel::local_addr (void)
-{
-  return this->local_addr_;
-}
-
-// Constructor sets the routing table pointer.
-
-Output_Channel::Output_Channel (ROUTING_TABLE *rt,
-                                Channel_Connector *cc,
-				ACE_Thread_Manager *thr_mgr,
-				int socket_queue_size)
-  : Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'O';
-  this->msg_queue ()->high_water_mark (Output_Channel::QUEUE_SIZE);
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method simply marks the Channel as 
-// having failed so that handle_close () can reconnect.
-
-int 
-Output_Channel::handle_input (ACE_HANDLE)
-{
-  char buf[1];
-
-  this->state (Channel::FAILED);
-
-  switch (this->peer ().recv (buf, sizeof buf))
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has failed unexpectedly for Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    case 0:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has shutdown unexpectedly for Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer is sending input on Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    }
-}
-
-int 
-Output_Channel::svc (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) svc should not be called on Output_Channel!\n"), -1);
-}
-
-// Perform a non-blocking put() of message MB.  If we are unable to
-// send the entire message  the remainder is re-queued at the *front* of
-// the Message_List.
-
-int
-Output_Channel::nonblk_put (ACE_Message_Block *mb)
-{
-  // Try to send the message.  If we don't send it all (e.g., due to
-  // flow control), then re-queue the remainder at the head of the
-  // Message_List and ask the ACE_Reactor to inform us (via
-  // handle_output()) when it is possible to try again. 
-
-  ssize_t n;
-
-  if ((n = this->send_peer (mb)) == -1)
-    {
-      // Things have gone wrong, let's try to close down and set up a new reconnection.
-      this->state (Channel::FAILED);
-      this->handle_close ();
-      return -1;
-    }
-  else if (errno == EWOULDBLOCK) // Didn't manage to send everything.
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) queueing activated on handle %d to routing id %d\n",
-                 this->get_handle (), this->id ()));
-
-      // ACE_Queue in *front* of the list to preserve order.
-      if (this->msg_queue ()->enqueue_head (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enqueue_head"), -1);
-      
-      // Tell ACE_Reactor to call us back when we can send again.
-      else if (ACE_Service_Config::reactor ()->
-	       schedule_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_wakeup"), -1);
-      return 0;
-    }
-  else
-    return n;
-}
-
-int
-Output_Channel::send_peer (ACE_Message_Block *mb)
-{
-  ssize_t n;    
-  size_t len = mb->length ();
-
-  if ((n = this->peer ().send (mb->rd_ptr (), len)) <= 0)
-    return errno == EWOULDBLOCK ? 0 : n;
-  else if (n < len)
-    // Re-adjust pointer to skip over the part we did send.
-    mb->rd_ptr (n);
-  else /* if (n == length) */
-    {
-      // The whole message is sent, we can now safely deallocate the buffer.
-      // Note that this should decrement a reference count...
-      delete mb;
-      errno = 0;
-    }
-  this->total_bytes (n);
-  return n;
-}
-
-// Finish sending a message when flow control conditions abate.
-// This method is automatically called by the ACE_Reactor.
-
-int 
-Output_Channel::handle_output (ACE_HANDLE)
-{
-  ACE_Message_Block *mb = 0;
-  int           status = 0;
-  
-  ACE_DEBUG ((LM_DEBUG, "(%t) in handle_output on handle %d\n", this->get_handle ()));
-  // The list had better not be empty, otherwise there's a bug!
-
-  if (this->msg_queue ()->dequeue_head (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1)
-    {
-      switch (this->nonblk_put (mb))
-        {
-        case 0:           // Partial send.
-          ACE_ASSERT (errno == EWOULDBLOCK);
-          // Didn't write everything this time, come back later...
-          break;
-
-        case -1:
-          // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-          delete mb;
-          ACE_ERROR ((LM_ERROR, "(%t) %p\n", "transmission failure"));
-
-          /* FALLTHROUGH */
-        default: // Sent the whole thing.
-          
-          // If we succeed in writing the entire message (or we did not fail
-          // due to EWOULDBLOCK) then check if there are more messages on the Message_List.
-          // If there aren't, tell the ACE_Reactor not to notify us anymore (at least
-          // until there are new messages queued up).
-
-          if (this->msg_queue ()->is_empty ())
-            {
-              ACE_DEBUG ((LM_DEBUG, "(%t) queueing deactivated on handle %d to routing id %d\n",
-                         this->get_handle (), this->id ()));
-
-
-              if (ACE_Service_Config::reactor ()->
-		  cancel_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-                ACE_ERROR ((LM_ERROR, "(%t) %p\n", "cancel_wakeup"));
-            }
-        }
-    }
-  else 
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "dequeue_head"));
-  return 0;      
-}
-
-// Send a message to a peer (may queue if necessary).
-
-int 
-Output_Channel::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  if (this->msg_queue ()->is_empty ())
-    // Try to send the message *without* blocking!
-    return this->nonblk_put (mb); 
-  else
-    // If we have queued up messages due to flow control 
-    // then just enqueue and return.
-    return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Constructor sets the routing table pointer and the connector pointer.
-
-Input_Channel::Input_Channel (ROUTING_TABLE *rt,
-                              Channel_Connector *cc,
-			      ACE_Thread_Manager *thr_mgr,
-			      int socket_queue_size)
-  : msg_frag_ (0), 
-    Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'I';
-  this->msg_queue ()->high_water_mark (0);
-}
-
-int 
-Input_Channel::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) put should not be called on Input_Channel!\n"), -1);
-}
-
-int 
-Input_Channel::svc (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) svc should not be called on Input_Channel!\n"), -1);
-}
-
-// Receive a Peer message from peerd.  Handles fragmentation.
-//
-// The routing message returned from recv_peer consists of two parts:
-// 1. The Address part, contains the virtual routing id.
-// 2. The Data part, which contains the actual data to be routed.
-// 
-// The reason for having two parts is to shield the higher layers
-// of software from knowledge of the message structure.
-
-int
-Input_Channel::recv_peer (ACE_Message_Block *&route_addr)
-{ 
-  Peer_Message *peer_msg;
-  size_t len;
-  ssize_t n = 0;
-  ssize_t m = 0;
-  size_t offset = 0;
-
-  if (this->msg_frag_ == 0)
-    // No existing fragment...
-    ACE_NEW_RETURN (this->msg_frag_, 
-		    ACE_Message_Block (sizeof (Peer_Message)), 
-		    -1);
-
-  peer_msg = (Peer_Message *) this->msg_frag_->rd_ptr ();
-
-  const ssize_t HEADER_SIZE = sizeof (Peer_Header);
-  ssize_t header_bytes_left_to_read = HEADER_SIZE - this->msg_frag_->length ();
-
-  if (header_bytes_left_to_read > 0)
-    {
-      n = this->peer ().recv (this->msg_frag_->wr_ptr (), header_bytes_left_to_read);
-
-      if (n == -1 /* error */
-	  || n == 0  /* EOF */)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p\n", "Recv error during header read "));
-	  ACE_DEBUG ((LM_DEBUG, "attempted to read %d\n", header_bytes_left_to_read));
-	  delete this->msg_frag_;
-	  this->msg_frag_ = 0;
-	  return n;
-	}
-
-      // Bump the write pointer by the amount read.
-      this->msg_frag_->wr_ptr (n);
-
-      // At this point we may or may not have the ENTIRE header.
-      if (this->msg_frag_->length () < HEADER_SIZE)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "Partial header received: only %d bytes\n",
-		     this->msg_frag_->length ()));
-	  // Notify the caller that we didn't get an entire message.
-	  errno = EWOULDBLOCK;
-	  return -1;
-	}
-    }
-
-  // At this point there is a complete, valid header in msg_frag_
-  len = sizeof peer_msg->buf_ + HEADER_SIZE - this->msg_frag_->length ();
-
-  // Try to receive the remainder of the message
-
-  switch (m = this->peer ().recv (peer_msg->buf_ + offset, len))
-    {
-    case -1:
-      if (errno == EWOULDBLOCK) 
-        {
-          // This shouldn't happen since the ACE_Reactor
-          // just triggered us to handle pending I/O!
-          ACE_DEBUG ((LM_DEBUG, "(%t) unexpected recv failure\n"));
-          errno = EWOULDBLOCK;
-          return -1;
-        }
-      else
-        /* FALLTHROUGH */;
-
-    case 0: // Premature EOF.
-      delete this->msg_frag_;
-      this->msg_frag_ = 0;
-      return 0;
-
-    default:
-      if (m != len)
-        // Re-adjust pointer to skip over the part we've read.
-        {
-          this->msg_frag_->wr_ptr (m);
-          errno = EWOULDBLOCK;
-          return -1; // Inform caller that we didn't get the whole message.
-        }
-      else
-        {
-          // Set the write pointer at 1 past the end of the message.
-          this->msg_frag_->wr_ptr (m);
-
-          // Set the read pointer to the beginning of the message.
-          this->msg_frag_->rd_ptr (this->msg_frag_->base ());
-
-          // Allocate a routing message header and chain the data portion 
-          // onto its continuation field.
-          ACE_NEW_RETURN (route_addr,
-			  ACE_Message_Block (sizeof (Peer_Addr), 
-					     ACE_Message_Block::MB_PROTO, 
-					     this->msg_frag_),
-			  -1);
-
-          Peer_Addr peer_addr (this->id (), peer_msg->header_.routing_id_, 0);
-          // Copy the routing address from the Peer_Message into routing_addr.
-          route_addr->copy ((char *) &peer_addr, sizeof (Peer_Addr));
-
-          // Reset the pointer to indicate we've got an entire message.
-          this->msg_frag_ = 0; 
-        }
-      this->total_bytes (m + n);
-#if defined (VERBOSE)
-      ACE_DEBUG ((LM_DEBUG, "(%t) channel id = %d, route id = %d, len = %d, payload = %*s",
-		 peer_addr.conn_id_, peer_msg->header_.routing_id_, peer_msg->header_.len_,
-		 peer_msg->header_.len_, peer_msg->buf_));
-#else
-      ACE_DEBUG ((LM_DEBUG, "(%t) route id = %d, cur len = %d, total bytes read = %d\n",
-		 peer_msg->header_.routing_id_, peer_msg->header_.len_, this->total_bytes ()));
-#endif
-      return m + n;
-    }
-}
-
-// Receive various types of input (e.g., Peer message from the 
-// gatewayd, as well as stdio).
-
-int 
-Input_Channel::handle_input (ACE_HANDLE)
-{
-  ACE_Message_Block *route_addr = 0;
-
-  switch (this->recv_peer (route_addr))
-    {
-    case 0:
-      // Note that a peer should never initiate a shutdown.
-      this->state (Channel::FAILED);
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			"(%t) Peer has closed down unexpectedly for Input Channel %d\n", 
-                        this->id ()), -1);
-      /* NOTREACHED */
-    case -1:
-      if (errno == EWOULDBLOCK)
-        // A short-read, we'll come back and finish it up later on!
-        return 0;
-      else // A weird problem occurred, shut down and start again.
-        {
-          this->state (Channel::FAILED);
-          ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p for Input Channel %d\n", 
-			    "Peer has failed unexpectedly",
-                           this->id ()), -1);
-        }
-      /* NOTREACHED */
-    default:
-      return this->route_message (route_addr);
-    }
-}
-
-// Route a message to its appropriate destination.
-
-int
-Input_Channel::route_message (ACE_Message_Block *route_addr)
-{
-  // We got a valid message, so determine its virtual routing id,
-  // which is stored in the first of the two message blocks chained together.
-	
-  Peer_Addr *routing_key = (Peer_Addr *) route_addr->rd_ptr ();
-	
-  // Skip over the address portion.
-  const ACE_Message_Block *const data = route_addr->cont ();
-	
-  // RE points to the routing entry located for this routing id.
-  Routing_Entry *re = 0;
-	
-  if (this->routing_table_->find (*routing_key, re) != -1)
-    {
-      // Check to see if there are any destinations.
-      if (re->destinations ()->size () == 0)
-	ACE_DEBUG ((LM_WARNING, 
-		   "there are no active destinations for this message currently\n"));
-	    
-      else		// There are destinations, so forward the message.
-	{
-	  Routing_Entry::ENTRY_SET *esp = re->destinations ();
-	  Routing_Entry::ENTRY_ITERATOR si (*esp);
-		
-	  for (Channel **channel = 0; si.next (channel) != 0; si.advance ())
-	    {
-	      // Only process active channels.
-	      if ((*channel)->active ())
-		{
-		  // Clone the message portion (should be doing reference counting here...)
-		  ACE_Message_Block *newmsg = data->clone (); 
-		    
-		  ACE_DEBUG ((LM_DEBUG, "(%t) sending to peer %d\n", (*channel)->id ()));
-		    
-		  if ((*channel)->put (newmsg) == -1)
-		    {
-		      if (errno == EWOULDBLOCK) // The queue has filled up!
-			ACE_ERROR ((LM_ERROR, "(%t) %p\n", 
-				   "gateway is flow controlled, so we're dropping messages"));
-		      else
-			ACE_ERROR ((LM_ERROR, "(%t) %p transmission error to route %d\n",
-				   "put", (*channel)->id ()));
-			
-		      // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-		      delete newmsg;
-		    }
-		}
-	    }
-	  // Will become superfluous once we have reference counting...
-	  delete route_addr;
-	  return 0;
-	}
-    }
-  delete route_addr;
-  // Failure return.
-  ACE_ERROR ((LM_DEBUG, "(%t) find failed on conn id = %d, logical id = %d, payload = %d\n", 
-	     routing_key->conn_id_, routing_key->logical_id_, routing_key->payload_));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Map_Manager<Peer_Addr, Routing_Entry *, MUTEX>;
-template class ACE_Map_Iterator<Peer_Addr, Routing_Entry *, MUTEX>;
-template class ACE_Map_Entry<Peer_Addr, Routing_Entry *>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/apps/Gateway/Gateway/Channel.h b/apps/Gateway/Gateway/Channel.h
deleted file mode 100644
index 339716bc55a..00000000000
--- a/apps/Gateway/Gateway/Channel.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Channel.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CHANNEL)
-#define _CHANNEL
-
-#include "ace/Service_Config.h"
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Svc_Handler.h"
-#include "Routing_Table.h"
-#include "Routing_Entry.h"
-#include "Peer_Message.h"
-
-// The following typedefs are used in order to parameterize the
-// synchronization policies without changing the source code!
-
-// If we don't have threads then use the single-threaded synchronization.
-#if !defined (ACE_HAS_THREADS)
-#define SYNCH ACE_NULL_SYNCH
-typedef ACE_Null_Mutex MUTEX;
-#define CHANNEL_PEER_STREAM ACE_SOCK_STREAM 
-#define CHANNEL_PEER_CONNECTOR ACE_SOCK_CONNECTOR 
-#else /* ACE_HAS_THREADS */
-
-// Select communication mechanisms.
-#if 0 // defined (ACE_HAS_TLI)
-// Note that due to inconsistencies between the semantics of sockets
-// and TLI with respect to establishing non-blocking connections it's
-// not a good idea to use TLI...
-#include "ace/TLI_Connector.h"
-#define CHANNEL_PEER_STREAM ACE_TLI_STREAM
-#define CHANNEL_PEER_CONNECTOR ACE_TLI_CONNECTOR 
-#else
-#define CHANNEL_PEER_STREAM ACE_SOCK_STREAM 
-#define CHANNEL_PEER_CONNECTOR ACE_SOCK_CONNECTOR 
-#endif /* 0 */
-
-// Note that we only need to make the ACE_Task thread-safe if we
-// are using the multi-threaded Thr_Output_Channel...
-#if defined (USE_OUTPUT_MT) 
-#define SYNCH ACE_MT_SYNCH
-#else
-#define SYNCH ACE_NULL_SYNCH
-#endif /* USE_OUTPUT_MT || USE_INPUT_MT */
-
-// Note that we only need to make the ACE_Map_Manager thread-safe if
-// we are using the multi-threaded Thr_Input_Channel...
-#if defined (USE_INPUT_MT)
-typedef ACE_RW_Mutex MUTEX;
-#else
-typedef ACE_Null_Mutex MUTEX;
-#endif /* USE_INPUT_MT */
-#endif /* ACE_HAS_THREADS */
-
-// Typedef for the routing table.
-typedef Routing_Table<Peer_Addr, Routing_Entry, MUTEX>
-	ROUTING_TABLE;
-
-// Forward declaration.
-class Channel_Connector;
-
-class Channel : public ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH>
-  // = TITLE
-  //    Channel contains info about connection state and addressing.
-  //
-  // = DESCRIPTION
-  //     The Channel classes process messages sent from the peers to the
-  //     gateway.  These classes works as follows:
-  //   
-  // 1. Channel_Connector creates a number of connections with the set of 
-  //    peers specified in a configuration file.  
-  //
-  // 2. For each peer that connects successfully, Channel_Connector
-  //    creates an Channel object.  Each object assigns a unique routing
-  //    id to its associated peer.  The Channels are used by gatewayd
-  //    that to receive, route, and forward messages from source peer(s)
-  //    to destination peer(s).
-{
-public:
-  Channel (ROUTING_TABLE *, 
-	   Channel_Connector *, 
-	   ACE_Thread_Manager * = 0,
-	   int socket_queue_size = 0);
-
-  virtual int open (void * = 0);
-  // Initialize and activate a single-threaded Channel (called by
-  // ACE_Connector::handle_output()).
-
-  int bind (const ACE_INET_Addr &remote_addr, 
-	    const ACE_INET_Addr &local_addr, 
-	    CONN_ID);
-  // Set the peer's addressing and routing information.
-
-  ACE_INET_Addr &remote_addr (void);
-  // Returns the peer's routing address.
-
-  ACE_INET_Addr &local_addr (void);
-  // Returns our local address.
-
-  // = Set/get routing id.
-  CONN_ID id (void);
-  void id (CONN_ID);
-
-  // = Set/get the current state of the Channel.
-  enum State
-  {
-    IDLE = 1,      // Prior to initialization.
-    CONNECTING,    // During connection establishment.
-    ESTABLISHED,   // Channel is established and active.
-    DISCONNECTING, // Channel is in the process of connecting.
-    FAILED	   // Channel has failed.
-  };
-
-  // = Set/get the current state.
-  State state (void);
-  void state (State);
-
-  // = Set/get the current retry timeout delay.
-  int timeout (void);
-  void timeout (int);
-
-  // = Set/get the maximum retry timeout delay.
-  int max_timeout (void);
-  void max_timeout (int);
-
-  // = Set/get Channel activity status.
-  int active (void);
-  void active (int);
-
-  // = Set/get direction (necessary for error checking).
-  char direction (void);
-  void direction (char);
-
-  // = The total number of bytes sent/received on this channel.
-  size_t total_bytes (void);
-  void total_bytes (size_t bytes);
-  // Increment count by <bytes>.
-
-  virtual int handle_timeout (const ACE_Time_Value &, const void *arg);
-  // Perform timer-based Channel reconnection.
-
-protected:
-  enum
-  {
-    MAX_RETRY_TIMEOUT = 300 // 5 minutes is the maximum timeout.
-  };
-
-  int initialize_connection (void);
-  // Perform the first-time initiation of a connection to the peer.
-
-  int reinitiate_connection (void);
-  // Reinitiate a connection asynchronously when peers fail.
-
-  void socket_queue_size (void);
-  // Set the socket queue size.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::RWE_MASK);
-  // Perform Channel termination.
-
-  ROUTING_TABLE *routing_table_;
-  // Pointer to table that maps a Peer_Addr
-  // to a Set of Channel *'s for output.
-
-  ACE_INET_Addr remote_addr_;
-  // Address of peer.
-
-  ACE_INET_Addr local_addr_;
-  // Address of us.
-
-  CONN_ID id_;  
-  // The assigned routing ID of this entry.
-
-  size_t total_bytes_;
-  // The total number of bytes sent/received on this channel.
-
-  State state_;
-  // The current state of the channel.
-
-  Channel_Connector *connector_;
-  // Back pointer to Channel_Connector to reestablish broken
-  // connections.
-
-  int timeout_;
-  // Amount of time to wait between reconnection attempts.
-
-  int max_timeout_;
-  // Maximum amount of time to wait between reconnection attempts.
-
-  char direction_;
-  // Indicates which direction data flows through the channel ('O' ==
-  // output and 'I' == input).
-
-  int socket_queue_size_;
-  // Size of the socket queue (0 means "use default").
-};
-
-class Input_Channel : public Channel
-  // = TITLE
-  //     Handle reception of Peer messages arriving as events.
-{
-public:
-  Input_Channel (ROUTING_TABLE *, 
-		 Channel_Connector *, 
-		 ACE_Thread_Manager * = 0,
-		 int socket_queue_size = 0);
-  // Constructor sets the routing table pointer.
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Receive and process peer messages.
-
-protected:
-  virtual int recv_peer (ACE_Message_Block *&);
-  // Receive a message from a peer.
-
-  int route_message (ACE_Message_Block *);
-  // Action that receives messages from peerd.
-
-  ACE_Message_Block *msg_frag_;
-  // Keep track of message fragment to handle non-blocking recv's from
-  // peers.
-
-  virtual int svc (void);
-  // This method is not used since we are single-threaded.
-
-private:
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);  
-  // This methods should not be called to handle input.
-};
-
-class Output_Channel : public Channel
-  // = TITLE
-  //     Handle transmission of messages to other Peers using a
-  //     single-threaded approach.
-{
-public:
-  Output_Channel (ROUTING_TABLE *, 
-		  Channel_Connector *, 
-		  ACE_Thread_Manager * = 0,
-		  int socket_queue_size = 0);
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a gateway (may be queued if necessary).
-
-protected:
-  // = We'll allow up to 16 megabytes to be queued per-output
-  // channel.
-  enum {QUEUE_SIZE = 1024 * 1024 * 16};
-
-  virtual int handle_input (ACE_HANDLE);
-  // Receive and process shutdowns from peer.
-
-  virtual int handle_output (ACE_HANDLE);
-  // Finish sending a message when flow control conditions abate.
-
-  int nonblk_put (ACE_Message_Block *mb);
-  // Perform a non-blocking put().
-
-  virtual int send_peer (ACE_Message_Block *);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // This method is not used since we are single-threaded.
-};
-
-#endif /* _CHANNEL */
diff --git a/apps/Gateway/Gateway/Channel_Connector.cpp b/apps/Gateway/Gateway/Channel_Connector.cpp
deleted file mode 100644
index a5394e8b013..00000000000
--- a/apps/Gateway/Gateway/Channel_Connector.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "Channel_Connector.h"
-// $Id$
-
-
-Channel_Connector::Channel_Connector (void)
-{
-}
-
-// Override the connection-failure method to add timer support.
-// Note that these timers perform "expoential backoff" to 
-// avoid rapidly trying to reestablish connections when a link
-// goes down.
-
-int
-Channel_Connector::handle_close (ACE_HANDLE sd, ACE_Reactor_Mask)
-{
-  ACE_Connector<Channel, CHANNEL_PEER_CONNECTOR>::AST *stp = 0;
-
-  // Locate the ACE_Svc_Handler corresponding to the socket descriptor.
-  if (this->handler_map_.find (sd, stp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) can't locate channel %d in map, %p\n",
-		      sd, "find"), -1);
-
-  Channel *channel = stp->svc_handler ();
-
-  // Schedule a reconnection request at some point in the future
-  // (note that channel uses an exponential backoff scheme).
-  if (ACE_Service_Config::reactor ()->schedule_timer (channel, 0, 
-					       channel->timeout ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "schedule_timer"), -1);
-  return 0;
-}
-
-// Initiate (or reinitiate) a connection to the Channel.
-
-int
-Channel_Connector::initiate_connection (Channel *channel,
-					ACE_Synch_Options &synch_options)
-{
-  char buf[MAXHOSTNAMELEN];
-
-  // Mark ourselves as idle so that the various iterators 
-  // will ignore us until we are reconnected.
-  channel->state (Channel::IDLE);
-
-  if (channel->remote_addr ().addr_to_string (buf, sizeof buf) == -1
-      || channel->local_addr ().addr_to_string (buf, sizeof buf) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "can't obtain peer's address"), -1);
-
-  // Try to connect to the Peer.
-
-  if (this->connect (channel, channel->remote_addr (), 
-		     synch_options, channel->local_addr ()) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	{
-	  channel->state (Channel::FAILED);
-	  ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", 
-		     "connect", buf));
-
-	  // Reschedule ourselves to try and connect again.
-	  if (synch_options[ACE_Synch_Options::USE_REACTOR])
-	    {
-	      if (ACE_Service_Config::reactor ()->schedule_timer 
-		  (channel, 0, channel->timeout ()) == 0)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-				  "schedule_timer"), -1);
-	    }
-	  else 
-	    // Failures on synchronous connects are reported as errors
-	    // so that the caller can decide how to proceed.
-	    return -1;
-	}
-      else
-	{
-	  channel->state (Channel::CONNECTING);
-	  ACE_DEBUG ((LM_DEBUG, 
-		     "(%t) in the process of connecting %s to %s\n",
-		     synch_options[ACE_Synch_Options::USE_REACTOR] 
-		     ? "asynchronously" : "synchronously", buf));
-	}
-    }
-  else 
-    {
-      channel->state (Channel::ESTABLISHED);
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n", 
-		 buf, channel->get_handle ()));
-    }
-  return 0;
-}
diff --git a/apps/Gateway/Gateway/Channel_Connector.h b/apps/Gateway/Gateway/Channel_Connector.h
deleted file mode 100644
index 3e27f37355a..00000000000
--- a/apps/Gateway/Gateway/Channel_Connector.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Channel_Connector.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CHANNEL_CONNECTOR)
-#define _CHANNEL_CONNECTOR
-
-#include "ace/Connector.h"
-#include "Thr_Channel.h"
-
-class Channel_Connector : public ACE_Connector<Channel, CHANNEL_PEER_CONNECTOR>
-  // = TITLE
-  //    A concrete factory class that setups connections to peerds 
-  //    and produces a new Channel object to do the dirty work...
-{
-public:
-  Channel_Connector (void);
-
-  // Initiate (or reinitiate) a connection on the Channel.
-  int initiate_connection (Channel *, 
-			   ACE_Synch_Options & = ACE_Synch_Options::synch);
-
-protected:  
-  // Override the connection-failure method to add timer support.
-  virtual int handle_close (ACE_HANDLE sd, ACE_Reactor_Mask);
-};
-
-#endif /* _CHANNEL_CONNECTOR */
diff --git a/apps/Gateway/Gateway/Concurrency_Strategies.h b/apps/Gateway/Gateway/Concurrency_Strategies.h
deleted file mode 100644
index 28e59a4b2e6..00000000000
--- a/apps/Gateway/Gateway/Concurrency_Strategies.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Concurrency_strategies.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CONCURRENCY_STRATEGIES)
-#define _CONCURRENCY_STRATEGIES
-
-#include "ace/Synch.h"
-
-// The following typedefs are used in order to parameterize the
-// synchronization policies without changing the source code!
-
-// If we don't have threads then use the single-threaded synchronization.
-#if !defined (ACE_HAS_THREADS)
-#define SYNCH_STRATEGY ACE_NULL_SYNCH
-typedef ACE_Null_Mutex MAP_MUTEX;
-#else /* ACE_HAS_THREADS */
-
-// Note that we only need to make the ACE_Task thread-safe if we are
-// using the multi-threaded Thr_Consumer_Proxy...
-#if defined (USE_OUTPUT_MT) 
-#define SYNCH_STRATEGY ACE_MT_SYNCH
-#else
-#define SYNCH_STRATEGY ACE_NULL_SYNCH
-#endif /* USE_OUTPUT_MT || USE_INPUT_MT */
-
-// Note that we only need to make the ACE_Map_Manager thread-safe if
-// we are using the multi-threaded Thr_Supplier_Proxy.  In this
-// case, we use an RW_Mutex since we'll lookup Consumers far more
-// often than we'll update them.
-#if defined (USE_INPUT_MT)
-typedef ACE_RW_Mutex MAP_MUTEX;
-#else
-typedef ACE_Null_Mutex MAP_MUTEX;
-#endif /* USE_INPUT_MT */
-#endif /* ACE_HAS_THREADS */
-
-// = Forward decls
-class Thr_Consumer_Proxy;
-class Thr_Supplier_Proxy;
-class Consumer_Proxy;
-class Supplier_Proxy;
-
-#if defined (ACE_HAS_THREADS) && (defined (USE_OUTPUT_MT) || defined (USE_INPUT_MT))
-#if defined (USE_OUTPUT_MT)
-typedef Thr_Consumer_Proxy CONSUMER_PROXY;
-#else
-typedef Consumer_Proxy CONSUMER_PROXY;
-#endif /* USE_OUTPUT_MT */
-
-#if defined (USE_INPUT_MT)
-typedef Thr_Supplier_Proxy SUPPLIER_PROXY;
-#else
-typedef Supplier_Proxy SUPPLIER_PROXY;
-#endif /* USE_INPUT_MT */
-#else
-// Instantiate a non-multi-threaded Gateway.
-typedef Supplier_Proxy SUPPLIER_PROXY;
-typedef Consumer_Proxy CONSUMER_PROXY;
-#endif /* ACE_HAS_THREADS */
-
-#endif /* _CONCURRENCY_STRATEGIES */
diff --git a/apps/Gateway/Gateway/Consumer_Entry.cpp b/apps/Gateway/Gateway/Consumer_Entry.cpp
deleted file mode 100644
index c3dcd96ebbf..00000000000
--- a/apps/Gateway/Gateway/Consumer_Entry.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Defines an entry in the Consumer Map.
-// $Id$
-
-#include "Consumer_Entry.h"
-
-Consumer_Entry::Consumer_Entry (void)
-{
-  ACE_NEW (this->destinations_, Consumer_Entry::ENTRY_SET);
-}
-
-Consumer_Entry::~Consumer_Entry (void)
-{
-  delete this->destinations_;
-}
-
-// Get the associated set of destinations.
-
-Consumer_Entry::ENTRY_SET *
-Consumer_Entry::destinations (void)
-{
-  return this->destinations_;
-}
-
-// Set the associated set of destinations.
-
-void 
-Consumer_Entry::destinations (Consumer_Entry::ENTRY_SET *s)
-{
-  this->destinations_ = s;
-}
-
diff --git a/apps/Gateway/Gateway/Consumer_Entry.h b/apps/Gateway/Gateway/Consumer_Entry.h
deleted file mode 100644
index fe502991514..00000000000
--- a/apps/Gateway/Gateway/Consumer_Entry.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Consumer_Entry.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_ENTRY)
-#define _ROUTING_ENTRY
-
-#include "ace/Set.h"
-
-// Forward reference.
-class IO_Handler;
-
-class Consumer_Entry
-{
-  // = TITLE
-  //    Defines an entry in the Consumer_Map.
-public:
-  Consumer_Entry (void);
-  ~Consumer_Entry (void);
-
-  typedef ACE_Unbounded_Set<IO_Handler *> ENTRY_SET;
-  typedef ACE_Unbounded_Set_Iterator<IO_Handler *> ENTRY_ITERATOR;
-
-  // = Set/get the associated set of destinations.
-  ENTRY_SET *destinations (void);
-  void destinations (ENTRY_SET *);
-
-protected:
-  ENTRY_SET *destinations_;
-  // The set of destinations;
-};
-
-#endif /* _ROUTING_ENTRY */
diff --git a/apps/Gateway/Gateway/Consumer_Map.cpp b/apps/Gateway/Gateway/Consumer_Map.cpp
deleted file mode 100644
index 6d16601f949..00000000000
--- a/apps/Gateway/Gateway/Consumer_Map.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#if !defined (_CONSUMER_MAP_C)
-#define _CONSUMER_MAP_C
-
-#include "Consumer_Map.h"
-
-// Bind the Event_Addr to the INT_ID.
-
-int
-Consumer_Map::bind (Event_Addr event_addr, 
-		    Consumer_Entry *Consumer_Entry)
-{
-  return this->map_.bind (event_addr, Consumer_Entry);
-}
-
-// Find the Consumer_Entry corresponding to the Event_Addr.
-
-int
-Consumer_Map::find (Event_Addr event_addr, 
-		    Consumer_Entry *&Consumer_Entry)
-{
-  return this->map_.find (event_addr, Consumer_Entry);
-}
-
-// Unbind (remove) the Event_Addr from the map.
-
-int
-Consumer_Map::unbind (Event_Addr event_addr)
-{
-  return this->map_.unbind (event_addr);
-}
-
-Consumer_Map_Iterator::Consumer_Map_Iterator (Consumer_Map &rt)
-  : map_iter_ (rt.map_)
-{
-}
-
-int
-Consumer_Map_Iterator::next (Consumer_Entry *&ss)
-{
-  // Loop in order to skip over inactive entries if necessary.
-
-  for (ACE_Map_Entry<Event_Addr, Consumer_Entry *> *temp = 0;
-       this->map_iter_.next (temp) != 0; 
-       this->advance ())
-    {
-      // Otherwise, return the next item.
-      ss = temp->int_id_;
-      return 1;
-    }
-  return 0;
-}
-
-int
-Consumer_Map_Iterator::advance (void)
-{
-  return this->map_iter_.advance ();
-}
-#endif /* _CONSUMER_MAP_C */
diff --git a/apps/Gateway/Gateway/Consumer_Map.h b/apps/Gateway/Gateway/Consumer_Map.h
deleted file mode 100644
index fd392afaf6e..00000000000
--- a/apps/Gateway/Gateway/Consumer_Map.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Consumer_Map.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CONSUMER_MAP_H)
-#define _CONSUMER_MAP_H
-
-#include "ace/Map_Manager.h"
-#include "Concurrency_Strategies.h"
-#include "Event.h"
-#include "Consumer_Entry.h"
-
-class Consumer_Map
-{
-  // = TITLE
-  //    Define a generic consumer map based on the ACE Map_Manager.  
-  //
-  // = DESCRIPTION
-  //    This class makes it easier to use the Map_Manager.
-public:
-  int bind (Event_Addr event, Consumer_Entry *Consumer_Entry);
-  // Associate Event with the Consumer_Entry.
-
-  int find (Event_Addr event, Consumer_Entry *&Consumer_Entry);
-  // Break any association of EXID.
-
-  int unbind (Event_Addr event);
-  // Locate EXID and pass out parameter via INID.  If found,
-  // return 0, else -1.
-
-public:
-  ACE_Map_Manager<Event_Addr, Consumer_Entry *, MAP_MUTEX> map_;
-  // Map that associates Event Addrs (external ids) with Consumer_Entry *'s
-  // <internal IDs>.
-};
-
-class Consumer_Map_Iterator
-{
-  // = TITLE
-  //    Define an iterator for the Consumer Map.
-public:
-  Consumer_Map_Iterator (Consumer_Map &mm);
-  int next (Consumer_Entry *&);
-  int advance (void);
-
-private:
-  ACE_Map_Iterator<Event_Addr, Consumer_Entry *, MAP_MUTEX> map_iter_;
-  // Map we are iterating over.
-};
-#endif /* _CONSUMER_MAP_H */
diff --git a/apps/Gateway/Gateway/Dispatch_Set.h b/apps/Gateway/Gateway/Dispatch_Set.h
deleted file mode 100644
index a867f1ca5ff..00000000000
--- a/apps/Gateway/Gateway/Dispatch_Set.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Dispatch_Set.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_DISPATCH_SET)
-#define _DISPATCH_SET
-
-#include "ace/Set.h"
-
-// Forward reference.
-class Proxy_Handler;
-
-typedef ACE_Unbounded_Set<Proxy_Handler *> Dispatch_Set;
-typedef ACE_Unbounded_Set_Iterator<Proxy_Handler *> Dispatch_Set_Iterator;
-
-#endif /* _DISPATCH_SET */
diff --git a/apps/Gateway/Gateway/IO_Handler.cpp b/apps/Gateway/Gateway/IO_Handler.cpp
deleted file mode 100644
index ba1b355b3ba..00000000000
--- a/apps/Gateway/Gateway/IO_Handler.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-// $Id$
-
-#include "Consumer_Entry.h"
-#include "IO_Handler_Connector.h"
-
-// Convenient short-hands.
-#define CO CONDITION
-#define MU MAP_MUTEX
-
-// The total number of bytes sent/received on this channel.
-
-size_t 
-IO_Handler::total_bytes (void)
-{
-  return this->total_bytes_;
-}
-
-void 
-IO_Handler::total_bytes (size_t bytes)
-{
-  this->total_bytes_ += bytes;
-}
-
-IO_Handler::IO_Handler (Consumer_Map *consumer_map,
-			IO_Handler_Connector *ioc,
-			ACE_Thread_Manager *thr_mgr,
-			int socket_queue_size)
-  : ACE_Svc_Handler<ACE_SOCK_STREAM, SYNCH_STRATEGY> (thr_mgr),
-    consumer_map_ (consumer_map),
-    id_ (-1),
-    total_bytes_ (0),
-    state_ (IO_Handler::IDLE),
-    connector_ (ioc),
-    timeout_ (1),
-    max_timeout_ (IO_Handler::MAX_RETRY_TIMEOUT), 
-    socket_queue_size_ (socket_queue_size)
-{
-}
-
-// Set the associated channel.
-
-void
-IO_Handler::active (int a)
-{
-  this->state (a == 0 ? IO_Handler::IDLE : IO_Handler::ESTABLISHED);
-}
-
-// Get the associated channel.
-
-int
-IO_Handler::active (void)
-{
-  return this->state () == IO_Handler::ESTABLISHED;
-}
-
-// Set the direction.
-
-void
-IO_Handler::direction (char d)
-{
-  this->direction_ = d;
-}
-
-// Get the direction.
-
-char
-IO_Handler::direction (void)
-{
-  return this->direction_;
-}
-
-// Sets the timeout delay.
-
-void
-IO_Handler::timeout (int to)
-{
-  if (to > this->max_timeout_)
-    to = this->max_timeout_;
-
-  this->timeout_ = to;
-}
-
-// Recalculate the current retry timeout delay using exponential
-// backoff.  Returns the original timeout (i.e., before the
-// recalculation).
-
-int
-IO_Handler::timeout (void)
-{
-  int old_timeout = this->timeout_;
-  this->timeout_ *= 2;
-  
-  if (this->timeout_ > this->max_timeout_)
-    this->timeout_ = this->max_timeout_;
-
-  return old_timeout;
-}
-
-// Sets the max timeout delay.
-
-void
-IO_Handler::max_timeout (int mto)
-{
-  this->max_timeout_ = mto;
-}
-
-// Gets the max timeout delay.
-
-int
-IO_Handler::max_timeout (void)
-{
-  return this->max_timeout_;
-}
-
-// Restart connection asynchronously when timeout occurs.
-
-int
-IO_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	     "(%t) attempting to reconnect IO_Handler %d with timeout = %d\n", 
-             this->id (), this->timeout_));
-  return this->connector_->initiate_connection (this, ACE_Synch_Options::asynch);
-}
-
-// Restart connection (blocking_semantics dicates whether we
-// restart synchronously or asynchronously).
-
-int
-IO_Handler::reinitiate_connection (void)
-{
-  // Skip over deactivated descriptors.
-  if (this->get_handle () != -1)
-    {
-      // Make sure to close down peer to reclaim descriptor.
-      this->peer ().close ();
-
-#if 0
-//      if (this->state () == FAILED)
-//        {
-      // Reinitiate timeout to improve reconnection time.
-//          this->timeout (1);
-#endif
-      
-      ACE_DEBUG ((LM_DEBUG, 
-		 "(%t) scheduling reinitiation of IO_Handler %d\n",
-		 this->id ()));
-
-      // Reschedule ourselves to try and connect again.
-      if (ACE_Service_Config::reactor ()->schedule_timer 
-	  (this, 0, this->timeout ()) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-			  "schedule_timer"), -1);
-    }
-  return 0;
-}
-
-// Handle shutdown of the IO_Handler object.
-
-int
-IO_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) shutting down IO_Handler %d on handle %d\n", 
-	     this->id (), this->get_handle ()));
-  
-  return this->reinitiate_connection ();
-}
-
-// Set the state of the channel.
-
-void
-IO_Handler::state (IO_Handler::State s)
-{
-  this->state_ = s;
-}
-
-// Perform the first-time initiation of a connection to the peer.
-
-int
-IO_Handler::initialize_connection (void)
-{
-  this->state_ = IO_Handler::ESTABLISHED;
-
-  // Restart the timeout to 1.
-  this->timeout (1);
-
-#if defined (ASSIGN_SUPPLIER_ID)
-  // Action that sends the route id to the peerd.
-
-  CONN_ID id = htons (this->id ());
-
-  ssize_t n = this->peer ().send ((const void *) &id, sizeof id);
-
-  if (n != sizeof id)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      n == 0 ? "gatewayd has closed down unexpectedly" : "send"), 
-		      -1);
-#endif /* ASSIGN_SUPPLIER_ID */
-  return 0;
-}
-
-// Set the size of the socket queue.
-
-void
-IO_Handler::socket_queue_size (void)
-{
-  if (this->socket_queue_size_ > 0)
-    {
-      int option = this->direction_ == 'S' ? SO_RCVBUF : SO_SNDBUF;
-
-      if (this->peer ().set_option (SOL_SOCKET, option,
-				  &this->socket_queue_size_, sizeof (int)) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "set_option"));
-    }
-}
-
-// Upcall from the ACE_Acceptor::handle_input() that
-// delegates control to our application-specific IO_Handler.
-
-int
-IO_Handler::open (void *a)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) IO_Handler's fd = %d\n", 
-	      this->peer ().get_handle ()));
-
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn on non-blocking I/O.
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call down to the base class to activate and register this handler.
-  if (this->ACE_Svc_Handler<ACE_SOCK_STREAM, SYNCH_STRATEGY>::open (a) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "activate"), -1);
-
-  return this->initialize_connection ();
-}
-
-// Return the current state of the channel.
-
-IO_Handler::State
-IO_Handler::state (void)
-{
-  return this->state_;
-}
-
-void
-IO_Handler::id (CONN_ID id)
-{
-  this->id_ = id;
-}
-
-CONN_ID
-IO_Handler::id (void)
-{
-  return this->id_;
-}
-
-// Set the peer's address information.
-int 
-IO_Handler::bind (const ACE_INET_Addr &remote_addr, 
-	       const ACE_INET_Addr &local_addr,
-	       CONN_ID id)
-{
-  this->remote_addr_ = remote_addr;
-  this->local_addr_ = local_addr;
-  this->id_ = id;
-  return 0;
-}
-
-ACE_INET_Addr &
-IO_Handler::remote_addr (void)
-{
-  return this->remote_addr_;
-}
-
-ACE_INET_Addr &
-IO_Handler::local_addr (void)
-{
-  return this->local_addr_;
-}
-
-// Constructor sets the consumer map pointer.
-
-Consumer_Handler::Consumer_Handler (Consumer_Map *consumer_map,
-				    IO_Handler_Connector *ioc,
-				    ACE_Thread_Manager *thr_mgr,
-				    int socket_queue_size)
-  : IO_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'C';
-  this->msg_queue ()->high_water_mark (Consumer_Handler::QUEUE_SIZE);
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method simply marks the IO_Handler as 
-// having failed so that handle_close () can reconnect.
-
-int 
-Consumer_Handler::handle_input (ACE_HANDLE)
-{
-  char buf[1];
-
-  this->state (IO_Handler::FAILED);
-
-  switch (this->peer ().recv (buf, sizeof buf))
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has failed unexpectedly for Output IO_Handler %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    case 0:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has shutdown unexpectedly for Output IO_Handler %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer is sending input on Output IO_Handler %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    }
-}
-
-// Perform a non-blocking put() of event MB.  If we are unable to
-// send the entire event  the remainder is re-queued at the *front* of
-// the Event_List.
-
-int
-Consumer_Handler::nonblk_put (ACE_Message_Block *mb)
-{
-  // Try to send the event.  If we don't send it all (e.g., due to
-  // flow control), then re-queue the remainder at the head of the
-  // Event_List and ask the ACE_Reactor to inform us (via
-  // handle_output()) when it is possible to try again. 
-
-  ssize_t n = this->send (mb);
-
-  if (n == -1)
-    {
-      // Things have gone wrong, let's try to close down and set up a new reconnection.
-      this->state (IO_Handler::FAILED);
-      this->handle_close ();
-      return -1;
-    }
-  else if (errno == EWOULDBLOCK) // Didn't manage to send everything.
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) queueing activated on handle %d to routing id %d\n",
-                 this->get_handle (), this->id ()));
-
-      // ACE_Queue in *front* of the list to preserve order.
-      if (this->msg_queue ()->enqueue_head 
-	  (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enqueue_head"), -1);
-      
-      // Tell ACE_Reactor to call us back when we can send again.
-      else if (ACE_Service_Config::reactor ()->
-	       schedule_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_wakeup"), -1);
-      return 0;
-    }
-  else
-    return n;
-}
-
-ssize_t
-Consumer_Handler::send (ACE_Message_Block *mb)
-{
-  ssize_t len = mb->length ();
-  ssize_t n = this->peer ().send (mb->rd_ptr (), len);
-
-  if (n <= 0)
-    return errno == EWOULDBLOCK ? 0 : n;
-  else if (n < len)
-    // Re-adjust pointer to skip over the part we did send.
-    mb->rd_ptr (n);
-  else /* if (n == length) */
-    {
-      // The whole event is sent, we can now safely deallocate the
-      // buffer.  Note that this should decrement a reference count...
-      delete mb;
-      errno = 0;
-    }
-  this->total_bytes (n);
-  return n;
-}
-
-// Finish sending an event when flow control conditions abate.
-// This method is automatically called by the ACE_Reactor.
-
-int 
-Consumer_Handler::handle_output (ACE_HANDLE)
-{
-  ACE_Message_Block *mb = 0;
-
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) in handle_output on handle %d\n", 
-	      this->get_handle ()));
-  // The list had better not be empty, otherwise there's a bug!
-
-  if (this->msg_queue ()->dequeue_head 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1)
-    {
-      switch (this->nonblk_put (mb))
-        {
-        case 0:           // Partial send.
-          ACE_ASSERT (errno == EWOULDBLOCK);
-          // Didn't write everything this time, come back later...
-          break;
-
-        case -1:
-          // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-          delete mb;
-          ACE_ERROR ((LM_ERROR, "(%t) %p\n", "transmission failure"));
-
-          /* FALLTHROUGH */
-        default: // Sent the whole thing.
-          
-          // If we succeed in writing the entire event (or we did not
-          // fail due to EWOULDBLOCK) then check if there are more
-          // events on the Event_List.  If there aren't, tell the
-          // ACE_Reactor not to notify us anymore (at least until
-          // there are new events queued up).
-
-          if (this->msg_queue ()->is_empty ())
-            {
-              ACE_DEBUG ((LM_DEBUG, 
-			  "(%t) queueing deactivated on handle %d to routing id %d\n",
-                         this->get_handle (), this->id ()));
-
-
-              if (ACE_Service_Config::reactor ()->
-		  cancel_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-                ACE_ERROR ((LM_ERROR, "(%t) %p\n", "cancel_wakeup"));
-            }
-        }
-    }
-  else 
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "dequeue_head"));
-  return 0;      
-}
-
-// Send an event to a peer (may queue if necessary).
-
-int 
-Consumer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  if (this->msg_queue ()->is_empty ())
-    // Try to send the event *without* blocking!
-    return this->nonblk_put (mb); 
-  else
-    // If we have queued up events due to flow control then just
-    // enqueue and return.
-    return this->msg_queue ()->enqueue_tail 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Constructor sets the consumer map pointer and the connector
-// pointer.
-
-Supplier_Handler::Supplier_Handler (Consumer_Map *consumer_map,
-				    IO_Handler_Connector *ioc,
-				    ACE_Thread_Manager *thr_mgr,
-				    int socket_queue_size)
-  : msg_frag_ (0), 
-    IO_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'S';
-  this->msg_queue ()->high_water_mark (0);
-}
-
-// Receive a Peer event from peerd.  Handles fragmentation.
-//
-// The routing event returned from recv consists of two parts:
-// 1. The Address part, contains the virtual routing id.
-// 2. The Data part, which contains the actual data to be routed.
-// 
-// The reason for having two parts is to shield the higher layers
-// of software from knowledge of the event structure.
-
-int
-Supplier_Handler::recv (ACE_Message_Block *&forward_addr)
-{ 
-  Event *event;
-  ssize_t len;
-  ssize_t n = 0;
-  size_t offset = 0;
-
-  if (this->msg_frag_ == 0)
-    // No existing fragment...
-    ACE_NEW_RETURN (this->msg_frag_, 
-		    ACE_Message_Block (sizeof (Event)), 
-		    -1);
-
-  event = (Event *) this->msg_frag_->rd_ptr ();
-
-  const ssize_t HEADER_SIZE = sizeof (Event_Header);
-  ssize_t header_bytes_left_to_read = HEADER_SIZE - this->msg_frag_->length ();
-
-  if (header_bytes_left_to_read > 0)
-    {
-      n = this->peer ().recv (this->msg_frag_->wr_ptr (), 
-			      header_bytes_left_to_read);
-
-      if (n == -1 /* error */
-	  || n == 0  /* EOF */)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p\n", 
-		      "Recv error during header read "));
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "attempted to read %d\n", 
-		      header_bytes_left_to_read));
-	  delete this->msg_frag_;
-	  this->msg_frag_ = 0;
-	  return n;
-	}
-
-      // Bump the write pointer by the amount read.
-      this->msg_frag_->wr_ptr (n);
-
-      // At this point we may or may not have the ENTIRE header.
-      if (this->msg_frag_->length () < HEADER_SIZE)
-	{
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "Partial header received: only %d bytes\n",
-		     this->msg_frag_->length ()));
-	  // Notify the caller that we didn't get an entire event.
-	  errno = EWOULDBLOCK;
-	  return -1;
-	}
-    }
-
-  // At this point there is a complete, valid header in msg_frag_
-  len = sizeof event->buf_ + HEADER_SIZE - this->msg_frag_->length ();
-
-  ssize_t m = this->peer ().recv (event->buf_ + offset, len);
-
-  // Try to receive the remainder of the event
-
-  switch (m)
-    {
-    case -1:
-      if (errno == EWOULDBLOCK) 
-        {
-          // This shouldn't happen since the ACE_Reactor
-          // just triggered us to handle pending I/O!
-          ACE_DEBUG ((LM_DEBUG, "(%t) unexpected recv failure\n"));
-          errno = EWOULDBLOCK;
-          return -1;
-        }
-      else
-        /* FALLTHROUGH */;
-
-    case 0: // Premature EOF.
-      delete this->msg_frag_;
-      this->msg_frag_ = 0;
-      return 0;
-
-    default:
-      if (m != len)
-        // Re-adjust pointer to skip over the part we've read.
-        {
-          this->msg_frag_->wr_ptr (m);
-          errno = EWOULDBLOCK;
-          return -1; // Inform caller that we didn't get the whole event.
-        }
-      else
-        {
-          // Set the write pointer at 1 past the end of the event.
-          this->msg_frag_->wr_ptr (m);
-
-          // Set the read pointer to the beginning of the event.
-          this->msg_frag_->rd_ptr (this->msg_frag_->base ());
-
-          // Allocate an event forwarding header and chain the data
-          // portion onto its continuation field.
-          ACE_NEW_RETURN (forward_addr,
-			  ACE_Message_Block (sizeof (Event_Addr), 
-					     ACE_Message_Block::MB_PROTO, 
-					     this->msg_frag_),
-			  -1);
-
-          Event_Addr event_addr (this->id (), event->header_.routing_id_, 0);
-          // Copy the forwarding address from the Event_Addr into
-          // forward_addr.
-          forward_addr->copy ((char *) &event_addr, sizeof (Event));
-
-          // Reset the pointer to indicate we've got an entire event.
-          this->msg_frag_ = 0; 
-        }
-      this->total_bytes (m + n);
-#if defined (VERBOSE)
-      ACE_DEBUG ((LM_DEBUG, "(%t) channel id = %d, route id = %d, len = %d, payload = %*s",
-		 event_addr.conn_id_, event->header_.routing_id_, event->header_.len_,
-		 event->header_.len_, event->buf_));
-#else
-      ACE_DEBUG ((LM_DEBUG, "(%t) route id = %d, cur len = %d, total bytes read = %d\n",
-		 event->header_.routing_id_, event->header_.len_, this->total_bytes ()));
-#endif
-      return m + n;
-    }
-}
-
-// Receive various types of input (e.g., Peer event from the 
-// gatewayd, as well as stdio).
-
-int 
-Supplier_Handler::handle_input (ACE_HANDLE)
-{
-  ACE_Message_Block *forward_addr = 0;
-
-  switch (this->recv (forward_addr))
-    {
-    case 0:
-      // Note that a peer should never initiate a shutdown.
-      this->state (IO_Handler::FAILED);
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			"(%t) Peer has closed down unexpectedly for Input IO_Handler %d\n", 
-                        this->id ()), -1);
-      /* NOTREACHED */
-    case -1:
-      if (errno == EWOULDBLOCK)
-        // A short-read, we'll come back and finish it up later on!
-        return 0;
-      else // A weird problem occurred, shut down and start again.
-        {
-          this->state (IO_Handler::FAILED);
-          ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p for Input IO_Handler %d\n", 
-			    "Peer has failed unexpectedly",
-                           this->id ()), -1);
-        }
-      /* NOTREACHED */
-    default:
-      return this->forward (forward_addr);
-    }
-}
-
-// Route an event to its appropriate destination.
-
-int
-Supplier_Handler::forward (ACE_Message_Block *forward_addr)
-{
-  // We got a valid event, so determine its virtual routing id,
-  // which is stored in the first of the two event blocks chained
-  // together.
-	
-  Event_Addr *forwarding_key = (Event_Addr *) forward_addr->rd_ptr ();
-	
-  // Skip over the address portion.
-  const ACE_Message_Block *const data = forward_addr->cont ();
-	
-  // RE points to the routing entry located for this routing id.
-  Consumer_Entry *re = 0;
-	
-  if (this->consumer_map_->find (*forwarding_key, re) != -1)
-    {
-      // Check to see if there are any destinations.
-      if (re->destinations ()->size () == 0)
-	ACE_DEBUG ((LM_WARNING, 
-		   "there are no active destinations for this event currently\n"));
-	    
-      else		// There are destinations, so forward the event.
-	{
-	  Consumer_Entry::ENTRY_SET *esp = re->destinations ();
-	  Consumer_Entry::ENTRY_ITERATOR si (*esp);
-		
-	  for (IO_Handler **channel = 0; si.next (channel) != 0; si.advance ())
-	    {
-	      // Only process active channels.
-	      if ((*channel)->active ())
-		{
-		  // Clone the event portion (should be doing reference counting here...)
-		  ACE_Message_Block *newmsg = data->clone (); 
-		    
-		  ACE_DEBUG ((LM_DEBUG, "(%t) sending to peer %d\n", (*channel)->id ()));
-		    
-		  if ((*channel)->put (newmsg) == -1)
-		    {
-		      if (errno == EWOULDBLOCK) // The queue has filled up!
-			ACE_ERROR ((LM_ERROR, "(%t) %p\n", 
-				   "gateway is flow controlled, so we're dropping events"));
-		      else
-			ACE_ERROR ((LM_ERROR, "(%t) %p transmission error to route %d\n",
-				   "put", (*channel)->id ()));
-			
-		      // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-		      delete newmsg;
-		    }
-		}
-	    }
-	  // Will become superfluous once we have reference counting...
-	  delete forward_addr;
-	  return 0;
-	}
-    }
-  delete forward_addr;
-  // Failure return.
-  ACE_ERROR ((LM_DEBUG, "(%t) find failed on conn id = %d, logical id = %d, payload = %d\n", 
-	     forwarding_key->conn_id_, forwarding_key->logical_id_, forwarding_key->payload_));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Map_Manager<Event_Addr, Consumer_Entry *, MAP_MUTEX>;
-template class ACE_Map_Iterator<Event_Addr, Consumer_Entry *, MAP_MUTEX>;
-template class ACE_Map_Entry<Event_Addr, Consumer_Entry *>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/apps/Gateway/Gateway/IO_Handler.h b/apps/Gateway/Gateway/IO_Handler.h
deleted file mode 100644
index 7bda073f09b..00000000000
--- a/apps/Gateway/Gateway/IO_Handler.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    IO_Handler.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_IO_HANDLER)
-#define _IO_HANDLER
-
-#include "ace/Service_Config.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Svc_Handler.h"
-#include "Consumer_Map.h"
-#include "Consumer_Entry.h"
-#include "Event.h"
-
-// Forward declaration.
-class IO_Handler_Connector;
-
-class IO_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, SYNCH_STRATEGY>
-  // = TITLE
-  //    IO_Handler contains info about connection state and addressing.
-  //
-  // = DESCRIPTION
-  //     The IO_Handler classes process events sent from the peers to the
-  //     gateway.  These classes works as follows:
-  //   
-  // 1. IO_Handler_Connector creates a number of connections with the set of 
-  //    peers specified in a configuration file.  
-  //
-  // 2. For each peer that connects successfully, IO_Handler_Connector
-  //    creates an IO_Handler object.  Each object assigns a unique routing
-  //    id to its associated peer.  The Handlers are used by gatewayd
-  //    that to receive, route, and forward events from source peer(s)
-  //    to destination peer(s).
-{
-public:
-  IO_Handler (Consumer_Map *, 
-	      IO_Handler_Connector *, 
-	      ACE_Thread_Manager * = 0,
-	      int socket_queue_size = 0);
-
-  virtual int open (void * = 0);
-  // Initialize and activate a single-threaded IO_Handler (called by
-  // ACE_Connector::handle_output()).
-
-  int bind (const ACE_INET_Addr &remote_addr, 
-	    const ACE_INET_Addr &local_addr, 
-	    CONN_ID);
-  // Set the peer's addressing and routing information.
-
-  ACE_INET_Addr &remote_addr (void);
-  // Returns the peer's routing address.
-
-  ACE_INET_Addr &local_addr (void);
-  // Returns our local address.
-
-  // = Set/get routing id.
-  CONN_ID id (void);
-  void id (CONN_ID);
-
-  // = Set/get the current state of the IO_Handler.
-  enum State
-  {
-    IDLE = 1,      // Prior to initialization.
-    CONNECTING,    // During connection establishment.
-    ESTABLISHED,   // IO_Handler is established and active.
-    DISCONNECTING, // IO_Handler is in the process of connecting.
-    FAILED	   // IO_Handler has failed.
-  };
-
-  // = Set/get the current state.
-  State state (void);
-  void state (State);
-
-  // = Set/get the current retry timeout delay.
-  int timeout (void);
-  void timeout (int);
-
-  // = Set/get the maximum retry timeout delay.
-  int max_timeout (void);
-  void max_timeout (int);
-
-  // = Set/get IO_Handler activity status.
-  int active (void);
-  void active (int);
-
-  // = Set/get direction (necessary for error checking).
-  char direction (void);
-  void direction (char);
-
-  // = The total number of bytes sent/received on this channel.
-  size_t total_bytes (void);
-  void total_bytes (size_t bytes);
-  // Increment count by <bytes>.
-
-  virtual int handle_timeout (const ACE_Time_Value &, const void *arg);
-  // Perform timer-based IO_Handler reconnection.
-
-protected:
-  enum
-  {
-    MAX_RETRY_TIMEOUT = 300 // 5 minutes is the maximum timeout.
-  };
-
-  int initialize_connection (void);
-  // Perform the first-time initiation of a connection to the peer.
-
-  int reinitiate_connection (void);
-  // Reinitiate a connection asynchronously when peers fail.
-
-  void socket_queue_size (void);
-  // Set the socket queue size.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::RWE_MASK);
-  // Perform IO_Handler termination.
-
-  Consumer_Map *consumer_map_;
-  // Pointer to table that maps an event
-  // to a Set of IO_Handler *'s for output.
-
-  ACE_INET_Addr remote_addr_;
-  // Address of peer.
-
-  ACE_INET_Addr local_addr_;
-  // Address of us.
-
-  CONN_ID id_;  
-  // The assigned routing ID of this entry.
-
-  size_t total_bytes_;
-  // The total number of bytes sent/received on this channel.
-
-  State state_;
-  // The current state of the channel.
-
-  IO_Handler_Connector *connector_;
-  // Back pointer to IO_Handler_Connector to reestablish broken
-  // connections.
-
-  int timeout_;
-  // Amount of time to wait between reconnection attempts.
-
-  int max_timeout_;
-  // Maximum amount of time to wait between reconnection attempts.
-
-  char direction_;
-  // Indicates which direction data flows through the channel ('O' ==
-  // output and 'I' == input).
-
-  int socket_queue_size_;
-  // Size of the socket queue (0 means "use default").
-};
-
-class Supplier_Handler : public IO_Handler
-  // = TITLE
-  //     Handle reception of Peer events arriving as events.
-{
-public:
-  Supplier_Handler (Consumer_Map *, 
-		    IO_Handler_Connector *, 
-		    ACE_Thread_Manager * = 0,
-		    int socket_queue_size = 0);
-  // Constructor sets the consumer map pointer.
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Receive and process peer events.
-
-protected:
-  virtual int recv (ACE_Message_Block *&);
-  // Receive an event from a Supplier.
-
-  int forward (ACE_Message_Block *event);
-  // Forward the Event to a Consumer.
-
-  ACE_Message_Block *msg_frag_;
-  // Keep track of event fragment to handle non-blocking recv's from
-  // Suppliers.
-};
-
-class Consumer_Handler : public IO_Handler
-  // = TITLE
-  //     Handle transmission of events to other Peers using a
-  //     single-threaded approach.
-{
-public:
-  Consumer_Handler (Consumer_Map *, 
-		    IO_Handler_Connector *, 
-		    ACE_Thread_Manager * = 0,
-		    int socket_queue_size = 0);
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send an event to a Consumer (may be queued if necessary).
-
-protected:
-  // = We'll allow up to 16 megabytes to be queued per-output
-  // channel.
-  enum {QUEUE_SIZE = 1024 * 1024 * 16};
-
-  virtual int handle_input (ACE_HANDLE);
-  // Receive and process shutdowns from a Consumer.
-
-  virtual int handle_output (ACE_HANDLE);
-  // Finish sending event when flow control conditions abate.
-
-  int nonblk_put (ACE_Message_Block *mb);
-  // Perform a non-blocking put().
-
-  virtual ssize_t send (ACE_Message_Block *);
-  // Send an event to a Consumer.
-};
-
-#endif /* _IO_HANDLER */
diff --git a/apps/Gateway/Gateway/IO_Handler_Connector.cpp b/apps/Gateway/Gateway/IO_Handler_Connector.cpp
deleted file mode 100644
index 712b348951d..00000000000
--- a/apps/Gateway/Gateway/IO_Handler_Connector.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "IO_Handler_Connector.h"
-// $Id$
-
-
-IO_Handler_Connector::IO_Handler_Connector (void)
-{
-}
-
-// Override the connection-failure method to add timer support.
-// Note that these timers perform "expoential backoff" to 
-// avoid rapidly trying to reestablish connections when a link
-// goes down.
-
-int
-IO_Handler_Connector::handle_close (ACE_HANDLE sd, ACE_Reactor_Mask)
-{
-  ACE_Connector<IO_Handler, ACE_SOCK_CONNECTOR>::AST *stp = 0;
-
-  // Locate the ACE_Svc_Handler corresponding to the socket descriptor.
-  if (this->handler_map_.find (sd, stp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) can't locate channel %d in map, %p\n",
-		      sd, "find"), -1);
-
-  IO_Handler *channel = stp->svc_handler ();
-
-  // Schedule a reconnection request at some point in the future
-  // (note that channel uses an exponential backoff scheme).
-  if (ACE_Service_Config::reactor ()->schedule_timer (channel, 0, 
-					       channel->timeout ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "schedule_timer"), -1);
-  return 0;
-}
-
-// Initiate (or reinitiate) a connection to the IO_Handler.
-
-int
-IO_Handler_Connector::initiate_connection (IO_Handler *channel,
-					ACE_Synch_Options &synch_options)
-{
-  char buf[MAXHOSTNAMELEN];
-
-  // Mark ourselves as idle so that the various iterators 
-  // will ignore us until we are reconnected.
-  channel->state (IO_Handler::IDLE);
-
-  if (channel->remote_addr ().addr_to_string (buf, sizeof buf) == -1
-      || channel->local_addr ().addr_to_string (buf, sizeof buf) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "can't obtain peer's address"), -1);
-
-  // Try to connect to the Peer.
-
-  if (this->connect (channel, channel->remote_addr (), 
-		     synch_options, channel->local_addr ()) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	{
-	  channel->state (IO_Handler::FAILED);
-	  ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", 
-		     "connect", buf));
-
-	  // Reschedule ourselves to try and connect again.
-	  if (synch_options[ACE_Synch_Options::USE_REACTOR])
-	    {
-	      if (ACE_Service_Config::reactor ()->schedule_timer 
-		  (channel, 0, channel->timeout ()) == 0)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-				  "schedule_timer"), -1);
-	    }
-	  else 
-	    // Failures on synchronous connects are reported as errors
-	    // so that the caller can decide how to proceed.
-	    return -1;
-	}
-      else
-	{
-	  channel->state (IO_Handler::CONNECTING);
-	  ACE_DEBUG ((LM_DEBUG, 
-		     "(%t) in the process of connecting %s to %s\n",
-		     synch_options[ACE_Synch_Options::USE_REACTOR] 
-		     ? "asynchronously" : "synchronously", buf));
-	}
-    }
-  else 
-    {
-      channel->state (IO_Handler::ESTABLISHED);
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n", 
-		 buf, channel->get_handle ()));
-    }
-  return 0;
-}
diff --git a/apps/Gateway/Gateway/IO_Handler_Connector.h b/apps/Gateway/Gateway/IO_Handler_Connector.h
deleted file mode 100644
index 585428c88ee..00000000000
--- a/apps/Gateway/Gateway/IO_Handler_Connector.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    IO_Handler_Connector.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_IO_HANDLER_CONNECTOR)
-#define _IO_HANDLER_CONNECTOR
-
-#include "ace/Connector.h"
-#include "Thr_IO_Handler.h"
-
-class IO_Handler_Connector : public ACE_Connector<IO_Handler, ACE_SOCK_CONNECTOR>
-  // = TITLE
-  //    A concrete factory class that setups connections to peerds 
-  //    and produces a new IO_Handler object to do the dirty work...
-{
-public:
-  IO_Handler_Connector (void);
-
-  // Initiate (or reinitiate) a connection on the IO_Handler.
-  int initiate_connection (IO_Handler *, 
-			   ACE_Synch_Options & = ACE_Synch_Options::synch);
-
-protected:  
-  // Override the connection-failure method to add timer support.
-  virtual int handle_close (ACE_HANDLE sd, ACE_Reactor_Mask);
-};
-
-#endif /* _IO_HANDLER_CONNECTOR */
diff --git a/apps/Gateway/Gateway/Peer_Message.h b/apps/Gateway/Gateway/Peer_Message.h
deleted file mode 100644
index d9e65650095..00000000000
--- a/apps/Gateway/Gateway/Peer_Message.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Peer_Message.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (PEER_MESSAGE)
-#define PEER_MESSAGE
-
-// This is the unique connection identifier that denotes a particular
-// Channel in the Gateway.
-typedef short CONN_ID;
-
-class Peer_Addr
-  // = TITLE
-  //     Peer address is used to identify the source/destination of a 
-  //     routing message.
-{
-public:
-  Peer_Addr (CONN_ID cid = -1, u_char lid = 0, u_char pay = 0)
-    : conn_id_ (cid), logical_id_ (lid), payload_ (pay) {}
-
-  int operator== (const Peer_Addr &pa) const
-  {
-    return this->conn_id_ == pa.conn_id_ 
-      && this->logical_id_ == pa.logical_id_
-      && this->payload_ == pa.payload_;
-  }
-
-  CONN_ID conn_id_;
-  // Unique connection identifier that denotes a particular Channel.
-
-  u_char logical_id_;
-  // Logical ID.
-
-  u_char payload_;
-  // Payload type.
-};
-
-
-class Peer_Header
-  // = TITLE
-  //    Fixed sized header.
-{
-public:
-  typedef u_short ROUTING_ID;
-  // Type used to route messages from gatewayd.
-
-  enum
-  {
-    INVALID_ID = -1 // No peer can validly use this number.
-  };
-
-  ROUTING_ID routing_id_;
-  // Source ID.
-
-  size_t  len_;
-  // Length of the message in bytes.
-};
-
-class Peer_Message
-  // = TITLE
-  //    Variable-sized message (buf_ may be variable-sized between
-  //    0 and MAX_PAYLOAD_SIZE).
-{
-public:
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-  // The maximum size of an Peer message (see Peer protocol specs for
-  // exact #).
-
-  Peer_Header header_;
-  // Message header.
-
-  char buf_[MAX_PAYLOAD_SIZE];
-  // Message payload.
-};
-
-#endif /* PEER_MESSAGE */
diff --git a/apps/Gateway/Gateway/Routing_Entry.cpp b/apps/Gateway/Gateway/Routing_Entry.cpp
deleted file mode 100644
index cc270cfac3a..00000000000
--- a/apps/Gateway/Gateway/Routing_Entry.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Defines an entry in the Routing Table.
-// $Id$
-
-#include "Routing_Entry.h"
-
-Routing_Entry::Routing_Entry (int validity_interval)
-  : validity_interval_ (validity_interval)
-{
-  ACE_NEW (this->destinations_, Routing_Entry::ENTRY_SET);
-}
-
-Routing_Entry::~Routing_Entry (void)
-{
-  delete this->destinations_;
-}
-
-// Get the associated set of destinations.
-
-Routing_Entry::ENTRY_SET *
-Routing_Entry::destinations (void)
-{
-  return this->destinations_;
-}
-
-// Set the associated set of destinations.
-
-void 
-Routing_Entry::destinations (Routing_Entry::ENTRY_SET *s)
-{
-  this->destinations_ = s;
-}
-
-// Get the current validity interval for this route.
-
-int
-Routing_Entry::validity_interval (void)
-{
-  return this->validity_interval_;
-}
-
-// Set the current validity interval for this route.
-
-void
-Routing_Entry::validity_interval (int vi)
-{
-  this->validity_interval_ = vi;
-}
diff --git a/apps/Gateway/Gateway/Routing_Entry.h b/apps/Gateway/Gateway/Routing_Entry.h
deleted file mode 100644
index ab8e0eee53d..00000000000
--- a/apps/Gateway/Gateway/Routing_Entry.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Routing_Entry.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_ENTRY)
-#define _ROUTING_ENTRY
-
-#include "ace/Set.h"
-
-// Forward reference.
-class Channel;
-
-class Routing_Entry
-{
-  // = TITLE
-  //    Defines an entry in the Routing_Table.
-public:
-  Routing_Entry (int validity_interval = 0);
-  ~Routing_Entry (void);
-
-  typedef ACE_Unbounded_Set<Channel *> ENTRY_SET;
-  typedef ACE_Unbounded_Set_Iterator<Channel *> ENTRY_ITERATOR;
-
-  // = Set/get the associated set of destinations.
-  ENTRY_SET *destinations (void);
-  void destinations (ENTRY_SET *);
-
-  // = Set/get current validity interval for this routing entry.
-  int validity_interval (void);
-  void validity_interval (int);
-
-protected:
-  ENTRY_SET *destinations_;
-  // The set of destinations;
-
-  int validity_interval_;
-  // The current validity interval of this link.
-};
-
-#endif /* _ROUTING_ENTRY */
diff --git a/apps/Gateway/Gateway/Routing_Table.cpp b/apps/Gateway/Gateway/Routing_Table.cpp
deleted file mode 100644
index 3ef2f21bc1f..00000000000
--- a/apps/Gateway/Gateway/Routing_Table.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-#if !defined (_ROUTING_TABLE_C)
-#define _ROUTING_TABLE_C
-
-
-#include "Routing_Table.h"
-
-/* Bind the EXT_ID to the INT_ID. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Table<EXT_ID, INT_ID, LOCK>::bind (EXT_ID ext_id, INT_ID *int_id)
-{
-  return this->map_.bind (ext_id, int_id);
-}
-
-/* Find the INT_ID corresponding to the EXT_ID. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Table<EXT_ID, INT_ID, LOCK>::find (EXT_ID ext_id, INT_ID *&int_id)
-{
-  return this->map_.find (ext_id, int_id);
-}
-
-/* Unbind (remove) the EXT_ID from the map. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int
-Routing_Table<EXT_ID, INT_ID, LOCK>::unbind (EXT_ID ext_id)
-{
-  return this->map_.unbind (ext_id);
-}
-
-template <class EXT_ID, class INT_ID, class LOCK>
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::Routing_Iterator (Routing_Table<EXT_ID, 
-							  INT_ID, LOCK> &rt,
-							  int ignore_inactive)
-  : map_iter_ (rt.map_), 
-    ignore_inactive_ (ignore_inactive)
-{
-}
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::next (INT_ID *&ss)
-{
-  // Loop in order to skip over inactive entries if necessary.
-
-  for (ACE_Map_Entry<EXT_ID, INT_ID *> *temp = 0;
-       this->map_iter_.next (temp) != 0; 
-       this->advance ())
-    {
-      // Skip over inactive entries if necessary.
-      if (temp->int_id_->active () == 0 && this->ignore_inactive_)
-	continue;
-
-      // Otherwise, return the next item.
-      ss = temp->int_id_;
-      return 1;
-    }
-  return 0;
-}
-
-template <class EXT_ID, class INT_ID, class LOCK> int
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::advance (void)
-{
-  return this->map_iter_.advance ();
-}
-#endif /* _ROUTING_TABLE_C */
diff --git a/apps/Gateway/Gateway/Routing_Table.h b/apps/Gateway/Gateway/Routing_Table.h
deleted file mode 100644
index 84194f13e49..00000000000
--- a/apps/Gateway/Gateway/Routing_Table.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Routing_Table.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_TABLE_H)
-#define _ROUTING_TABLE_H
-
-#include "ace/Map_Manager.h"
-
-template <class EXT_ID, class INT_ID, class LOCK>
-class Routing_Table
-{
-  // = TITLE
-  //    Define a generic routing table based on the ACE Map_Manager.  
-  //
-  // = DESCRIPTION
-  //    We need to have this table, rather than just using the Map_Manager
-  //    directly in order to ignore "inactive" routing entries...
-public:
-  int bind (EXT_ID ext_id, INT_ID *int_id);
-  // Associate EXT_ID with the INT_ID.
-
-  int find (EXT_ID ext_id, INT_ID *&int_id);
-  // Break any association of EXID.
-
-  int unbind (EXT_ID ext_id);
-  // Locate EXID and pass out parameter via INID.  If found,
-  // return 0, else -1.
-
-public:
-  ACE_Map_Manager<EXT_ID, INT_ID *, LOCK> map_;
-  // Map external IDs to internal IDs.
-};
-
-template <class EXT_ID, class INT_ID, class LOCK>
-class Routing_Iterator
-{
-  // = TITLE
-  //    Define an iterator for the Routing Table.
-public:
-  Routing_Iterator (Routing_Table<EXT_ID, INT_ID, LOCK> &mm, 
-		    int ignore_inactive = 1);
-  int next (INT_ID *&);
-  int advance (void);
-
-private:
-  ACE_Map_Iterator<EXT_ID, INT_ID *, LOCK> map_iter_;
-  int ignore_inactive_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Routing_Table.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#endif /* _ROUTING_TABLE_H */
diff --git a/apps/Gateway/Gateway/Thr_Channel.cpp b/apps/Gateway/Gateway/Thr_Channel.cpp
deleted file mode 100644
index 26e385e2727..00000000000
--- a/apps/Gateway/Gateway/Thr_Channel.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "Thr_Channel.h"
-// $Id$
-
-#include "Channel_Connector.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Output_Channel::Thr_Output_Channel (ROUTING_TABLE *rt,
-					Channel_Connector *cc,
-					ACE_Thread_Manager *thr_mgr,
-					int socket_queue_size)
-  : Output_Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method marks the Channel as having failed and
-// deactivates the ACE_Message_Queue (to wake up the thread blocked on
-// <dequeue_head> in svc()).  Thr_Output_Handler::handle_close () will
-// eventually try to reconnect...
-
-int 
-Thr_Output_Channel::handle_input (ACE_HANDLE h)
-{
-  this->Output_Channel::handle_input (h);
-  ACE_Service_Config::reactor ()->remove_handler (h,
-					   ACE_Event_Handler::RWE_MASK
-					   | ACE_Event_Handler::DONT_CALL);
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Output_Channel object and spawn a new
-// thread.
-
-int 
-Thr_Output_Channel::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Peer has shut down unexpectedly).
-  if (ACE_Service_Config::reactor ()->register_handler (this,
-						 ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// ACE_Queue up a message for transmission (must not block since all
-// Input_Channels are single-threaded).
-
-int 
-Thr_Output_Channel::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit messages to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Output_Channel::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Output_Channel's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; )
-	if (this->send_peer (mb) == -1)
-	  ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-
-	ACE_ASSERT (errno == ESHUTDOWN);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) shutting down threaded Output_Channel %d on handle %d\n", 
-		   this->id (), this->get_handle ()));
-
-	this->peer ().close ();
-
-	for (this->timeout (1);
-	     // Default is to reconnect synchronously.
-	     this->connector_->initiate_connection (this) == -1; )
-	  {
-	    ACE_Time_Value tv (this->timeout ());
-	    ACE_ERROR ((LM_ERROR, 
-			"(%t) reattempting connection, sec = %d\n", 
-			tv.sec ()));
-	    ACE_OS::sleep (tv);
-	  }
-    }
-
-  return 0;
-}
-
-Thr_Input_Channel::Thr_Input_Channel (ROUTING_TABLE *rt,
-				      Channel_Connector *cc,
-				      ACE_Thread_Manager *thr_mgr,
-				      int socket_queue_size)
-  : Input_Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-}
-
-int 
-Thr_Input_Channel::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive messages from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Input_Channel::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Input_Channel's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes
-      // messages for one connection it is OK to block on input and
-      // output.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Input_Channel %d on handle %d\n", 
-		 this->id (), 
-		 this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->connector_->initiate_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_Channel.h b/apps/Gateway/Gateway/Thr_Channel.h
deleted file mode 100644
index a1dc91b1619..00000000000
--- a/apps/Gateway/Gateway/Thr_Channel.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_Channel.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_CHANNEL)
-#define _THR_CHANNEL
-
-#include "Channel.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Output_Channel : public Output_Channel
-  // = TITLE
-  //    Runs each Output Channel in a separate thread.
-{
-public:
-  Thr_Output_Channel (ROUTING_TABLE *, 
-		      Channel_Connector *, 
-		      ACE_Thread_Manager *,
-		      int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the threaded Output_Channel object and spawn a new
-  // thread.
-
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Input_Channel : public Input_Channel
-  // = TITLE
-  //    Runs each Input Channel in a separate thread.
-{
-public:
-  Thr_Input_Channel (ROUTING_TABLE *, 
-		     Channel_Connector *, 
-		     ACE_Thread_Manager *,
-		     int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_CHANNEL */
diff --git a/apps/Gateway/Gateway/Thr_IO_Handler.cpp b/apps/Gateway/Gateway/Thr_IO_Handler.cpp
deleted file mode 100644
index 109cfad9c3f..00000000000
--- a/apps/Gateway/Gateway/Thr_IO_Handler.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "Thr_IO_Handler.h"
-// $Id$
-
-#include "IO_Handler_Connector.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Consumer_Handler::Thr_Consumer_Handler (Consumer_Map *consumer_map,
-					    IO_Handler_Connector *ioc,
-					    ACE_Thread_Manager *thr_mgr,
-					    int socket_queue_size)
-  : Consumer_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method marks the IO_Handler as having failed and
-// deactivates the ACE_Message_Queue (to wake up the thread blocked on
-// <dequeue_head> in svc()).  Thr_Output_Handler::handle_close () will
-// eventually try to reconnect...
-
-int 
-Thr_Consumer_Handler::handle_input (ACE_HANDLE h)
-{
-  this->Consumer_Handler::handle_input (h);
-  ACE_Service_Config::reactor ()->remove_handler (h,
-					   ACE_Event_Handler::RWE_MASK
-					   | ACE_Event_Handler::DONT_CALL);
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Consumer_Handler object and spawn a new
-// thread.
-
-int 
-Thr_Consumer_Handler::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Peer has shut down unexpectedly).
-  if (ACE_Service_Config::reactor ()->register_handler (this,
-						 ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// ACE_Queue up a message for transmission (must not block since all
-// Supplier_Handlers are single-threaded).
-
-int 
-Thr_Consumer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit messages to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Consumer_Handler::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Consumer_Handler's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; )
-	if (this->send (mb) == -1)
-	  ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-
-	ACE_ASSERT (errno == ESHUTDOWN);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) shutting down threaded Consumer_Handler %d on handle %d\n", 
-		   this->id (), this->get_handle ()));
-
-	this->peer ().close ();
-
-	for (this->timeout (1);
-	     // Default is to reconnect synchronously.
-	     this->connector_->initiate_connection (this) == -1; )
-	  {
-	    ACE_Time_Value tv (this->timeout ());
-	    ACE_ERROR ((LM_ERROR, 
-			"(%t) reattempting connection, sec = %d\n", 
-			tv.sec ()));
-	    ACE_OS::sleep (tv);
-	  }
-    }
-
-  return 0;
-}
-
-Thr_Supplier_Handler::Thr_Supplier_Handler (Consumer_Map *consumer_map,
-					    IO_Handler_Connector *ioc,
-					    ACE_Thread_Manager *thr_mgr,
-					    int socket_queue_size)
-  : Supplier_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-}
-
-int 
-Thr_Supplier_Handler::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive messages from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Supplier_Handler::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Supplier_Handler's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes
-      // messages for one connection it is OK to block on input and
-      // output.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Supplier_Handler %d on handle %d\n", 
-		 this->id (), 
-		 this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->connector_->initiate_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_IO_Handler.h b/apps/Gateway/Gateway/Thr_IO_Handler.h
deleted file mode 100644
index ee056b35361..00000000000
--- a/apps/Gateway/Gateway/Thr_IO_Handler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_IO_Handler.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_IO_HANDLER)
-#define _THR_IO_HANDLER
-
-#include "IO_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Consumer_Handler : public Consumer_Handler
-  // = TITLE
-  //    Runs each Output IO_Handler in a separate thread.
-{
-public:
-  Thr_Consumer_Handler (Consumer_Map *, 
-			IO_Handler_Connector *, 
-			ACE_Thread_Manager *,
-			int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the threaded Consumer_Handler object and spawn a new
-  // thread.
-
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Supplier_Handler : public Supplier_Handler
-  // = TITLE
-  //    Runs each Input IO_Handler in a separate thread.
-{
-public:
-  Thr_Supplier_Handler (Consumer_Map *, 
-			IO_Handler_Connector *, 
-			ACE_Thread_Manager *,
-			int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_IO_HANDLER */
diff --git a/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp b/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp
deleted file mode 100644
index f316e4e82bf..00000000000
--- a/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// $Id$
-
-#include "Event_Channel.h"
-#include "Thr_Proxy_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Consumer_Proxy::Thr_Consumer_Proxy (ACE_Event_Channel &ec, 
-					const ACE_INET_Addr &remote_addr,
-					const ACE_INET_Addr &local_addr,
-					ACE_INT32 conn_id)
-  : Consumer_Proxy (ec, remote_addr, local_addr, conn_id)
-{
-}
-
-// This method should be called only when the Consumer shuts down
-// unexpectedly.  This method marks the Proxy_Handler as having failed
-// and deactivates the ACE_Message_Queue (to wake up the thread
-// blocked on <dequeue_head> in svc()).
-// Thr_Output_Handler::handle_close () will eventually try to
-// reconnect...
-
-int 
-Thr_Consumer_Proxy::handle_input (ACE_HANDLE h)
-{
-  // Call down to the <Consumer_Proxy> to handle this first.
-  this->Consumer_Proxy::handle_input (h);
-
-  ACE_Service_Config::reactor ()->remove_handler 
-    (h, ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL);
-
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Consumer_Proxy object and spawn a new
-// thread.
-
-int 
-Thr_Consumer_Proxy::open (void *)
-{
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call back to the <Event_Channel> to complete our initialization.
-  else if (this->event_channel_.complete_proxy_connection (this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "complete_proxy_connection"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Consumer has shut down unexpectedly).
-  else if (ACE_Service_Config::reactor ()->register_handler 
-      (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  else if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // events to Consumers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Queue up an event for transmission (must not block since
-// Supplier_Proxys may be single-threaded).
-
-int 
-Thr_Consumer_Proxy::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail 
-    (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit events to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Consumer_Proxy::svc (void)
-{
-
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) connected! Thr_Consumer_Proxy's handle = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; 
-	   )
-	{
-	  if (this->send (mb) == -1)
-	    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-	}
-
-      ACE_ASSERT (errno == ESHUTDOWN);
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Consumer_Proxy %d on handle %d\n", 
-		  this->id (), this->get_handle ()));
-
-      this->peer ().close ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->event_channel_.initiate_proxy_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", 
-		      tv.sec ()));
-
-	  ACE_OS::sleep (tv);
-	}
-    }
-
-  return 0;
-}
-
-Thr_Supplier_Proxy::Thr_Supplier_Proxy (ACE_Event_Channel &ec, 
-					const ACE_INET_Addr &remote_addr,
-					const ACE_INET_Addr &local_addr,
-					ACE_INT32 conn_id)
-  : Supplier_Proxy (ec, remote_addr, local_addr, conn_id)
-{
-}
-
-int 
-Thr_Supplier_Proxy::open (void *)
-{
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call back to the <Event_Channel> to complete our initialization.
-  else if (this->event_channel_.complete_proxy_connection (this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "complete_proxy_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  else if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // events to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive events from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Supplier_Proxy::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) connected! Thr_Supplier_Proxy's handle = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes events
-      // for one connection it is OK to call down to the
-      // <Supplier_Proxy::handle_input> method, which blocks on input.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Supplier_Proxy %d on handle %d\n", 
-		 this->id (), this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->event_channel_.initiate_proxy_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", 
-		      tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_Proxy_Handler.h b/apps/Gateway/Gateway/Thr_Proxy_Handler.h
deleted file mode 100644
index 275bc87b320..00000000000
--- a/apps/Gateway/Gateway/Thr_Proxy_Handler.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_Proxy_Handler.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_IO_HANDLER)
-#define _THR_IO_HANDLER
-
-#include "Proxy_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Consumer_Proxy : public Consumer_Proxy
-  // = TITLE
-  //    Runs each Output Proxy_Handler in a separate thread.
-{
-public:
-  Thr_Consumer_Proxy (ACE_Event_Channel &, 
-		      const ACE_INET_Addr &remote_addr,
-		      const ACE_INET_Addr &local_addr,
-		      ACE_INT32 conn_id);
-
-  virtual int open (void *);
-  // Initialize the threaded Consumer_Proxy object and spawn a new
-  // thread.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-protected:
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Supplier_Proxy : public Supplier_Proxy
-  // = TITLE
-  //    Runs each Input Proxy_Handler in a separate thread.
-{
-public:
-  Thr_Supplier_Proxy (ACE_Event_Channel &, 
-		      const ACE_INET_Addr &remote_addr,
-		      const ACE_INET_Addr &local_addr,
-		      ACE_INT32 conn_id);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-protected:
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_IO_HANDLER */
diff --git a/apps/Gateway/Gateway/cc_config b/apps/Gateway/Gateway/cc_config
deleted file mode 100644
index 96f9ebdedd7..00000000000
--- a/apps/Gateway/Gateway/cc_config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Conn ID  Hostname     Remote Port  Direction  Max Retry Delay  Local Port
-# -------  --------	----         ---------  ---------------  ----------
-   1       tango.cs	10004	     I          32		 20000
-#  2       tango.cs	10004	     O          32               
-   3       merengue.cs	10004	     O          32		 20001
-#  4       mambo.cs	10004	     O          32		 20000
-#  5       lambada.cs	10004	     O          32		 20000
-#  6       tango.cs	10004	     O          32		 20000
-#  7       tango.cs	5001	     I          32               
-#  8       tango.cs	5002	     O          32               
diff --git a/apps/Gateway/Gateway/rt_config b/apps/Gateway/Gateway/rt_config
deleted file mode 100644
index e951a0f09be..00000000000
--- a/apps/Gateway/Gateway/rt_config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Conn ID  Logical ID  Payload  Destinations
-# -------  ----------  -------  ------------  
-# 1        1           0	3,4,5
-  1        1           0	3
-  3        1           0	3           
-#  4        1           0	4
-#  5	   1	       0	5
diff --git a/apps/Gateway/Peer/Event.h b/apps/Gateway/Peer/Event.h
deleted file mode 100644
index 5e288edf910..00000000000
--- a/apps/Gateway/Peer/Event.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Event.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (EVENT)
-#define EVENT
-
-#include "ace/OS.h"
-
-// This is the unique connection identifier that denotes a particular
-// Proxy_Handler in the Gateway.
-typedef ACE_INT32 ACE_INT32;
-
-class Event_Key
-  // = TITLE
-  //     Address used to identify the source/destination of an event.
-  //
-  // = DESCRIPTION
-  //     This is really a "virtual forwarding address" thatis used to
-  //     decouple the filtering and forwarding logic of the Event
-  //     Channel from the format of the data.
-{
-public:
-  Event_Key (ACE_INT32 cid = -1, 
-	      u_char sid = 0, 
-	      u_char type = 0)
-    : conn_id_ (cid), 
-      supplier_id_ (sid), 
-      type_ (type) {}
-
-  int operator== (const Event_Key &event_addr) const
-  {
-    return this->conn_id_ == event_addr.conn_id_ 
-      && this->supplier_id_ == event_addr.supplier_id_
-      && this->type_ == event_addr.type_;
-  }
-
-  ACE_INT32 conn_id_;
-  // Unique connection identifier that denotes a particular
-  // Proxy_Handler.
-
-  ACE_INT32 supplier_id_;
-  // Logical ID.
-
-  ACE_INT32 type_;
-  // Event type.
-};
-
-class Event_Header
-  // = TITLE
-  //     Fixed sized header.
-  //
-  // = DESCRIPTION
-  //     This is designed to have a sizeof (16) to avoid alignment
-  //     problems on most platforms.
-{
-public:
-  typedef ACE_INT32 SUPPLIER_ID;
-  // Type used to forward events from gatewayd.
-
-  enum
-  {
-    INVALID_ID = -1 // No peer can validly use this number.
-  };
-
-  void decode (void)
-    {
-      this->len_ = ntohl (this->len_);
-      this->supplier_id_ = ntohl (this->supplier_id_);
-      this->type_ = ntohl (this->type_);
-      this->priority_ = ntohl (this->priority_);
-    }
-  // Decode from network byte order to host byte order.
-
-  void encode (void)
-    {
-      this->len_ = htonl (this->len_);
-      this->supplier_id_ = htonl (this->supplier_id_);
-      this->type_ = htonl (this->type_);
-      this->priority_ = htonl (this->priority_);
-    }
-  // Encode from host byte order to network byte order.
-
-  size_t len_;
-  // Length of the data_ payload, in bytes.
-
-  SUPPLIER_ID supplier_id_;
-  // Source ID.
-
-  ACE_INT32 type_;
-  // Event type.
-
-  ACE_INT32 priority_;
-  // Event priority.
-};
-
-class Event
-  // = TITLE
-  //    Variable-sized event (data_ may be variable-sized between
-  //    0 and MAX_PAYLOAD_SIZE).
-{
-public:
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-  // The maximum size of an Event.
-
-  Event_Header header_;
-  // Event header.
-
-  char data_[MAX_PAYLOAD_SIZE];
-  // Event data.
-};
-
-#endif /* EVENT */
diff --git a/apps/Gateway/Peer/Gateway_Handler.cpp b/apps/Gateway/Peer/Gateway_Handler.cpp
deleted file mode 100644
index cfc9a7dad6f..00000000000
--- a/apps/Gateway/Peer/Gateway_Handler.cpp
+++ /dev/null
@@ -1,652 +0,0 @@
-#include "ace/Get_Opt.h"
-// $Id$
-
-
-#include "Gateway_Handler.h"
-
-Gateway_Handler::Gateway_Handler (ACE_Thread_Manager *)
-  : routing_id_ (0),
-    msg_frag_ (0),
-    total_bytes_ (0)
-{
-  this->msg_queue ()->high_water_mark (Gateway_Handler::QUEUE_SIZE);
-}
-
-int
-Gateway_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) %S\n", signum));
-
-  // Shut down the main event loop.
-  ACE_Service_Config::end_reactor_event_loop ();
-  return 0;
-}
-
-// Cache a binding to the HANDLER_MAP.
-
-void
-Gateway_Handler::map (HANDLER_MAP *m)
-{
-  this->map_ = m;
-}
-
-// Upcall from the ACE_Acceptor::handle_input() that turns control
-// over to our application-specific Gateway handler.
-
-int
-Gateway_Handler::open (void *a)
-{
-  ACE_DEBUG ((LM_DEBUG, "Gateway handler's fd = %d\n", 
-	     this->peer ().get_handle ()));
-
-  // Call down to the base class to activate and register this
-  // handler.
-  if (this->inherited::open (a) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "enable"), -1);    
-
-  Gateway_Handler *this_ = this;
-
-  // Add ourselves to the map so we can be removed later on.
-  if (this->map_->bind (this->get_handle (), this_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "bind"), -1);    
-
-  char *to = ACE_OS::getenv ("TIMEOUT");
-  int timeout = to == 0 ? 100000 : ACE_OS::atoi (to);
-
-  // Schedule the time between disconnects.  This should really be a
-  // "tunable" parameter.
-  if (ACE_Service_Config::reactor ()->schedule_timer (this, 0, timeout) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "schedule_timer"));
-
-  // If there are messages left in the queue, make sure we 
-  // enable the ACE_Reactor appropriately to get them sent out.
-  if (this->msg_queue ()->is_empty () == 0
-      && ACE_Service_Config::reactor ()->schedule_wakeup (this, 
-							  ACE_Event_Handler::WRITE_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_wakeup"), -1);
-
-  // First action is to wait to be notified of our routing id.
-  this->do_action_ = &Gateway_Handler::await_route_id;
-  return 0;
-}
-
-// Read messages from stdin and send them to the gatewayd.
-
-int
-Gateway_Handler::xmit_stdin (void)
-{
-  if (this->routing_id_ != -1)
-    {
-      ssize_t n;
-      ACE_Message_Block *mb;
-
-      ACE_NEW_RETURN (mb, 
-		      ACE_Message_Block (sizeof (Event)),
-		      -1);
-
-      Event *peer_msg = (Event *) mb->rd_ptr ();
-      peer_msg->header_.routing_id_ = this->routing_id_;
-
-      n = ACE_OS::read (ACE_STDIN, peer_msg->buf_, sizeof peer_msg->buf_);
-
-      switch (n)
-	{
-	case 0:
-	  ACE_DEBUG ((LM_DEBUG, "stdin closing down\n"));
-
-	  // Take stdin out of the ACE_Reactor so we stop trying to
-	  // send messages.
-	  if (ACE_Service_Config::reactor ()->remove_handler 
-	      (0, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n", "remove_handler"));
-	  delete mb;
-	  break;
-	case -1:
-	  delete mb;
-	  ACE_ERROR ((LM_ERROR, "%p\n", "read"));
-	  break;
-	default:
-	  peer_msg->header_.len_ = htonl (n);
-	  mb->wr_ptr (sizeof (Peer_Header) + n);
-
-	  if (this->put (mb) == -1)
-	    {
-	      if (errno == EWOULDBLOCK) // The queue has filled up!
-		ACE_ERROR ((LM_ERROR, "%p\n", 
-			   "gateway is flow controlled, so we're dropping messages"));
-	      else
-		ACE_ERROR ((LM_ERROR, "%p\n", "transmission failure in xmit_stdin"));
-	      
-	      // Caller is responsible for freeing a ACE_Message_Block
-	      // if failures occur.
-	      delete mb;
-	    }
-	}
-    }
-  return 0;
-}
-
-// Perform a non-blocking put() of message MB.  If we are unable to
-// send the entire message  the remainder is re-Taskd at the *front* of
-// the Message_List.
-
-int
-Gateway_Handler::nonblk_put (ACE_Message_Block *mb)
-{
-  // Try to send the message.  If we don't send it all (e.g., due to
-  // flow control), then re-ACE_Task the remainder at the head of the
-  // Message_List and ask the ACE_Reactor to inform us (via
-  // handle_output()) when it is possible to try again.
-
-  ssize_t n;
-
-  if ((n = this->send_peer (mb)) == -1)
-    return -1;
-  else if (errno == EWOULDBLOCK) // Didn't manage to send everything.
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "queueing activated on handle %d to routing id %d\n",
-		 this->get_handle (), this->routing_id_));
-
-      // ACE_Queue in *front* of the list to preserve order.
-      if (this->msg_queue ()->enqueue_head 
-	  (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "enqueue_head"), -1);
-      
-      // Tell ACE_Reactor to call us back when we can send again.
-      if (ACE_Service_Config::reactor ()->schedule_wakeup
-	  (this, ACE_Event_Handler::WRITE_MASK) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_wakeup"), -1);
-      return 0;
-    }
-  else
-    return n;
-}
-
-// Finish sending a message when flow control conditions abate.  This
-// method is automatically called by the ACE_Reactor.
-
-int 
-Gateway_Handler::handle_output (ACE_HANDLE)
-{
-  ACE_Message_Block *mb = 0;
-  
-  ACE_DEBUG ((LM_DEBUG, "in handle_output\n"));
-  // The list had better not be empty, otherwise there's a bug!
-
-  if (this->msg_queue ()->dequeue_head 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1)
-    {
-      switch (this->nonblk_put (mb))
-	{
-	case 0: 	  // Partial send.
-	  ACE_ASSERT (errno == EWOULDBLOCK);
-	  // Didn't write everything this time, come back later...
-	  break;
-
-	case -1:
-	  // Caller is responsible for freeing a ACE_Message_Block if
-	  // failures occur.
-	  delete mb;
-	  ACE_ERROR ((LM_ERROR, "%p\n", 
-		      "transmission failure in handle_output"));
-
-	  /* FALLTHROUGH */
-	default: // Sent the whole thing.
-	  
-	  // If we succeed in writing the entire message (or we did
-	  // not fail due to EWOULDBLOCK) then check if there are more
-	  // messages on the Message_List.  If there aren't, tell the
-	  // ACE_Reactor not to notify us anymore (at least until
-	  // there are new messages queued up).
-
-	  if (this->msg_queue ()->is_empty ())
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "queue now empty on handle %d to routing id %d\n",
-			  this->get_handle (), 
-			  this->routing_id_));
-
-	      if (ACE_Service_Config::reactor ()->cancel_wakeup
-		  (this, ACE_Event_Handler::WRITE_MASK) == -1)
-		ACE_ERROR ((LM_ERROR, "%p\n", "cancel_wakeup"));
-	    }
-	}
-    }
-  else 
-    ACE_ERROR ((LM_ERROR, "%p\n", "dequeue_head"));
-  return 0;      
-}
-
-// Send a message to a peer (may ACE_Task if necessary).
-
-int 
-Gateway_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  if (this->msg_queue ()->is_empty ())
-    // Try to send the message *without* blocking!
-    return this->nonblk_put (mb); 
-  else
-    // If we have queued up messages due to flow control then just
-    // enqueue and return.
-    return this->msg_queue ()->enqueue_tail 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero); 
-}
-
-// Send an Peer message to gatewayd.
-
-int
-Gateway_Handler::send_peer (ACE_Message_Block *mb)
-{
-  ssize_t n;	
-  size_t len = mb->length ();
-
-  if ((n = this->peer ().send (mb->rd_ptr (), len)) <= 0)
-    return errno == EWOULDBLOCK ? 0 : n;
-  else if (n < (ssize_t) len)
-    {
-      // Re-adjust pointer to skip over the part we did send.
-      mb->rd_ptr (n);
-      this->total_bytes_ += n;
-    }
-  else /* if (n == length) */
-    {
-      // The whole message is sent, we can now safely deallocate the
-      // buffer.  Note that this should decrement a reference count...
-      this->total_bytes_ += n;
-      delete mb;
-      errno = 0;
-    }
-  ACE_DEBUG ((LM_DEBUG, "sent %d bytes, total bytes sent = %d\n",
-	     n, this->total_bytes_));
-  return n;
-}
-
-// Receive an Peer message from gatewayd.  Handles fragmentation.
-
-int
-Gateway_Handler::recv_peer (ACE_Message_Block *&mb)
-{ 
-  Event *peer_msg;
-  size_t       len;
-  ssize_t      n;
-  size_t       offset = 0;
-
-  if (this->msg_frag_ == 0)
-    {
-      ACE_NEW_RETURN (this->msg_frag_,
-		      ACE_Message_Block (sizeof (Event)),
-		      -1);
-
-      // No existing fragment...
-      if (this->msg_frag_ == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "out of memory\n"), -1);
-
-      peer_msg = (Event *) this->msg_frag_->rd_ptr ();
-
-      switch (n = this->peer ().recv (peer_msg, sizeof (Peer_Header)))
-	{
-	case sizeof (Peer_Header):
-	  len = ntohl (peer_msg->header_.len_);
-	  if (len <= sizeof peer_msg->buf_)
-	    {
-	      this->msg_frag_->wr_ptr (sizeof (Peer_Header));
-	      break; // The message is within the maximum size range.
-	    }
-	  else
-	    ACE_ERROR ((LM_ERROR, "message too long = %d\n", len));
-	  /* FALLTHROUGH */
-	default:
-	  ACE_ERROR ((LM_ERROR, "invalid length = %d\n", n));
-	  n = -1;
-	  /* FALLTHROUGH */
-	case -1:
-	  /* FALLTHROUGH */
-	case 0:
-	  // Make sure to free up memory on error returns.
-	  delete this->msg_frag_;
-	  this->msg_frag_ = 0;
-	  return n;
-	}
-    }
-  else
-    {
-      offset = this->msg_frag_->length () - sizeof (Peer_Header);
-      len    = peer_msg->header_.len_ - offset;
-    }
-
-  switch (n = this->peer ().recv (peer_msg->buf_ + offset, len))
-    {
-    case -1:
-      if (errno == EWOULDBLOCK) 
-	{
-          // This shouldn't happen since the ACE_Reactor
-	  // just triggered us to handle pending I/O!
-	  ACE_DEBUG ((LM_DEBUG, "unexpected recv failure\n"));
-	  // Since ACE_DEBUG might change errno, we need to reset it
-	  // here.
-	  errno = EWOULDBLOCK;
-	  return -1;
-        }
-      else
-	/* FALLTHROUGH */;
-
-    case 0: // EOF.
-      delete this->msg_frag_;
-      this->msg_frag_ = 0;
-      return n;
-
-    default:
-      if (n != (ssize_t) len)
-	// Re-adjust pointer to skip over the part we've read.
-	{
-	  this->msg_frag_->wr_ptr (n);
-	  errno = EWOULDBLOCK;
-	  // Inform caller that we didn't get the whole message.
-	  return -1; 
-	}
-      else
-	{
-	  // Set the write pointer at 1 past the end of the message.
-	  this->msg_frag_->wr_ptr (n);
-
-	  // Set the read pointer to the beginning of the message.
-	  this->msg_frag_->rd_ptr (this->msg_frag_->base ());
-
-	  mb = this->msg_frag_;
-
-	  // Reset the pointer to indicate we've got an entire
-	  // message.
-	  this->msg_frag_ = 0; 
-	}
-      return n;
-    }
-}
-
-// Receive various types of input (e.g., Peer message from the
-// gatewayd, as well as stdio).
-
-int 
-Gateway_Handler::handle_input (ACE_HANDLE sd)
-{
-  ACE_DEBUG ((LM_DEBUG, "in handle_input, sd = %d\n", sd));
-  if (sd == ACE_STDIN) // Handle message from stdin.
-    return this->xmit_stdin ();
-  else
-    // Perform the appropriate action depending on the state we are
-    // in.
-    return (this->*do_action_) ();
-}
-
-// Action that receives the route id.  
-
-int
-Gateway_Handler::await_route_id (void)
-{
-  ssize_t n = this->peer ().recv (&this->routing_id_, 
-				  sizeof this->routing_id_);
-
-  if (n != sizeof this->routing_id_)
-    {
-      if (n == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   "gatewayd has closed down unexpectedly\n"), -1);
-      else
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   "%p, bytes received on handle %d = %d\n", 
-			  "recv", this->get_handle (), n), -1);
-    }
-  else
-    ACE_DEBUG ((LM_DEBUG, "assigned routing id %d\n", 
-		this->routing_id_));
-
-  // Transition to the action that waits for Peer messages.
-  this->do_action_ = &Gateway_Handler::await_messages;
-
-  // Reset standard input.
-  ACE_OS::rewind (stdin);
-
-  // Register this handler to receive test messages on stdin.
-  if (ACE_Service_Config::reactor ()->register_handler 
-      (ACE_STDIN, this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
-  return 0;
-}
-
-// Action that receives messages.
-
-int
-Gateway_Handler::await_messages (void)
-{
-  ACE_Message_Block *mb = 0;
-  ssize_t n = this->recv_peer (mb);
-
-  switch (n)
-    {
-    case 0:
-      ACE_ERROR_RETURN ((LM_ERROR, "gatewayd has closed down\n"), -1);
-      /* NOTREACHED */
-    case -1:
-      if (errno == EWOULDBLOCK)
-	// A short-read, we'll come back and finish it up later on!
-	return 0;
-      else
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "recv_peer"), -1);
-      /* NOTREACHED */
-    default:
-      {
-	// We got a valid message, so let's process it now!  At the
-	// moment, we just print out the message contents...
-
-	Event  *peer_msg = (Event *) mb->rd_ptr ();
-	this->total_bytes_ += mb->length ();
-
-#if defined (VERBOSE)
-	ACE_DEBUG ((LM_DEBUG, 
-		    "route id = %d, len = %d, payload = %*s",
-		   peer_msg->header_.routing_id_, peer_msg->header_.len_,
-		   peer_msg->header_.len_, peer_msg->buf_));
-#else
-	ACE_DEBUG ((LM_DEBUG, 
-		    "route id = %d, cur len = %d, total len = %d\n",
-		    peer_msg->header_.routing_id_, 
-		    peer_msg->header_.len_, 
-		    this->total_bytes_));
-#endif
-	delete mb;
-	return 0;
-      }
-    }
-}
-
-// Periodically send messages via ACE_Reactor timer mechanism.
-
-int
-Gateway_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  // Skip over deactivated descriptors.
-  if (this->get_handle () != -1)
-    {
-      // Unbind ourselves from the map.
-      if (this->map_->unbind (this->get_handle ()) == -1)
-	ACE_ERROR ((LM_ERROR, "%p\n", "unbind"));
-
-      // Shut down the handler.
-      this->handle_close ();
-    }
-  return 0;
-}
-
-// Handle shutdown of the Gateway_Handler object.
-
-int
-Gateway_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "shutting down Gateway_Handler on handle %d\n", 
-		 this->get_handle ()));
-
-      // Explicitly remove ourselves for handle 0 (the ACE_Reactor
-      // removes this->handle (), note that
-      // ACE_Event_Handler::DONT_CALL instructs the ACE_Reactor *not*
-      // to call this->handle_close(), which would otherwise lead to
-      // recursion!).
-      if (ACE_Service_Config::reactor ()->remove_handler 
-	  (0, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK) == -1)
-	ACE_ERROR ((LM_ERROR, "handle = %d: %p\n", 
-		   0, "remove_handler"));
-
-      // Deregister this handler with the ACE_Reactor.
-      if (ACE_Service_Config::reactor ()->remove_handler 
-	  (this, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::RWE_MASK) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "handle = %d: %p\n", 
-			  this->get_handle (), "remove_handler"), -1);
-
-      // Close down the peer.
-      this->peer ().close ();
-    }
-  return 0;
-}
-
-Gateway_Acceptor::Gateway_Acceptor (Gateway_Handler *handler)
-  : gateway_handler_ (handler)
-{
-  this->gateway_handler_->map (&this->map_);
-}
-
-// Note how this method just passes back the pre-allocated
-// Gateway_Handler instead of having the ACE_Acceptor allocate a new
-// one each time!
-
-Gateway_Handler *
-Gateway_Acceptor::make_svc_handler (void)
-{
-  return this->gateway_handler_;
-}
-
-int 
-Gateway_Acceptor::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "signal %S occurred\n", signum));
-  return 0;
-}
-
-/* Returns information on the currently active service. */
-
-int
-Gateway_Acceptor::info (char **strp, size_t length) const
-{
-  char buf[BUFSIZ];
-  char addr_str[BUFSIZ];
-
-  ACE_INET_Addr addr;
-
-  if (this->acceptor ().get_local_addr (addr) == -1)
-    return -1;
-  else if (addr.addr_to_string (addr_str, sizeof addr) == -1)
-    return -1;
-
-  ACE_OS::sprintf (buf, "%s\t %s/%s %s",
-	     "Gateway peer daemon", addr_str, "tcp",
-	     "# IRIDIUM SRP traffic generator and data sink\n");
-
-  if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
-    return -1;
-  else
-    ACE_OS::strncpy (*strp, buf, length);
-  return ACE_OS::strlen (buf);
-}
-
-// Hook called by the explicit dynamic linking facility to terminate
-// the peer.
-
-int
-Gateway_Acceptor::fini (void)
-{
-  HANDLER_ITERATOR mi (this->map_);
-  
-  for (MAP_ENTRY *me = 0;
-       mi.next (me) != 0; 
-       mi.advance ())
-    {
-      if (me->int_id_->get_handle () != -1)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "closing down handle %d\n", 
-		      me->int_id_->get_handle ()));
-	  me->int_id_->handle_close ();
-	}
-      else
-	ACE_DEBUG ((LM_DEBUG, "already closed %d\n"));
-      me->int_id_->destroy (); // Will trigger a delete.
-    }
-
-  this->gateway_handler_->destroy (); // Will trigger a delete.
-  return inherited::fini ();
-}
-
-// Hook called by the explicit dynamic linking facility to initialize
-// the peer.
-
-int
-Gateway_Acceptor::init (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "dp:", 0);
-  ACE_INET_Addr addr;
-
-  for (int c; (c = get_opt ()) != -1; )
-    {
-      switch (c)
-	{
-	case 'p': 
-	  addr.set (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'd':
-	  break;
-	default:
-	  break;
-	}
-    }
-
-  if (ACE_Service_Config::reactor ()->register_handler (SIGPIPE, this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
-    
-  if (this->open (addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Service_Config::reactor ()->register_handler 
-	   (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-		       "registering service with ACE_Reactor\n"), -1);
-
-  ACE_Sig_Set sig_set;
-  sig_set.sig_add (SIGINT);
-  sig_set.sig_add (SIGQUIT);
-
-  // Register ourselves to receive SIGINT and SIGQUIT so we can shut
-  // down gracefully via signals.
-  
-  if (ACE_Service_Config::reactor ()->register_handler (sig_set, 
-						 this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-  return 0;
-}
-
-// Dynamically linked factory function that dynamically allocates a
-// new Gateway_Acceptor object.
-
-ACE_Service_Object *
-_alloc_peerd (void)
-{
-  // This function illustrates how we can associate a ACE_Svc_Handler
-  // with the ACE_Acceptor at initialization time.
-  Gateway_Handler *handler;
-  
-  ACE_NEW_RETURN (handler, Gateway_Handler, 0);
-  ACE_Service_Object *temp;
-  
-  ACE_NEW_RETURN (temp, Gateway_Acceptor (handler), 0);
-  return temp;
-}
diff --git a/apps/Gateway/Peer/Gateway_Handler.h b/apps/Gateway/Peer/Gateway_Handler.h
deleted file mode 100644
index 6dc4539e6b7..00000000000
--- a/apps/Gateway/Peer/Gateway_Handler.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-/* These Gateway handler classes process Peer messages sent from the
-   communication gateway daemon (gatewayd) to its various peers, e.g.,
-   CF and ETS, (represented collectively in this prototype as peerd).
-   .  These classes works as follows:
-   
-   1. Gateway_Acceptor creates a listener endpoint and waits passively
-      for gatewayd to connect with it.
-
-   2. When gatewayd connects, Gateway_Acceptor creates an
-      Gateway_Handler object that sends/receives messages from
-      gatewayd.
-
-   3. Gateway_Handler waits for gatewayd to inform it of its routing
-      ID, which is prepended to all outgoing messages send from peerd.
-
-   4. Once the routing ID is set, peerd periodically sends messages to
-      gatewayd.  Peerd also receives and "processes" messages
-      forwarded to it from gatewayd.  In this program, peerd
-      "processes" messages by writing them to stdout. */
-
-#if !defined (GATEWAY_HANDLER)
-#define GATEWAY_HANDLER
-
-#include "ace/Service_Config.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/INET_Addr.h"
-#include "ace/Map_Manager.h"
-#include "Peer_Message.h"
-
-// Forward declaration.
-class Gateway_Handler;
-
-// Maps a ACE_HANDLE onto a Gateway_Handler *.
-typedef ACE_Map_Manager <ACE_HANDLE, Gateway_Handler *, ACE_Null_Mutex> HANDLER_MAP;
-typedef ACE_Map_Iterator<ACE_HANDLE, Gateway_Handler *, ACE_Null_Mutex> HANDLER_ITERATOR;
-typedef ACE_Map_Entry <ACE_HANDLE, Gateway_Handler *> MAP_ENTRY;
-
-// Handle Peer messages arriving as events. 
-
-class Gateway_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-  Gateway_Handler (ACE_Thread_Manager * = 0);
-
-  virtual int open (void * = 0);
-  // Initialize the handler (called by ACE_Acceptor::handle_input())
-
-  virtual int handle_input (ACE_HANDLE);
-  // Receive and process peer messages.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
-  // Send a message to a gateway (may be queued if necessary).
-
-  virtual int handle_output (ACE_HANDLE);
-  // Finish sending a message when flow control conditions abate.
-
-  virtual int handle_timeout (const ACE_Time_Value &, 
-			      const void *arg);
-  // Periodically send messages via ACE_Reactor timer mechanism.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, 
-			    ACE_Reactor_Mask = ACE_Event_Handler::RWE_MASK);
-  // Perform object termination.
-
-  void map (HANDLER_MAP *);
-  // Cache a binding to the HANDLER_MAP.
-
-protected:
-  typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> inherited;
-
-  // We'll allow up to 16 megabytes to be queued per-output
-  // channel!!!!  This is clearly a policy in search of refinement...
-  enum { QUEUE_SIZE = 1024 * 1024 * 16 };
-
-  int handle_signal (int signum, siginfo_t *, ucontext_t *);
-
-  Peer_Header::ROUTING_ID routing_id_;
-  // Routing ID of the peer (obtained from gatewayd).
-
-  virtual int nonblk_put (ACE_Message_Block *mb);
-  // Perform a non-blocking put().
-
-  virtual int recv_peer (ACE_Message_Block *&);
-  // Receive an Peer message from gatewayd.
-
-  virtual int send_peer (ACE_Message_Block *);
-  // Send an Peer message to gatewayd.
-
-  int xmit_stdin (void);
-  // Receive a message from stdin and send it to the gateway.
-
-  int (Gateway_Handler::*do_action_) (void);
-  // Pointer-to-member-function for the current action to run in this state.
-
-  int await_route_id (void);
-  // Action that receives the route id.  
-
-  int await_messages (void);
-  // Action that receives messages.
-
-  ACE_Message_Block *msg_frag_;
-  // Keep track of message fragment to handle non-blocking recv's from gateway.
-
-  size_t total_bytes_;
-  // The total number of bytes sent/received to the gateway.
-
-  HANDLER_MAP *map_;
-  // Maps the ACE_HANDLE onto the Gateway_Handler *.
-};
-
-// A factory class that accept connections from gatewayd and
-// dynamically creates a new Gateway_Handler object to do the dirty work.
-
-class Gateway_Acceptor : public ACE_Acceptor<Gateway_Handler, ACE_SOCK_ACCEPTOR>
-{
-public:  
-  // = Initialization methods, called when dynamically linked.
-  Gateway_Acceptor (Gateway_Handler *handler);
-  virtual int init (int argc, char *argv[]);
-  // Initialize the acceptor.
-
-  virtual int info (char **, size_t) const;
-  // Return info about this service.
-
-  virtual int fini (void);
-  // Perform termination.
-
-  virtual Gateway_Handler *make_svc_handler (void);
-  // Factory method that creates the Gateway_Handler once.
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
-  // Handle various signals (e.g., SIGPIPE)
-
-  HANDLER_MAP map_;
-  // Maps the ACE_HANDLE onto the Gateway_Handler *.
-  
-  Gateway_Handler *gateway_handler_;
-  // Pointer to memory allocated exactly once.
-
-  typedef ACE_Acceptor<Gateway_Handler, ACE_SOCK_ACCEPTOR> inherited;
-};
-
-// Factory function that allocates a new Peer daemon.
-extern "C" ACE_Service_Object *_alloc_peerd (void);
-
-#endif /* GATEWAY_HANDLER */
-
diff --git a/apps/Gateway/Peer/Peer_Message.h b/apps/Gateway/Peer/Peer_Message.h
deleted file mode 100644
index 67f57f148cb..00000000000
--- a/apps/Gateway/Peer/Peer_Message.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// Define the Peer message schema (this may change).
-
-#if !defined (PEER_MESSAGE)
-#define PEER_MESSAGE
-
-// Fixed sized header.
-
-class Peer_Header
-{
-public:
-// Type used to route messages from gatewayd.
-  typedef short ROUTING_ID;
-
-  enum
-  {
-    INVALID_ID = -1 // No peer may use this number.
-  };
-
-  // Source ID.
-  ROUTING_ID routing_id_;
-
-  // Length of the message in bytes.
-  size_t  len_;
-};
-
-// Variable-sized message (buf_ may be variable-sized between
-// 0 and MAX_PAYLOAD_SIZE).
-
-class Peer_Message
-{
-public:
-  // The maximum size of an Peer message (see Peer protocol specs for exact #).
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-
-  Peer_Header header_;
-
-  // Message payload
-  char buf_[MAX_PAYLOAD_SIZE];
-};
-
-#endif /* PEER_MESSAGE */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp
index d2264c7cefd..b50157121a2 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp
@@ -230,10 +230,10 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
   result = this->MAKE (data, size, obj);
   if (result == -1)
     {
-      if (size/1024 <= this->maxobjsize_)
-        cerr << "MAKE failed.  Bummer!" << endl;
-      else
+      if (obj)
         this->DROP_i (obj);
+      else
+        cerr << "MAKE failed.  Bummer!" << endl;
       return -1;
     }
 
@@ -268,6 +268,10 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
       return -1;
     }
 
+#ifdef ENTERA_VERBOSE_TRACE
+  cerr << "*** bound: " << key << endl;
+#endif
+
   this->waterlevel_ += size;
 
   // Acquire this one for the putter.
@@ -382,6 +386,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 #else
       // The above is a little tricky to implement.  Think about it
       // some more.
+      cerr << "*** " << size << " is too large to cache" << endl;
       obj = this->factory_->create (data, size);
       return -1;
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/FILE.cpp b/apps/JAWS/PROTOTYPE/JAWS/FILE.cpp
deleted file mode 100644
index 16a2e0e0efc..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/FILE.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "ace/OS.h"
-#include "ace/Synch.h"
-
-#include "JAWS/FILE.h"
-
-
-JAWS_FILE::JAWS_FILE (void)
-  : map_ (0)
-{
-}
-
-ACE_Mem_Map *
-JAWS_FILE::mem_map (int length,
-                    int prot,
-                    int share,
-                    void *addr,
-                    off_t offset,
-                    LPSECURITY_ATTRIBUTES sa) const
-{
-  JAWS_FILE *mutable_this = (JAWS_FILE *) this;
-  return mutable_this->mem_map (length, prot, share, addr, offset, sa);
-}
-
-ACE_Mem_Map *
-JAWS_FILE::mem_map (int length,
-                    int prot,
-                    int share,
-                    void *addr,
-                    off_t offset,
-                    LPSECURITY_ATTRIBUTES sa)
-{
-  if (this->map_ == 0)
-    {
-      ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_);
-
-      if (this->map_ == 0)
-        {
-          this->map_ = new ACE_Mem_Map;
-          if (this->map_ != 0)
-            {
-              int r = this->map_->map (this->get_handle (),
-                                       length, prot, share, addr, offset, sa);
-              if (r < 0)
-                {
-                  delete this->map_;
-                  this->map_ = 0;
-                }
-            }
-        }
-    }
-
-  return this->map_;
-
-}
-
-
-ACE_Mem_Map *
-JAWS_FILE::map (void) const
-{
-  return this->map_;
-}
diff --git a/apps/JAWS/PROTOTYPE/JAWS/FILE.h b/apps/JAWS/PROTOTYPE/JAWS/FILE.h
deleted file mode 100644
index 93ab721379f..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/FILE.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-/* -*- c++ -*- */
-
-#ifndef JAWS_FILE_H
-#define JAWS_FILE_H
-
-#include "ace/FILE_IO.h"
-#include "ace/Mem_Map.h"
-
-#include "JAWS/Export.h"
-
-class JAWS_Export JAWS_FILE : public ACE_FILE_IO
-//
-// Like ACE_FILE_IO, but support for ACE_Mem_Map;
-{
-public:
-
-  JAWS_FILE (void);
-
-  ACE_Mem_Map *mem_map (int length = -1,
-                        int prot = PROT_RDWR,
-                        int share = ACE_MAP_PRIVATE,
-                        void *addr = 0,
-                        off_t offset = 0,
-                        LPSECURITY_ATTRIBUTES sa = 0);
-  ACE_Mem_Map *mem_map (int length = -1,
-                        int prot = PROT_RDWR,
-                        int share = ACE_MAP_PRIVATE,
-                        void *addr = 0,
-                        off_t offset = 0,
-                        LPSECURITY_ATTRIBUTES sa = 0) const;
-
-  ACE_Mem_Map *map (void) const;
-
-private:
-
-  ACE_SYNCH_MUTEX lock_;
-  ACE_Mem_Map *map_;
-
-};
-
-#endif /* JAWS_FILE_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Filecache.cpp b/apps/JAWS/PROTOTYPE/JAWS/Filecache.cpp
deleted file mode 100644
index fc17424ba86..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Filecache.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-
-#include "JAWS/Filecache.h"
-#include "JAWS/Cache_List_T.h"
-
-void
-JAWS_Referenced_Filecache_Factory::destroy (JAWS_Cache_Object *object)
-{
-  JAWS_FILE *file = (JAWS_FILE *) object->data ();
-  file->close ();
-  if (file->map ())
-    file->map ()->close ();
-  delete file;
-  this->JAWS_Referenced_Cache_Object_Factory::destroy (object);
-}
-
-void
-JAWS_Counted_Filecache_Factory::destroy (JAWS_Cache_Object *object)
-{
-  JAWS_FILE *file = (JAWS_FILE *) object->data ();
-  file->close ();
-  if (file->map ())
-    file->map ()->close ();
-  delete file;
-  this->JAWS_Counted_Cache_Object_Factory::destroy (object);
-}
-
-JAWS_Cached_FILE::JAWS_Cached_FILE (const char *const &filename,
-                                    JAWS_Filecache_Proxy::Cache_Manager *cm)
-  : JAWS_Filecache_Proxy (filename, cm)
-{
-  ACE_HANDLE handle = ACE_INVALID_HANDLE;
-
-  if (this->data () != 0)
-    handle = ACE_OS::dup (this->data ()->get_handle ());
-
-  this->file_.set_handle (handle);
-}
-
-JAWS_Cached_FILE::JAWS_Cached_FILE (const char *const &filename,
-                                    JAWS_FILE *&file,
-                                    size_t size,
-                                    JAWS_Filecache_Proxy::Cache_Manager *cm)
-  : JAWS_Filecache_Proxy (filename, file, size, cm)
-{
-}
-
-JAWS_Cached_FILE::~JAWS_Cached_FILE (void)
-{
-  this->file_.close ();
-}
-
-ACE_FILE_IO *
-JAWS_Cached_FILE::file (void)
-{
-  return &(this->file_);
-}
-
-ACE_Mem_Map *
-JAWS_Cached_FILE::mmap (void)
-{
-  return this->data ()->mem_map ();
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class JAWS_Cache_List_Item<JAWS_Strdup_String,
-                                    JAWS_Referenced_Filecache_Factory,
-                                    JAWS_String_Hash_Functor,
-                                    JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List_Item<JAWS_Strdup_String,
-                                    JAWS_Counted_Filecache_Factory,
-                                    JAWS_String_Hash_Functor,
-                                    JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List<JAWS_Strdup_String,
-                               JAWS_Referenced_Filecache_Factory,
-                               JAWS_String_Hash_Functor,
-                               JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List<JAWS_Strdup_String,
-                               JAWS_Counted_Filecache_Factory,
-                               JAWS_String_Hash_Functor,
-                               JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Manager<JAWS_Strdup_String,
-                                  JAWS_Referenced_Filecache_Factory,
-                                  JAWS_String_Hash_Functor,
-                                  JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Manager<JAWS_Strdup_String,
-                                  JAWS_Counted_Filecache_Factory,
-                                  JAWS_String_Hash_Functor,
-                                  JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Proxy<char const *,
-                                JAWS_FILE,
-                                JAWS_Referenced_Filecache_Manager>;
-template class JAWS_Cache_Proxy<char const *,
-                                JAWS_FILE,
-                                JAWS_Counted_Filecache_Manager>;
-template class ACE_Singleton<JAWS_Referenced_Filecache_Manager,
-                             ACE_Thread_Mutex>;
-template class ACE_Singleton<JAWS_Counted_Filecache_Manager,
-                             ACE_Thread_Mutex>;
-template class ACE_Singleton<JAWS_Referenced_Filecache_Factory,
-                             ACE_Thread_Mutex>;
-template class ACE_Singleton<JAWS_Counted_Filecache_Factory, ACE_Thread_Mutex>;
-
-#endif
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Filecache.h b/apps/JAWS/PROTOTYPE/JAWS/Filecache.h
index c55fa498a7a..fbe1177bd68 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Filecache.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Filecache.h
@@ -4,70 +4,122 @@
 #ifndef JAWS_FILECACHE_H
 #define JAWS_FILECACHE_H
 
-#include "ace/OS.h"
-#include "ace/FILE_IO.h"
-
 #include "JAWS/Cache_Manager.h"
-#include "JAWS/FILE.h"
-#include "JAWS/Export.h"
 
-class JAWS_Export JAWS_Referenced_Filecache_Factory
+class ACE_Export JAWS_Referenced_Filecache_Factory
   : public JAWS_Referenced_Cache_Object_Factory
 {
 public:
 
-  virtual void destroy (JAWS_Cache_Object *);
+  virtual void destroy (ACE_Cache_Object *);
 
 };
 
-class JAWS_Export JAWS_Counted_Filecache_Factory
+class ACE_Export JAWS_Counted_Filecache_Factory
   : public JAWS_Counted_Cache_Object_Factory
 {
 public:
 
-  virtual void destroy (JAWS_Cache_Object *);
+  virtual void destroy (ACE_Cache_Object *);
 
 };
 
-typedef JAWS_Cache_Manager<JAWS_Strdup_String,
-                           JAWS_Referenced_Filecache_Factory,
-                           JAWS_String_Hash_Functor,
-                           JAWS_String_Equal_Functor>
+typedef ACE_Cache_Manager<ACE_Strdup_String,
+                          JAWS_Referenced_Filecache_Factory,
+                          ACE_String_Hash_Functor,
+                          ACE_String_Equal_Functor>
         JAWS_Referenced_Filecache_Manager;
 
-typedef JAWS_Cache_Manager<JAWS_Strdup_String,
-                           JAWS_Counted_Filecache_Factory,
-                           JAWS_String_Hash_Functor,
-                           JAWS_String_Equal_Functor>
+typedef ACE_Cache_Manager<ACE_Strdup_String,
+                          JAWS_Counted_Filecache_Factory,
+                          ACE_String_Hash_Functor,
+                          ACE_String_Equal_Functor>
         JAWS_Counted_Filecache_Manager;
 
-typedef JAWS_Referenced_Filecache_Manager JAWS_Filecache_Manager;
-
-typedef JAWS_Cache_Proxy<const char *,
-                         JAWS_FILE, JAWS_Filecache_Manager>
-        JAWS_Filecache_Proxy;
-
-class JAWS_Export JAWS_Cached_FILE : private JAWS_Filecache_Proxy
+class ACE_Export JAWS_Filecache_Manager
 {
 public:
 
-  JAWS_Cached_FILE (const char *const &filename,
-                    JAWS_Filecache_Proxy::Cache_Manager *cm = 0);
-  JAWS_Cached_FILE (const char *const &filename,
-                    JAWS_FILE *&file,
-                    size_t size,
-                    JAWS_Filecache_Proxy::Cache_Manager *cm = 0);
+  JAWS_Filecache_Manager (ACE_Allocator *alloc = 0,
+                          JAWS_Cache_Object_Factory *cof = 0,
+
+                          size_t hashsize = 2048,
+                          size_t maxsize = 65535,
+
+                          size_t maxobjsize = 256,
+                          size_t minobjsize = 0,
+
+                          size_t highwater = 100,
+                          size_t lowwater = 50,
+
+                          int timetolive = -1,
+
+                          int counted = 0
+                          );
+
+  int open (ACE_Allocator *alloc = 0,
+            JAWS_Cache_Object_Factory *cof = 0,
+
+            size_t hashsize = 1024,
+            size_t maxsize = 4096,
+
+            size_t maxobjsize = 5120,
+            size_t minobjsize = 0,
+
+            size_t highwater = 50,
+            size_t lowwater = 30,
+
+            int timetolive = -1,
+
+            int counted = 0
+            );
+
+  ~JAWS_Cache_Manager (void);
 
-  ~JAWS_Cached_FILE (void);
+  int close (void);
 
-  ACE_FILE_IO * file (void);
-  ACE_Mem_Map * mmap (void);
+  int GET (const char *const &key, JAWS_Cache_Object *&cobj);
+
+  int PUT (const char *const &key, const void *data, size_t size,
+           JAWS_Cache_Object *&obj);
+
+  int MAKE (const void *data, size_t size, JAWS_Cache_Object *&cobj);
+
+  int TAKE (JAWS_Cache_Object *const &cobj);
+
+  int DROP (JAWS_Cache_Object *&cobj);
+
+  int FLUSH (void);
+
+  enum { JAWS_REFERENCED_FILECACHE, JAWS_COUNTED_FILECACHE };
 
 private:
 
-  ACE_FILE_IO file_;
+  int type_;
+  JAWS_Referenced_Filecache_Manager rfm_;
+  JAWS_Counted_Filecache_Manager cfm_;
+};
+
+typedef ACE_Cache_Proxy<const char *,
+                        JAWS_Filecache_Object, JAWS_Filecache_Manager>
+        JAWS_Filecache_Proxy;
+
+
+class JAWS_Filecache : public JAWS_Filecache_Proxy
+{
+public:
+
+  HTTP_Cached_MB (const char *const &url,
+                 HTTP_Cache_Proxy::Cache_Manager *cm = 0);
+  HTTP_Cached_MB (const char *const &url, ACE_Message_Block *&mb, size_t size,
+                 HTTP_Cache_Proxy::Cache_Manager *cm = 0);
+  HTTP_Cached_MB (const char *const &url, const char *data, size_t size,
+                 HTTP_Cache_Proxy::Cache_Manager *cm = 0);
+
+
+  const ACE_Message_Block * operator-> (void) const;
 
 };
 
 
-#endif /* JAWS_FILECACHE_H */
+#endif /* HTTP_UCACHE_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
index e5542efc15d..959f8eec830 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
@@ -10,7 +10,6 @@
 #include "JAWS/IO.h"
 #include "JAWS/IO_Handler.h"
 #include "JAWS/IO_Acceptor.h"
-#include "JAWS/Filecache.h"
 
 // #include "HTTP_Helpers.h"
 
@@ -68,7 +67,7 @@ JAWS_Synch_IO::~JAWS_Synch_IO (void)
 void
 JAWS_Synch_IO::accept (JAWS_IO_Handler *ioh,
                        ACE_Message_Block *,
-                       unsigned int)
+                       unsigned int size)
 {
   ACE_SOCK_Stream new_stream;
   new_stream.set_handle (ACE_INVALID_HANDLE);
@@ -108,7 +107,7 @@ JAWS_Synch_IO::receive_file (JAWS_IO_Handler *ioh,
                              unsigned int entire_length)
 {
   ACE_Filecache_Handle handle (filename, 
-                               (int) entire_length);
+                               ACE_reinterpret_cast(int, entire_length));
 
   int result = handle.error ();
 
@@ -188,17 +187,11 @@ JAWS_Synch_IO::transmit_file (JAWS_IO_Handler *ioh,
                               const char *trailer,
                               unsigned int trailer_size)
 {
-  int result = 0;
-
-  if (filename == 0)
-    {
-      ioh->transmit_file_error (-1);
-      return;
-    }
+  ACE_Filecache_Handle handle (filename);
 
-  JAWS_Cached_FILE cf (filename);
+  int result = handle.error ();
 
-  if (cf.file ()->get_handle () != ACE_INVALID_HANDLE)
+  if (result == ACE_Filecache_Handle::ACE_SUCCESS)
     {
 #if defined (ACE_JAWS_BASELINE) || defined (ACE_WIN32)
       ACE_SOCK_Stream stream;
@@ -222,13 +215,10 @@ JAWS_Synch_IO::transmit_file (JAWS_IO_Handler *ioh,
           iov[iovcnt].iov_len =  header_size;
           iovcnt++;
         }
-
-      ACE_FILE_Info info;
-      cf.file ()->get_info (info);
-      if (cf.file ()->get_info (info) == 0 && info.size_ > 0)
+      if (handle.size () > 0)
         {
-          iov[iovcnt].iov_base = (char *) cf.mmap ()->addr ();
-          iov[iovcnt].iov_len = info.size_;
+          iov[iovcnt].iov_base = ACE_reinterpret_cast(char*,handle.address ());
+          iov[iovcnt].iov_len = handle.size ();
           iovcnt++;
         }
       if (trailer_size > 0)
@@ -244,7 +234,7 @@ JAWS_Synch_IO::transmit_file (JAWS_IO_Handler *ioh,
 #endif /* ACE_JAWS_BASELINE */
     }
 
-  if (result != 0)
+  if (result != ACE_Filecache_Handle::ACE_SUCCESS)
     ioh->transmit_file_error (result);
 }
 
@@ -444,8 +434,6 @@ JAWS_Asynch_IO::transmit_file (JAWS_IO_Handler *ioh,
                                const char *trailer,
                                unsigned int trailer_size)
 {
-  int result = 0;
-
   JAWS_TRACE ("JAWS_Asynch_IO::transmit_file");
 
   ioh->idle ();
@@ -454,9 +442,11 @@ JAWS_Asynch_IO::transmit_file (JAWS_IO_Handler *ioh,
     ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
 
   ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer = 0;
-  JAWS_Cached_FILE *cf = new JAWS_Cached_FILE (filename);
+  ACE_Filecache_Handle *handle = new ACE_Filecache_Handle (filename, ACE_NOMAP);
+
+  int result = handle->error ();
 
-  if (cf->file ()->get_handle () != ACE_INVALID_HANDLE)
+  if (result == ACE_Filecache_Handle::ACE_SUCCESS)
     {
       ACE_Message_Block hdr_mb (header, header_size);
       ACE_Message_Block trl_mb (trailer, trailer_size);
@@ -467,23 +457,23 @@ JAWS_Asynch_IO::transmit_file (JAWS_IO_Handler *ioh,
       ACE_Asynch_Transmit_File tf;
 
       if (tf.open (*(aioh->handler ()), aioh->handle ()) == -1
-          || tf.transmit_file (cf->file ()->get_handle (), // file handle
+          || tf.transmit_file (handle->handle (), // file handle
                                header_and_trailer, // header and trailer data
                                0,  // bytes_to_write
                                0,  // offset
                                0,  // offset_high
                                0,  // bytes_per_send
                                0,  // flags
-                               cf // act
+                               handle // act
                                ) == -1)
         result = -1;
     }
 
-  if (result != 0)
+  if (result != ACE_Filecache_Handle::ACE_SUCCESS)
     {
       ioh->transmit_file_error (result);
       delete header_and_trailer;
-      delete cf;
+      delete handle;
     }
 }
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Makefile b/apps/JAWS/PROTOTYPE/JAWS/Makefile
index 87e4b68e737..a92ca4841ba 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Makefile
+++ b/apps/JAWS/PROTOTYPE/JAWS/Makefile
@@ -32,8 +32,6 @@ MYFILES  	= \
 	Policy \
 	Concurrency \
 	Server \
-        Filecache \
-        FILE \
 	IO_Acceptor \
 	IO_Handler \
 	IO
@@ -83,34 +81,33 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/Cache_Hash_T.o .obj/Cache_Hash_T.so .shobj/Cache_Hash_T.o .shobj/Cache_Hash_T.so: Cache_Hash_T.cpp ../JAWS/Cache_Hash_T.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- ../JAWS/Cache_Object.h $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i ../JAWS/Cache_Object.h \
+ $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -132,25 +129,26 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \
- ../JAWS/Hash_Bucket_T.cpp
+ $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Hash_T.cpp \
+ ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp
 .obj/Cache_Heap_T.o .obj/Cache_Heap_T.so .shobj/Cache_Heap_T.o .shobj/Cache_Heap_T.so: Cache_Heap_T.cpp ../JAWS/Cache_Heap_T.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -158,13 +156,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -187,31 +183,31 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- ../JAWS/Cache_Object.h ../JAWS/Cache_Heap_T.cpp \
- ../JAWS/Cache_Manager_T.h \
+ $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Object.h \
+ ../JAWS/Cache_Heap_T.cpp ../JAWS/Cache_Manager_T.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \
- ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \
- ../JAWS/Hash_Bucket_T.cpp
+ $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Cache_Manager_T.cpp \
+ ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \
+ ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp
 .obj/Cache_List_T.o .obj/Cache_List_T.so .shobj/Cache_List_T.o .shobj/Cache_List_T.so: Cache_List_T.cpp ../JAWS/Cache_List_T.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -219,13 +215,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -248,56 +242,50 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- ../JAWS/Cache_Object.h ../JAWS/Cache_List_T.cpp \
- ../JAWS/Cache_Manager_T.h \
+ $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Object.h \
+ ../JAWS/Cache_List_T.cpp ../JAWS/Cache_Manager_T.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \
- ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \
- ../JAWS/Hash_Bucket_T.cpp
-.obj/Cache_Manager.o .obj/Cache_Manager.so .shobj/Cache_Manager.o .shobj/Cache_Manager.so: Cache_Manager.cpp \
- $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Cache_Manager_T.cpp \
+ ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \
+ ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp
+.obj/Cache_Manager.o .obj/Cache_Manager.so .shobj/Cache_Manager.o .shobj/Cache_Manager.so: Cache_Manager.cpp $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- ../JAWS/Cache_Manager.h ../JAWS/Cache_Manager_T.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp ../JAWS/Cache_Manager.h \
+ ../JAWS/Cache_Manager_T.h $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- ../JAWS/Cache_Object.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp ../JAWS/Cache_Object.h \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -314,38 +302,38 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \
- ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \
- ../JAWS/Hash_Bucket_T.cpp ../JAWS/Cache_List_T.h \
- ../JAWS/Cache_List_T.cpp
+ $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Manager_T.cpp \
+ ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \
+ ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp \
+ ../JAWS/Cache_List_T.h ../JAWS/Cache_List_T.cpp
 .obj/Cache_Manager_T.o .obj/Cache_Manager_T.so .shobj/Cache_Manager_T.o .shobj/Cache_Manager_T.so: Cache_Manager_T.cpp ../JAWS/Cache_Manager_T.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Singleton.i \
@@ -354,11 +342,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- ../JAWS/Cache_Object.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp ../JAWS/Cache_Object.h \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -375,41 +360,39 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \
- ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \
- ../JAWS/Hash_Bucket_T.cpp
+ $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Manager_T.cpp \
+ ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \
+ ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp
 .obj/Cache_Object.o .obj/Cache_Object.so .shobj/Cache_Object.o .shobj/Cache_Object.so: Cache_Object.cpp ../JAWS/Cache_Object.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -433,40 +416,38 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i
 .obj/Hash_Bucket_T.o .obj/Hash_Bucket_T.so .shobj/Hash_Bucket_T.o .shobj/Hash_Bucket_T.so: Hash_Bucket_T.cpp ../JAWS/Hash_Bucket_T.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/Containers.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -475,8 +456,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Signal.h $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
@@ -484,35 +464,35 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- ../JAWS/Hash_Bucket_T.cpp
+ $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Hash_Bucket_T.cpp
 .obj/Pipeline_Handler_T.o .obj/Pipeline_Handler_T.so .shobj/Pipeline_Handler_T.o .shobj/Pipeline_Handler_T.so: Pipeline_Handler_T.cpp \
  ../JAWS/Pipeline_Handler_T.h ../JAWS/Export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i ../JAWS/Pipeline.h \
+ $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -522,13 +502,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -545,8 +523,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -566,8 +542,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
  $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -598,8 +573,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.i \
@@ -608,34 +582,34 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp \
- ../JAWS/Pipeline_Handler_T.cpp
+ $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.cpp
 .obj/Pipeline.o .obj/Pipeline.so .shobj/Pipeline.o .shobj/Pipeline.so: Pipeline.cpp ../JAWS/Pipeline.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -645,13 +619,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -668,8 +640,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -689,8 +659,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
  $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -721,8 +690,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.i \
@@ -731,30 +699,32 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Export.h
+ $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Export.h \
+ ../JAWS/Pipeline_Handler_T.h ../JAWS/Pipeline_Handler_T.cpp
 .obj/Pipeline_Tasks.o .obj/Pipeline_Tasks.so .shobj/Pipeline_Tasks.o .shobj/Pipeline_Tasks.so: Pipeline_Tasks.cpp ../JAWS/JAWS.h ../JAWS/IO.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
@@ -765,13 +735,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Singleton.i \
@@ -780,8 +748,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- ../JAWS/Export.h ../JAWS/Pipeline_Tasks.h ../JAWS/Pipeline.h \
+ $(ACE_ROOT)/ace/Managed_Object.cpp ../JAWS/Export.h \
+ ../JAWS/Pipeline_Tasks.h ../JAWS/Pipeline.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -789,13 +757,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -807,8 +773,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -828,8 +792,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
  $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -860,8 +823,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.i \
@@ -870,45 +832,43 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp \
- ../JAWS/Pipeline_Handler_T.h ../JAWS/Pipeline_Handler_T.cpp \
- ../JAWS/Data_Block.h ../JAWS/IO_Handler.h ../JAWS/Policy.h \
- ../JAWS/Concurrency.h
+ $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \
+ ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Data_Block.h \
+ ../JAWS/IO_Handler.h ../JAWS/Policy.h ../JAWS/Concurrency.h
 .obj/Headers.o .obj/Headers.so .shobj/Headers.o .shobj/Headers.so: Headers.cpp ../JAWS/Headers.h ../JAWS/Export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -917,8 +877,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Signal.h $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
@@ -930,16 +889,19 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/Parse_Headers.o .obj/Parse_Headers.so .shobj/Parse_Headers.o .shobj/Parse_Headers.so: Parse_Headers.cpp ../JAWS/Parse_Headers.h \
  ../JAWS/Export.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -947,13 +909,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Singleton.i \
@@ -964,9 +924,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -987,74 +945,112 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- ../JAWS/Headers.h
+ $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Headers.h
 .obj/Waiter.o .obj/Waiter.so .shobj/Waiter.o .shobj/Waiter.so: Waiter.cpp $(ACE_ROOT)/ace/Proactor.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i ../JAWS/Waiter.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.h \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- ../JAWS/Assoc_Array.h ../JAWS/Assoc_Array.cpp ../JAWS/Export.h \
- ../JAWS/IO_Handler.h \
- $(ACE_ROOT)/ace/Asynch_IO.h
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Wheel.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Proactor.i ../JAWS/Waiter.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Assoc_Array.h \
+ ../JAWS/Assoc_Array.cpp ../JAWS/Export.h ../JAWS/IO_Handler.h
 .obj/Reaper.o .obj/Reaper.so .shobj/Reaper.o .shobj/Reaper.so: Reaper.cpp ../JAWS/Reaper.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Singleton.i \
@@ -1071,13 +1067,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -1085,14 +1079,12 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Signal.h $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
@@ -1106,8 +1098,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1143,65 +1133,61 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Module.i \
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- ../JAWS/Export.h ../JAWS/Concurrency.h ../JAWS/IO.h \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp ../JAWS/Export.h \
+ ../JAWS/Concurrency.h ../JAWS/IO.h \
  $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- ../JAWS/IO_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i ../JAWS/IO_Acceptor.h \
  $(ACE_ROOT)/ace/Asynch_Acceptor.h \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.i \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \
- ../JAWS/IO_Handler.h
+ $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp ../JAWS/IO_Handler.h
 .obj/Data_Block.o .obj/Data_Block.so .shobj/Data_Block.o .shobj/Data_Block.so: Data_Block.cpp ../JAWS/Data_Block.h \
  $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1228,15 +1214,12 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- ../JAWS/Export.h ../JAWS/Pipeline.h \
- $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Export.h \
+ ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1251,8 +1234,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
  $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -1283,8 +1265,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.i \
@@ -1293,20 +1274,18 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Policy.h \
- ../JAWS/Concurrency.h \
+ $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \
+ ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Policy.h ../JAWS/Concurrency.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/IO.h \
  $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
@@ -1314,31 +1293,31 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/Policy.o .obj/Policy.so .shobj/Policy.o .shobj/Policy.so: Policy.cpp ../JAWS/Policy.h ../JAWS/Export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- ../JAWS/Concurrency.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i ../JAWS/Concurrency.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Singleton.i \
@@ -1355,13 +1334,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -1369,14 +1346,12 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Signal.h $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
@@ -1390,8 +1365,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1427,27 +1400,25 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Module.i \
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- ../JAWS/IO.h $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp ../JAWS/IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- ../JAWS/IO_Handler.h ../JAWS/IO_Acceptor.h \
- $(ACE_ROOT)/ace/Asynch_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i ../JAWS/IO_Handler.h \
+ ../JAWS/IO_Acceptor.h $(ACE_ROOT)/ace/Asynch_Acceptor.h \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.i \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/Time_Value.h \
@@ -1455,31 +1426,32 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp
 .obj/Concurrency.o .obj/Concurrency.so .shobj/Concurrency.o .shobj/Concurrency.so: Concurrency.cpp ../JAWS/JAWS.h ../JAWS/Concurrency.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Singleton.i \
@@ -1496,13 +1468,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -1510,14 +1480,12 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Signal.h $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
@@ -1531,8 +1499,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1568,68 +1534,60 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Module.i \
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- ../JAWS/Export.h ../JAWS/IO.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp ../JAWS/Export.h \
+ ../JAWS/IO.h $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- ../JAWS/IO_Handler.h ../JAWS/Pipeline.h \
- $(ACE_ROOT)/ace/Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i ../JAWS/IO_Handler.h \
+ ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp \
- ../JAWS/Pipeline_Tasks.h ../JAWS/Pipeline_Handler_T.h \
- ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Data_Block.h ../JAWS/Policy.h \
- ../JAWS/Waiter.h ../JAWS/Assoc_Array.h ../JAWS/Assoc_Array.cpp \
- ../JAWS/Reaper.h
+ $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \
+ ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Pipeline_Tasks.h \
+ ../JAWS/Data_Block.h ../JAWS/Policy.h ../JAWS/Waiter.h \
+ ../JAWS/Assoc_Array.h ../JAWS/Assoc_Array.cpp ../JAWS/Reaper.h
 .obj/Server.o .obj/Server.so .shobj/Server.o .shobj/Server.so: Server.cpp $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i ../JAWS/Server.h \
- ../JAWS/Export.h ../JAWS/Data_Block.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.i ../JAWS/Server.h ../JAWS/Export.h \
+ ../JAWS/Data_Block.h $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1656,15 +1614,12 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- ../JAWS/Pipeline.h \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Pipeline.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1679,8 +1634,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
  $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -1711,8 +1665,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.i \
@@ -1721,166 +1674,60 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Policy.h \
- ../JAWS/Concurrency.h \
+ $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \
+ ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Policy.h ../JAWS/Concurrency.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/IO.h \
  $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- ../JAWS/IO_Handler.h ../JAWS/IO_Acceptor.h \
- $(ACE_ROOT)/ace/Asynch_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i ../JAWS/IO_Handler.h \
+ ../JAWS/IO_Acceptor.h $(ACE_ROOT)/ace/Asynch_Acceptor.h \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.i \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \
- ../JAWS/Pipeline_Tasks.h ../JAWS/Pipeline_Handler_T.h \
- ../JAWS/Pipeline_Handler_T.cpp
-.obj/Filecache.o .obj/Filecache.so .shobj/Filecache.o .shobj/Filecache.so: Filecache.cpp ../JAWS/Filecache.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/FILE_IO.h \
- $(ACE_ROOT)/ace/FILE.h \
- $(ACE_ROOT)/ace/IO_SAP.h \
- $(ACE_ROOT)/ace/IO_SAP.i \
- $(ACE_ROOT)/ace/FILE_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/FILE_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/FILE.i \
- $(ACE_ROOT)/ace/FILE_IO.i \
- ../JAWS/Cache_Manager.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- ../JAWS/Cache_Manager_T.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- ../JAWS/Cache_Object.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \
- ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \
- ../JAWS/Hash_Bucket_T.cpp ../JAWS/Export.h
-.obj/FILE.o .obj/FILE.so .shobj/FILE.o .shobj/FILE.so: FILE.cpp ../JAWS/FILE.h \
- $(ACE_ROOT)/ace/FILE_IO.h \
- $(ACE_ROOT)/ace/FILE.h \
- $(ACE_ROOT)/ace/IO_SAP.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
+ ../JAWS/Pipeline_Tasks.h
+.obj/IO_Acceptor.o .obj/IO_Acceptor.so .shobj/IO_Acceptor.o .shobj/IO_Acceptor.so: IO_Acceptor.cpp ../JAWS/Data_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/IO_SAP.i \
- $(ACE_ROOT)/ace/FILE_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/FILE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/FILE.i \
- $(ACE_ROOT)/ace/FILE_IO.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i
-.obj/IO_Acceptor.o .obj/IO_Acceptor.so .shobj/IO_Acceptor.o .shobj/IO_Acceptor.so: IO_Acceptor.cpp ../JAWS/Data_Block.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1907,15 +1754,12 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- ../JAWS/Export.h ../JAWS/Pipeline.h \
- $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Export.h \
+ ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1930,8 +1774,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
  $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -1962,8 +1805,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.i \
@@ -1972,86 +1814,70 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp \
- ../JAWS/IO_Acceptor.h \
+ $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \
+ ../JAWS/Pipeline_Handler_T.cpp ../JAWS/IO_Acceptor.h \
  $(ACE_ROOT)/ace/Asynch_Acceptor.h \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.i \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/IO.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
  ../JAWS/IO_Handler.h
-.obj/IO_Handler.o .obj/IO_Handler.so .shobj/IO_Handler.o .shobj/IO_Handler.so: IO_Handler.cpp \
- $(ACE_ROOT)/ace/Proactor.h \
+.obj/IO_Handler.o .obj/IO_Handler.so .shobj/IO_Handler.o .shobj/IO_Handler.so: IO_Handler.cpp $(ACE_ROOT)/ace/Proactor.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Filecache.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.h \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -2059,36 +1885,60 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Signal.h $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Wheel.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Proactor.i \
+ $(ACE_ROOT)/ace/Filecache.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- ../JAWS/JAWS.h ../JAWS/IO.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h ../JAWS/JAWS.h \
+ ../JAWS/IO.h $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
@@ -2098,21 +1948,21 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Export.h \
  ../JAWS/IO_Handler.h ../JAWS/IO_Acceptor.h \
  $(ACE_ROOT)/ace/Asynch_Acceptor.h \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \
- ../JAWS/Data_Block.h \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.i \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp ../JAWS/Data_Block.h \
  ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
  $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -2121,8 +1971,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -2133,8 +1981,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.i \
@@ -2143,39 +1990,38 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Policy.h \
- ../JAWS/Concurrency.h ../JAWS/Waiter.h ../JAWS/Assoc_Array.h \
- ../JAWS/Assoc_Array.cpp
+ $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \
+ ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Policy.h ../JAWS/Concurrency.h \
+ ../JAWS/Waiter.h ../JAWS/Assoc_Array.h ../JAWS/Assoc_Array.cpp
 .obj/IO.o .obj/IO.so .shobj/IO.o .shobj/IO.so: IO.cpp $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -2204,13 +2050,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
@@ -2231,8 +2074,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -2243,13 +2084,12 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- ../JAWS/JAWS.h ../JAWS/Data_Block.h ../JAWS/Export.h \
- ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Stream.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h ../JAWS/JAWS.h \
+ ../JAWS/Data_Block.h ../JAWS/Export.h ../JAWS/Pipeline.h \
+ $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
  $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -2270,8 +2110,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.i \
@@ -2280,14 +2119,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Policy.h \
- ../JAWS/Concurrency.h \
+ $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \
+ ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Policy.h ../JAWS/Concurrency.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/IO.h \
  $(ACE_ROOT)/ace/Asynch_IO.h \
- ../JAWS/IO_Handler.h ../JAWS/IO_Acceptor.h \
- $(ACE_ROOT)/ace/Asynch_Acceptor.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i ../JAWS/IO_Handler.h \
+ ../JAWS/IO_Acceptor.h $(ACE_ROOT)/ace/Asynch_Acceptor.h \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.i \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
diff --git a/apps/gperf/src/Options.h b/apps/gperf/src/Options.h
index 88962561038..36d8427c11d 100644
--- a/apps/gperf/src/Options.h
+++ b/apps/gperf/src/Options.h
@@ -72,12 +72,6 @@ enum Option_Type
 // g++ doesn't seem to do the right thing with them at the
 // moment... ;-(
 
-// PharLap ETS defines EOS as well... so if building for ETS, clear out
-// their EOS.
-#if defined (ACE_HAS_PHARLAP) && defined (EOS)
-# undef EOS
-#endif /* ACE_HAS_PHARLAP && EOS */
-
 enum
 {
   MAX_KEY_POS = 128 - 1,    // Max size of each word's key set.
diff --git a/bin/ACEutils.pm b/bin/ACEutils.pm
index dd6474e7a0f..50bb743f15f 100644
--- a/bin/ACEutils.pm
+++ b/bin/ACEutils.pm
@@ -36,7 +36,7 @@ sub uniqueid
 sub waitforfile
 {
   local($file) = @_;
-  sleep 1 while (!(-e $file && -s $file));
+  sleep 1 while (!(-e $file));
 }
 
 sub waitforfile_timed
@@ -44,7 +44,7 @@ sub waitforfile_timed
   my $file = shift;
   my $maxtime = shift;
   while ($maxtime-- != 0) {
-    if (-e $file && -s $file) {
+    if (-e $file) {
       return 0;
     }
     sleep 1;
diff --git a/bin/create_ace_build b/bin/create_ace_build
index 3a92ec0088c..965101b9865 100755
--- a/bin/create_ace_build
+++ b/bin/create_ace_build
@@ -1,3 +1,4 @@
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
@@ -60,26 +61,26 @@ PERL5_CWD
 #### Process command line args.
 ####
 while ($#ARGV >= 0  &&  $ARGV[0] =~ /^-/) {
-  if ($ARGV[0] eq '-v') {
-    $verbose = 1;
-  } elsif ($ARGV[0] eq '-d') {
-    if ($ARGV[1] =~ /^\d+$/) {
-      $directory_mode = eval ($ARGV[1]); shift;
+    if ($ARGV[0] eq '-v') {
+        $verbose = 1;
+    } elsif ($ARGV[0] eq '-d') {
+        if ($ARGV[1] =~ /^\d+$/) {
+            $directory_mode = eval ($ARGV[1]); shift;
+        } else {
+            warn "$0:  must provide argument for -d option\n";
+            die $usage;
+        }
+    } elsif ($ARGV[0] eq '-a') {
+        $source = &cwd ();
+        $absolute = 1;
+    } elsif ($ARGV[0] eq '-?') {
+        print "$usage";
+        exit;
     } else {
-      warn "$0:  must provide argument for -d option\n";
-      die $usage;
+        warn "$0:  unknown option $ARGV[0]\n";
+        die $usage;
     }
-  } elsif ($ARGV[0] eq '-a') {
-    $source = &cwd ();
-    $absolute = 1;
-  } elsif ($ARGV[0] eq '-?') {
-    print "$usage";
-    exit;
-  } else {
-    warn "$0:  unknown option $ARGV[0]\n";
-    die $usage;
-  }
-  shift;
+    shift;
 }
 
 die $usage unless $#ARGV == 0;
@@ -99,7 +100,7 @@ if (-e '/usr/bin/find') {
 #### Check that we're in an ACE "top level" directory.
 ####
 (-d 'ace' && -d 'include')  ||
-  die "$0:  must be in an ACE top level (ACE_ROOT) directory!\n";
+    die "$0:  must be in an ACE top level (ACE_ROOT) directory!\n";
 
 ####
 #### Create build directories, if needed.
@@ -122,33 +123,33 @@ if (-e '/usr/bin/find') {
 #### Create directories and symlinks to files.
 ####
 foreach $file (@files) {
-  chop $file;         #### remove trailing newline (from find command above)
-  $file =~ s%^./%%g;  #### excise leading ./ directory component
-
-  if (-d $file) {
-     unless (-d "$build/$file") {
-       print "mkdir $build/$file, $directory_mode\n" if $verbose;
-       mkdir ("$build/$file", $directory_mode);
-     }
-  } else {
-    unless (-e "$build/$file") {
-      if (!$absolute) {
-        $up = '../..';
-        while ($file =~ m%/%g) {
-          $up .= '/..';
-        }
+   chop $file;         #### remove trailing newline (from find command above)
+   $file =~ s%^./%%g;  #### excise leading ./ directory component
 
-        print "symlink $up/$file $build/$file\n" if $verbose;
-        symlink ("$up/$file", "$build/$file")  ||
-          warn "$0: symlink to $build/$file failed\n";
-      } else {
-        $path = $source . '/' . $file;
-        print "symlink $path $build/$file\n" if $verbose;
-        symlink ("$path", "$build/$file")  ||
-        warn "$0: symlink to $build/$file failed\n";
-      }
+   if (-d $file) {
+        unless (-d "$build/$file") {
+            print "mkdir $build/$file, $directory_mode\n" if $verbose;
+            mkdir ("$build/$file", $directory_mode);
+        }
+    } else {
+        unless (-e "$build/$file") {
+            if (!$absolute) {
+                $up = '../..';
+                while ($file =~ m%/%g) {
+                  $up .= '/..';
+                }
+
+                print "symlink $up/$file $build/$file\n" if $verbose;
+                symlink ("$up/$file", "$build/$file")  ||
+                    warn "$0: symlink to $build/$file failed\n";
+            } else {
+                $path = $source . '/' . $file;
+                print "symlink $path $build/$file\n" if $verbose;
+                symlink ("$path", "$build/$file")  ||
+                    warn "$0: symlink to $build/$file failed\n";
+            }
+        }
     }
-  }
 }
 
 ####
@@ -156,18 +157,19 @@ foreach $file (@files) {
 #### that are no longer actually linked to a file.
 ####
 open (LINKS, "$find $build -type l |") ||
-  die "$0: cannot find symlinks in $build\n";
+    die "$0: cannot find symlinks in $build\n";
 
 while (<LINKS>) {
-  chop;
-  local @s = stat $_;
-  if ($#s == -1) {
-    print "Removing $_ \n" if $verbose;
-    unlink $_  ||  warn "$0: unlink of $_ failed\n";
-  }
+    chop;
+    local @s = stat $_;
+    if ($#s == -1) {
+	print "Removing $_ \n" if $verbose;
+	unlink $_  ||  warn "$0: unlink of $_ failed\n";
+    }
+
 }
 close (LINKS) ||
-  die "$0: cannot close symlinks pipe\n";
+    die "$0: cannot close symlinks pipe\n";
 
 ####
 #### Done: print message.
@@ -176,8 +178,8 @@ print "\nCompleted creation of $build/.\n";
 
 unless (-e "$build/ace/config.h"  &&
         -e "$build/include/makeinclude/platform_macros.GNU") {
-  print "Be sure to setup $build/ace/config.h and\n" .
-        "$build/include/makeinclude/platform_macros.GNU symlinks.\n";
+    print "Be sure to setup $build/ace/config.h and\n" .
+          "$build/include/makeinclude/platform_macros.GNU symlinks.\n";
 }
 
 #### EOF
diff --git a/bin/make_release b/bin/make_release
index cecab1730ed..8d1ec42cdde 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -1,5 +1,5 @@
 eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
-    & eval 'exec perl -w -S $0 $argv:q'
+    & eval 'exec perl -S $0 $argv:q'
     if 0;
 
 # $Id$
@@ -12,16 +12,16 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 # Taken from perlrun man page.
 
 $usage="usage: $0 [-?] [-k <kit>] [-n] [-t <type>] " .
-  "[-c <controlled files>] [-r <release files>] " .
-  "[-l <release lib files] [-u]\n";
+         "[-c <controlled files>] [-r <release files>] " .
+         "[-l <release lib files]\n";
 $long_usage="   -? option prints this message\n" .
-  "   -k <kit>, where <kit> is ace, tao, or ace+tao\n" .
-  "   -n option prints what would be done, but doesn't do it\n" .
-  "   -t <type>, where <type> is major, minor, or beta (default)\n" .
-  "   -c <controlled files> lists the CVS-controlled files\n" .
-  "   -r <release files> lists the files to be released\n" .
-  "   -l <release lib files> list the files to put in the lib kit\n" .
-  "   -u to update versions\n";
+            "   -k <kit>, where <kit> is ace, tao, or ace+tao\n" .
+            "   -n option prints what would be done, but doesn't do it\n" .
+            "   -t <type>, where <type> is major, minor, or beta (default)\n" .
+            "   -c <controlled files> lists the CVS-controlled files\n" .
+            "   -r <release files> lists the files to be released\n" .
+            "   -l <release lib files> list the files to put in the lib kit\n";
+
 
 ########
 ######## Configuration parameters.
@@ -43,7 +43,6 @@ $release_files = '';
 $release_filter = '\\( -name CVS -o -name build \\) -prune -o ' .
                   '! -name \'.\#*\' ! -name \'\#*\' ! -name \'*~\' ' .
                   '! -name \'*.MAK\' -print';
-$update_versions = 0;
 
 
 ########
@@ -91,8 +90,6 @@ while ($#ARGV >= $[  &&  $ARGV[0] =~ /^-/) {
       print STDERR "$0:  must provide argument for -l option\n";
       die "$usage$long_usage";
     }
-  } elsif ($ARGV[0] eq '-u') {
-    $update_versions = 1;
   } elsif ($ARGV[0] eq '-?') {
     print "$usage$long_usage";
     exit;
@@ -104,10 +101,13 @@ while ($#ARGV >= $[  &&  $ARGV[0] =~ /^-/) {
 }
 
 die "must specify a -k option\n" unless "$kit";
+$update_versions = 0;
 if ($kit eq 'ace') {
   $KIT = 'ACE';
+  $update_versions = (`pwd` eq "/project/adaptive/ACE_wrappers\n");
 } elsif ($kit eq 'tao') {
   $KIT = 'TAO';
+  $update_versions = (`pwd` eq "/project/adaptive/ACE_wrappers/TAO\n");
 } else {
   #### Creating combined ACE+TAO kit.  Don't use $KIT.
 };
@@ -181,12 +181,10 @@ sub check_workspace () {
   }
 
   my @out_of_date = ();
-  open (CVS, "$cvs -nq checkout -P $module 2>&1 |")  ||
+  open (CVS, "$cvs -nq checkout -P $module |")  ||
     die "$0: unable to open $cvs\n";
   while (<CVS>) {
     next if m%^U %;    #### Allow others to update the repository.
-    next if m%^cvs checkout: New directory `.*' -- ignored$%;  #### empty dirs.
-
     push (@out_of_date, $_) if "$_";
   }
   close CVS;
diff --git a/bin/run_all_win32.pl b/bin/run_all_win32.pl
index 01fa7f8532b..645605ab7bf 100755
--- a/bin/run_all_win32.pl
+++ b/bin/run_all_win32.pl
@@ -1,48 +1,47 @@
 # -*- perl -*-
 # $Id$
 #
-# This script execute the test programs (usually, other scripts) in
-# the RUN_LIST defined below. If it detects any problem it send email.
+# This script checkouts ACE from CVS, updates the "clone" directory,
+# compiles $ACE_ROOT/ace and $ACE_ROOT/tests and finally runs
+# $ACE_ROOT/tests/run_tests.sh.
 #
-# This script requires ActivePerl for Win32 and libnet from CPAN.
+# If it detects any problem it send email.
 #
-# Usage:  run_all_win32.pl <log directory> <admin email address>
+# DO NOT invoke this script from your crontab, use
+# auto_compile_wrapper for that.
 #
-#     For example: run_all_win32.pl c:\log peter_pan@neverland.org
+# This script requires Perl5.
+#
+# TODO: Modify the script or split it in such a way that the main copy
+# can be obtained either using cvs or downloading the lastest beta
+# from the WWW.
+#
+
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# The first three lines above let this script run without specifying the
+# full path to perl, as long as it is in the user's PATH.
+# Taken from perlrun man page.
 
 use Net::SMTP;
 use File::Basename;
 use FileHandle;
 require POSIX;
 
-
 # This is the module we will checkout, someday someone could define a
 # smaller module.
 $MODULE='ACE_wrappers';
 
-# The following are for redirecting execution results to temporary files.
-$exe_log_name='run_test.log';   # Name of the tempfile used.
-
-# If using 'sh'.
-$sh_cmd="c:/bin/sh ";
-$sh_redirection=" > $exe_log_name 2>&1";
-
-#if using '4nt'
-$four_nt_cmd="d:/Utils/4NT301/4NT.EXE ";
-$four_nt_redirection=" >& $exe_log_name";
-
-# Pick the one your like.
-$shell_invoke = $sh_cmd;
-$redirect_output  = $sh_redirection;
-
 # This are the pairs "sub-directory , script" we run; the separator
 # *must* be a space followed by a comma and then another space.
 
-@RUN_LIST = (
-      'tests , run_tests.bat',
-      'TAO/tests/Param_Test , run_test.pl',
-      'TAO/tests/Param_Test , run_test.pl -i dii',
-      'TAO/performance-tests/Cubit/TAO/IDL_Cubit , run_test.pl',
+@RUN_LIST =
+      ( 'tests , run_tests.bat',
+        'TAO/tests/Param_Test , run_test.pl',
+        'TAO/tests/Param_Test , run_test.pl -i dii',
+        'TAO/performance-tests/Cubit/TAO/IDL_Cubit , run_test.pl',
       'TAO/tests/OctetSeq , run_test.pl',
       'TAO/tests/Multiple_Inheritance , run_test.pl',
       'TAO/tests/MT_Client , run_test.pl',
@@ -53,16 +52,16 @@ $redirect_output  = $sh_redirection;
       'TAO/tests/POA/Identity , run_test.pl',
       'TAO/tests/POA/Destruction , run_test.pl',
       'TAO/tests/IORManipulation , run_test.pl',
-      'TAO/examples/POA/Adapter_Activator , run_test.pl',
-      'TAO/examples/POA/DSI , run_test.pl',
-      'TAO/examples/POA/Default_Servant , run_test.pl',
-      'TAO/examples/POA/Explicit_Activation , run_test.pl',
-      'TAO/examples/POA/FindPOA , run_test.pl',
-      'TAO/examples/POA/Forwarding , run_test.pl',
-      'TAO/examples/POA/NewPOA , run_test.pl',
-      'TAO/examples/POA/On_Demand_Activation , run_test.pl',
-      'TAO/examples/POA/On_Demand_Loading , run_test.pl',
-      'TAO/examples/POA/Reference_Counted_Servant , run_test.pl',
+        'TAO/examples/POA/Adapter_Activator , run_test.pl',
+        'TAO/examples/POA/DSI , run_test.pl',
+        'TAO/examples/POA/Default_Servant , run_test.pl',
+        'TAO/examples/POA/Explicit_Activation , run_test.pl',
+        'TAO/examples/POA/FindPOA , run_test.pl',
+        'TAO/examples/POA/Forwarding , run_test.pl',
+        'TAO/examples/POA/NewPOA , run_test.pl',
+        'TAO/examples/POA/On_Demand_Activation , run_test.pl',
+        'TAO/examples/POA/On_Demand_Loading , run_test.pl',
+        'TAO/examples/POA/Reference_Counted_Servant , run_test.pl',
       'TAO/examples/Simple/bank , run_test.pl',
       'TAO/examples/Simple/grid , run_test.pl',
       'TAO/examples/Simple/time-date , run_test.pl',
@@ -80,7 +79,7 @@ $redirect_output  = $sh_redirection;
       'TAO/examples/Simple/echo , run_test.pl < Echo.idl',
 #      'TAO/examples/Simple/chat , run_test.pl',
       'TAO/orbsvcs/tests/Property , run_test.pl',
-      'TAO/performance-tests/POA/Object_Creation_And_Registration , run_test.pl',
+   'TAO/performance-tests/POA/Object_Creation_And_Registration , run_test.pl',
       'TAO/performance-tests/Cubit/TAO/MT_Cubit , run_test.pl -n 100'
 #      'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane',
 #      'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane_ir',
@@ -95,8 +94,11 @@ $CMD = basename($0);
 
 # Extract configuration information from command line.
 # TODO: Some validation and checking should be done here.
-$LOGDIR = $ARGV[0];
-$ADMIN = $ARGV[1];
+$CHECKOUT = $ARGV[0];
+$BUILD = $ARGV[1];
+$LOGDIR = $ARGV[2];
+$ADMIN = $ARGV[3];
+$MAKEFLAGS = $ARGV[4];
 
 # When an error is found we try to die gracefully and send some email
 # to ADMIN.
@@ -187,11 +189,10 @@ foreach $i (@RUN_LIST) {
 	|| mydie "cannot chdir to $subdir";
 
     $run_error = 0;
-
-    system ($shell_invoke . " " . $program . " " . $redirect_output);
-
-    open (RUN, "$exe_log_name") || push @failures, "Can't open execution log file $exe_log_name\n";
-
+    if (open(RUN, "$program 2>&1 |") == 0) {
+	push @failures, "cannot run $program in $directory";
+	next;
+    }
     while (<RUN>) {
 	print LOG $_;
 	if (m/^Error/ || m/FAILED/ || m/EXCEPTION/) {
@@ -199,7 +200,7 @@ foreach $i (@RUN_LIST) {
 	}
     }
     if (close(RUN) == 0) {
-	push @failures, "Error when closing log file $program in $directory";
+	push @failures, "Error when closing pipe for $program in $directory";
 	next;
     }
     $date = localtime;
@@ -209,8 +210,6 @@ foreach $i (@RUN_LIST) {
 	push @failures,
 	    "errors detected while running $program in $directory";
     }
-
-    unlink ("$exe_log_name");
 }
 
 if ($#failures >= 0) {
@@ -228,3 +227,4 @@ unlink $disable_file
     || mydie "cannot unlink disable file";
 
 exit 0;
+
diff --git a/configure b/configure
deleted file mode 100755
index d1b1745c92b..00000000000
--- a/configure
+++ /dev/null
@@ -1,31708 +0,0 @@
-#! /bin/sh
-
-# From configure.in Revision 0.61 
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-
-
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-
-
-
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-
-
-# Define a conditional.
-
-
-
-
-
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# serial 40 AC_PROG_LIBTOOL
-
-
-
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-
-
-# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-
-
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-
-
-# AC_CHECK_LIBM - check for math library
-
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library, adds --enable-ltdl-convenience to
-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-# '${top_builddir}/' (note the single quotes!) if your package is not
-# flat, and, if you're not using automake, define top_builddir as
-# appropriate in the Makefiles.
-
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library, and adds --enable-ltdl-install to
-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-# '${top_builddir}/' (note the single quotes!) if your package is not
-# flat, and, if you're not using automake, define top_builddir as
-# appropriate in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --enable-lib-all        build all ACE components        [default=yes]"
-ac_help="$ac_help
-  --enable-lib-full       build the full ACE library      [default=yes]"
-ac_help="$ac_help
-  --enable-lib-os         build libACE_OS library         "
-ac_help="$ac_help
-  --enable-lib-utils      build libACE_Utils library      "
-ac_help="$ac_help
-  --enable-lib-logging    build libACE_Logging library    "
-ac_help="$ac_help
-  --enable-lib-threads    build libACE_Threads library    "
-ac_help="$ac_help
-  --enable-lib-demux      build libACE_Demux library      "
-ac_help="$ac_help
-  --enable-lib-connection build libACE_Connection library "
-ac_help="$ac_help
-  --enable-lib-sockets    build libACE_Sockets library    "
-ac_help="$ac_help
-  --enable-lib-ipc        build libACE_IPC library        "
-ac_help="$ac_help
-  --enable-lib-svcconf    build libACE_Svcconf library    "
-ac_help="$ac_help
-  --enable-lib-streams    build libACE_Streams library    "
-ac_help="$ac_help
-  --enable-lib-memory     build libACE_Memory library     "
-ac_help="$ac_help
-  --enable-lib-token      build libACE_Token library      "
-ac_help="$ac_help
-  --enable-lib-other      build libACE_Other library      "
-ac_help="$ac_help
-  --enable-debug          enable debugging                [default=yes]"
-ac_help="$ac_help
-  --enable-exceptions     enable C++ exception handling   [default=yes]"
-ac_help="$ac_help
-  --enable-fast           enable -fast flag, e.g. Sun C++ [default=no]"
-ac_help="$ac_help
-  --enable-inline         enable code inlining            [default=yes]"
-ac_help="$ac_help
-  --enable-log-msg-prop   enable threads inheriting
-                          ACE_Log_Msg properties from parent
-                          thread                          [default=yes]"
-ac_help="$ac_help
-  --enable-logging        enable ACE logging macros       [default=yes]"
-ac_help="$ac_help
-  --enable-malloc-stats   enable malloc statistics
-                          collection                      [default=no]"
-ac_help="$ac_help
-  --enable-optimize       enable additional optimizations [default=yes]"
-ac_help="$ac_help
-  --enable-probe          enable ACE_Timeprobes           [default=no]"
-ac_help="$ac_help
-  --enable-profile        enable profiling                [default=no]"
-ac_help="$ac_help
-  --enable-purify         Purify all executables          [default=no]"
-ac_help="$ac_help
-  --enable-quantify       Quantify all executables        [default=no]"
-ac_help="$ac_help
-  --enable-reentrant      enable reentrant functions      [default=yes]"
-ac_help="$ac_help
-  --enable-repo           use GNU template repository
-                          GNU C++ with repo patches and
-                          EGCS only                       [default=no]"
-ac_help="$ac_help
-  --enable-rtti           enable run-time type
-                          identification
-                          *Currently only for Sun C++     [default=no]"
-ac_help="$ac_help
-  --enable-static-obj-mgr enable static Object_Manager    [default=yes]"
-ac_help="$ac_help
-  --enable-threads        enable thread support           [default=yes]"
-ac_help="$ac_help
-  --enable-verb-not-sup   enable verbose ENOTSUP reports  [default=no]"
-ac_help="$ac_help
-  --enable-trace          enable ACE tracing              [default=no]"
-ac_help="$ac_help
-  --enable-xt-reactor     build support for the XtReactor [default=no]"
-ac_help="$ac_help
-  --with-x                use the X Window System"
-ac_help="$ac_help
-  --enable-fl-reactor     build support for the FlReactor [default=no]"
-ac_help="$ac_help
-  --with-gperf            compile the gperf program       [default=yes]"
-ac_help="$ac_help
-  --with-orbix[=DIR]      compile ACE with Orbix          [default=no]"
-ac_help="$ac_help
-  --with-tli-device[=DEV] device for TCP on TLI           [default=/dev/tcp]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=no]"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=ace/ACE.cpp
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-
-
- if test -d CVS; then
-   { echo "configure: error: 
-      This error is meant for maintainers:
-
-      Please configure and build in a non-CVS controlled directory.
-      Doing so will prevent accidentally committing automatically
-      generated files into the CVS repository and help ensure that
-      the generated files and build scheme are correct.
-     " 1>&2; exit 1; }
- fi
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:906: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:927: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:945: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=ace
-ACE_VERSION=`head -1 ${srcdir}/VERSION | sed 's/.*version \([0-9.]*\).*/\1/'`
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:984: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:1037: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1094: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-PACKAGE="$PACKAGE"
-
-VERSION="$ACE_VERSION"
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:1133: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1146: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:1159: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1172: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1185: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-
-
-
-
-
-# Pull the hash mark out of the macro call to avoid m4 problems.
-ac_msg="whether #! works in shell scripts"
-echo $ac_n "checking $ac_msg""... $ac_c" 1>&6
-echo "configure:1207: checking $ac_msg" >&5
-if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo '#! /bin/cat
-exit 69
-' > conftest
-chmod u+x conftest
-(SHELL=/bin/sh; export SHELL; ./conftest >/dev/null)
-if test $? -ne 69; then
-   ac_cv_sys_interpreter=yes
-else
-   ac_cv_sys_interpreter=no
-fi
-rm -f conftest
-fi
-
-echo "$ac_t""$ac_cv_sys_interpreter" 1>&6
-interpval="$ac_cv_sys_interpreter"
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1231: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1312: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1344: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1355 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1386: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1391: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1419: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1451: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1466 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1483 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1500 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-if test "x$CC" != xcc; then
-  echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
-echo "configure:1532: checking whether $CC and cc understand -c and -o together" >&5
-else
-  echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
-echo "configure:1535: checking whether cc understands -c and -o together" >&5
-fi
-set dummy $CC; ac_cc="`echo $2 |
-		       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
-if eval "test \"`echo '$''{'ac_cv_prog_cc_${ac_cc}_c_o'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'foo(){}' > conftest.c
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
-if { (eval echo configure:1547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-   test -f conftest.o && { (eval echo configure:1548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-      ac_try='cc -c conftest.c -o conftest.o 1>&5'
-      if { (eval echo configure:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-	 test -f conftest.o && { (eval echo configure:1556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-      then
-        # cc works too.
-        :
-      else
-        # cc exists but doesn't like -o.
-        eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-  cat >> confdefs.h <<\EOF
-#define NO_MINUS_C_MINUS_O 1
-EOF
-
-fi
-
-
-for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1588: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$CXX" && break
-done
-test -n "$CXX" || CXX="gcc"
-
-
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1620: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1631 "configure"
-#include "confdefs.h"
-
-int main(){return(0);}
-EOF
-if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cxx_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cxx_cross=no
-  else
-    ac_cv_prog_cxx_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cxx_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
-if test $ac_cv_prog_cxx_works = no; then
-  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1662: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-cross_compiling=$ac_cv_prog_cxx_cross
-
-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1667: checking whether we are using GNU C++" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.C <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gxx=yes
-else
-  ac_cv_prog_gxx=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
-
-if test $ac_cv_prog_gxx = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-
-ac_test_CXXFLAGS="${CXXFLAGS+set}"
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS=
-echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1695: checking whether ${CXX-g++} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.cc
-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-  ac_cv_prog_cxx_g=yes
-else
-  ac_cv_prog_cxx_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS="$ac_save_CXXFLAGS"
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-
-echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1727: checking how to run the C++ preprocessor" >&5
-if test -z "$CXXCPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-  CXXCPP="${CXX-g++} -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1740 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CXXCPP=/lib/cpp
-fi
-rm -f conftest*
-  ac_cv_prog_CXXCPP="$CXXCPP"
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-fi
-fi
-CXXCPP="$ac_cv_prog_CXXCPP"
-echo "$ac_t""$CXXCPP" 1>&6
-
-
-if test -n "$GXX"; then
-  if g++ --version | egrep -v '^2\.[0-7]' > /dev/null; then
-    acenothinghere=""
-  else
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_GNUG_PRE_2_8 1
-EOF
-     cat >> confdefs.h <<\EOF
-#define ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS 1
-EOF
-   fi
-fi
-
-
-
-if test X$cross_compiling = Xyes; then
-  ACE_CROSS_COMPILED_TRUE=
-  ACE_CROSS_COMPILED_FALSE='#'
-else
-  ACE_CROSS_COMPILED_TRUE='#'
-  ACE_CROSS_COMPILED_FALSE=
-fi
-
-
-
-for ac_prog in mawk gawk nawk awk
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1800: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AWK="$ac_cv_prog_AWK"
-if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$AWK" && break
-done
-
-
-ACE_CURRENT=0
-ACE_AGE=0
-ACE_REVISION=0
-
-if test -n "$AWK"; then
-  ACE_MAJOR=`echo "$ACE_VERSION" | sed 's/\./ /g' | $AWK '{ print \$1 }'`
-  ACE_MINOR=`echo "$ACE_VERSION" | sed 's/\./ /g' | $AWK '{ print \$2 }'`
-  ACE_BETA=`echo "$ACE_VERSION" | sed 's/\./ /g' | $AWK '{ print \$3 }'`
-
-ACE_CURRENT=`expr $ACE_MAJOR + $ACE_MINOR`
-ACE_AGE=$ACE_MINOR
-ACE_REVISION=$ACE_BETA
-
-fi
-
-
-
-
-
-
-echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1851: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1853 "configure"
-#include "confdefs.h"
-#ifdef _AIX
-  yes
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
-#define _ALL_SOURCE 1
-EOF
-
-else
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6
-fi
-rm -f conftest*
-
-
-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1875: checking for POSIXized ISC" >&5
-if test -d /etc/conf/kconfig.d &&
-  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
-then
-  echo "$ac_t""yes" 1>&6
-  ISC=yes # If later tests want to check for ISC.
-  cat >> confdefs.h <<\EOF
-#define _POSIX_SOURCE 1
-EOF
-
-  if test "$GCC" = yes; then
-    CC="$CC -posix"
-  else
-    CC="$CC -Xp"
-  fi
-else
-  echo "$ac_t""no" 1>&6
-  ISC=
-fi
-
-ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1897: checking for minix/config.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1902 "configure"
-#include "confdefs.h"
-#include <minix/config.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  MINIX=yes
-else
-  echo "$ac_t""no" 1>&6
-MINIX=
-fi
-
-if test "$MINIX" = yes; then
-  cat >> confdefs.h <<\EOF
-#define _POSIX_SOURCE 1
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define _POSIX_1_SOURCE 2
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define _MINIX 1
-EOF
-
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1945: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1950 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:1961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-
-ACE_CXXFLAGS=""
-ACE_CFLAGS=""
-
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1990: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-for ac_prog in flex lex
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2017: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$LEX" && break
-done
-test -n "$LEX" || LEX=""$missing_dir/missing flex""
-
-# Extract the first word of "flex", so it can be a program name with args.
-set dummy flex; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2050: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="flex"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
-fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$LEXLIB"
-then
-  case "$LEX" in
-  flex*) ac_lib=fl ;;
-  *) ac_lib=l ;;
-  esac
-  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:2084: checking for yywrap in -l$ac_lib" >&5
-ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$ac_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2092 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char yywrap();
-
-int main() {
-yywrap()
-; return 0; }
-EOF
-if { (eval echo configure:2106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LEXLIB="-l$ac_lib"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:2129: checking lex output file root" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # The minimal lex program is just a single line: %%.  But some broken lexes
-# (Solaris, I think it was) want two %% lines, so accommodate them.
-echo '%%
-%%' | $LEX
-if test -f lex.yy.c; then
-  ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
-  ac_cv_prog_lex_root=lexyy
-else
-  { echo "configure: error: cannot find output from $LEX; giving up" 1>&2; exit 1; }
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
-echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:2150: checking whether yytext is a pointer" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
-ac_save_LIBS="$LIBS"
-LIBS="$LIBS $LEXLIB"
-cat > conftest.$ac_ext <<EOF
-#line 2162 "configure"
-#include "confdefs.h"
-`cat $LEX_OUTPUT_ROOT.c`
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_prog_lex_yytext_pointer=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-rm -f "${LEX_OUTPUT_ROOT}.c"
-
-fi
-
-echo "$ac_t""$ac_cv_prog_lex_yytext_pointer" 1>&6
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
-  cat >> confdefs.h <<\EOF
-#define YYTEXT_POINTER 1
-EOF
-
-fi
-
-
-for ac_prog in 'bison -y' byacc
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2196: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YACC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YACC="$ac_cv_prog_YACC"
-if test -n "$YACC"; then
-  echo "$ac_t""$YACC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
-
-
-# Extract the first word of "gperf", so it can be a program name with args.
-set dummy gperf; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2230: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GPERF'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GPERF"; then
-  ac_cv_prog_GPERF="$GPERF" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GPERF="gperf"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GPERF="$ac_cv_prog_GPERF"
-if test -n "$GPERF"; then
-  echo "$ac_t""$GPERF" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-for ac_prog in gprof prof
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_PROF'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$PROF"; then
-  ac_cv_prog_PROF="$PROF" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_PROF="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-PROF="$ac_cv_prog_PROF"
-if test -n "$PROF"; then
-  echo "$ac_t""$PROF" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$PROF" && break
-done
- 
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:2292: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-
-
-
-# Check whether --enable-lib-all or --disable-lib-all was given.
-if test "${enable_lib_all+set}" = set; then
-  enableval="$enable_lib_all"
-  
-               case "${enableval}" in
-                yes)
-                  ace_user_enable_lib_all=yes
-                  ;;
-                no)
-                  ace_user_enable_lib_all=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-all" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  
-               ace_user_enable_lib_all=yes
-              
-fi
-
-
-# Check whether --enable-lib-full or --disable-lib-full was given.
-if test "${enable_lib_full+set}" = set; then
-  enableval="$enable_lib_full"
-  
-               case "${enableval}" in
-                yes)
-                  ace_user_enable_lib_full=yes
-                  ;;
-                no)
-                  ace_user_enable_lib_full=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-full" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  
-               ace_user_enable_lib_full=yes
-              
-fi
-
-
-# Check whether --enable-lib-os or --disable-lib-os was given.
-if test "${enable_lib_os+set}" = set; then
-  enableval="$enable_lib_os"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_os=yes
-
-                  ;;
-                no)
-                  ace_user_enable_lib_os=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-os" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-utils or --disable-lib-utils was given.
-if test "${enable_lib_utils+set}" = set; then
-  enableval="$enable_lib_utils"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_utils=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-                  ;;
-                no)
-                  ace_user_enable_lib_utils=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-utils" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-logging or --disable-lib-logging was given.
-if test "${enable_lib_logging+set}" = set; then
-  enableval="$enable_lib_logging"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_logging=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-                  ;;
-                no)
-                  ace_user_enable_lib_logging=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-logging" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-threads or --disable-lib-threads was given.
-if test "${enable_lib_threads+set}" = set; then
-  enableval="$enable_lib_threads"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-                  ;;
-                no)
-                  ace_user_enable_lib_threads=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-threads" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-demux or --disable-lib-demux was given.
-if test "${enable_lib_demux+set}" = set; then
-  enableval="$enable_lib_demux"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
-                  ;;
-                no)
-                  ace_user_enable_lib_demux=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-demux" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-connection or --disable-lib-connection was given.
-if test "${enable_lib_connection+set}" = set; then
-  enableval="$enable_lib_connection"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_connection=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
-
-                  ;;
-                no)
-                  ace_user_enable_lib_connection=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-connection" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-sockets or --disable-lib-sockets was given.
-if test "${enable_lib_sockets+set}" = set; then
-  enableval="$enable_lib_sockets"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_sockets=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-                  ;;
-                no)
-                  ace_user_enable_lib_sockets=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-sockets" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-ipc or --disable-lib-ipc was given.
-if test "${enable_lib_ipc+set}" = set; then
-  enableval="$enable_lib_ipc"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_ipc=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_sockets=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
-                  ;;
-                no)
-                  ace_user_enable_lib_ipc=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-ipc" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-svcconf or --disable-lib-svcconf was given.
-if test "${enable_lib_svcconf+set}" = set; then
-  enableval="$enable_lib_svcconf"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_svcconf=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
- 
- ace_user_enable_lib_sockets=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
-                  ;;
-                no)
-                  ace_user_enable_lib_svcconf=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-svcconf" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-streams or --disable-lib-streams was given.
-if test "${enable_lib_streams+set}" = set; then
-  enableval="$enable_lib_streams"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_streams=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
-
-                  ;;
-                no)
-                  ace_user_enable_lib_streams=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-streams" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-memory or --disable-lib-memory was given.
-if test "${enable_lib_memory+set}" = set; then
-  enableval="$enable_lib_memory"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_memory=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-                  ;;
-                no)
-                  ace_user_enable_lib_memory=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-memory" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-token or --disable-lib-token was given.
-if test "${enable_lib_token+set}" = set; then
-  enableval="$enable_lib_token"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_token=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_utils=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_logging=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
- 
- ace_user_enable_lib_connection=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
-
- 
- ace_user_enable_lib_sockets=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_ipc=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_sockets=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
- 
- ace_user_enable_lib_svcconf=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
- 
- ace_user_enable_lib_sockets=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
- 
- ace_user_enable_lib_streams=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
-
- 
- ace_user_enable_lib_memory=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
-                  ;;
-                no)
-                  ace_user_enable_lib_token=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-token" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-# Check whether --enable-lib-other or --disable-lib-other was given.
-if test "${enable_lib_other+set}" = set; then
-  enableval="$enable_lib_other"
-  
-               case "${enableval}" in
-                yes)
-                  
- ace_user_enable_lib_other=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_utils=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_logging=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
- 
- ace_user_enable_lib_connection=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
-
- 
- ace_user_enable_lib_sockets=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_ipc=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_sockets=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
- 
- ace_user_enable_lib_svcconf=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
- 
- ace_user_enable_lib_sockets=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
- 
- ace_user_enable_lib_streams=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
- ace_user_enable_lib_demux=yes
-
-  
- ace_user_enable_lib_os=yes
-
- 
- ace_user_enable_lib_threads=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
-
-
- 
- ace_user_enable_lib_memory=yes
-
-  
- ace_user_enable_lib_os=yes
-
-
- 
-                  ;;
-                no)
-                  ace_user_enable_lib_other=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-lib-other" 1>&2; exit 1; }
-                  ;;
-               esac
-
-                              ace_user_enable_lib_full=no
-              
-fi
-
-
-
-if test $ace_user_enable_lib_all = yes; then
-
-  
- ace_user_enable_lib_os=yes
- ace_user_enable_lib_utils=yes
- ace_user_enable_lib_logging=yes
- ace_user_enable_lib_threads=yes
- ace_user_enable_lib_demux=yes
- ace_user_enable_lib_connection=yes
- ace_user_enable_lib_sockets=yes
- ace_user_enable_lib_ipc=yes
- ace_user_enable_lib_svcconf=yes
- ace_user_enable_lib_streams=yes
- ace_user_enable_lib_memory=yes
- ace_user_enable_lib_token=yes
- ace_user_enable_lib_other=yes
-
-
-elif test $ace_user_enable_lib_all = no; then
-
-  
- ace_user_enable_lib_os=no
- ace_user_enable_lib_utils=no
- ace_user_enable_lib_logging=no
- ace_user_enable_lib_threads=no
- ace_user_enable_lib_demux=no
- ace_user_enable_lib_connection=no
- ace_user_enable_lib_sockets=no
- ace_user_enable_lib_ipc=no
- ace_user_enable_lib_svcconf=no
- ace_user_enable_lib_streams=no
- ace_user_enable_lib_memory=no
- ace_user_enable_lib_token=no
- ace_user_enable_lib_other=no
-
-
-fi
-
-if test $ace_user_enable_lib_full = no &&
-   test $ace_user_enable_lib_os = no &&
-   test $ace_user_enable_lib_utils = no &&
-   test $ace_user_enable_lib_logging = no &&
-   test $ace_user_enable_lib_threads = no &&
-   test $ace_user_enable_lib_demux = no &&
-   test $ace_user_enable_lib_connection = no &&
-   test $ace_user_enable_lib_sockets = no &&
-   test $ace_user_enable_lib_ipc = no &&
-   test $ace_user_enable_lib_svcconf = no &&
-   test $ace_user_enable_lib_streams = no &&
-   test $ace_user_enable_lib_memory = no &&
-   test $ace_user_enable_lib_token = no &&
-   test $ace_user_enable_lib_other = no; then
-
-    { echo "configure: error: no ACE components will be built.  Specify which components to build" 1>&2; exit 1; }
-
-fi  
-
-
-if test X$ace_user_enable_lib_os = Xyes; then
-  BUILD_OS_FILES_TRUE=
-  BUILD_OS_FILES_FALSE='#'
-else
-  BUILD_OS_FILES_TRUE='#'
-  BUILD_OS_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_utils = Xyes; then
-  BUILD_UTILS_FILES_TRUE=
-  BUILD_UTILS_FILES_FALSE='#'
-else
-  BUILD_UTILS_FILES_TRUE='#'
-  BUILD_UTILS_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_logging = Xyes; then
-  BUILD_LOGGING_FILES_TRUE=
-  BUILD_LOGGING_FILES_FALSE='#'
-else
-  BUILD_LOGGING_FILES_TRUE='#'
-  BUILD_LOGGING_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_threads = Xyes; then
-  BUILD_THREADS_FILES_TRUE=
-  BUILD_THREADS_FILES_FALSE='#'
-else
-  BUILD_THREADS_FILES_TRUE='#'
-  BUILD_THREADS_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_demux = Xyes; then
-  BUILD_DEMUX_FILES_TRUE=
-  BUILD_DEMUX_FILES_FALSE='#'
-else
-  BUILD_DEMUX_FILES_TRUE='#'
-  BUILD_DEMUX_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_connection = Xyes; then
-  BUILD_CONNECTION_FILES_TRUE=
-  BUILD_CONNECTION_FILES_FALSE='#'
-else
-  BUILD_CONNECTION_FILES_TRUE='#'
-  BUILD_CONNECTION_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_sockets = Xyes; then
-  BUILD_SOCKETS_FILES_TRUE=
-  BUILD_SOCKETS_FILES_FALSE='#'
-else
-  BUILD_SOCKETS_FILES_TRUE='#'
-  BUILD_SOCKETS_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_ipc = Xyes; then
-  BUILD_IPC_FILES_TRUE=
-  BUILD_IPC_FILES_FALSE='#'
-else
-  BUILD_IPC_FILES_TRUE='#'
-  BUILD_IPC_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_svcconf = Xyes; then
-  BUILD_SVCCONF_FILES_TRUE=
-  BUILD_SVCCONF_FILES_FALSE='#'
-else
-  BUILD_SVCCONF_FILES_TRUE='#'
-  BUILD_SVCCONF_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_streams = Xyes; then
-  BUILD_STREAMS_FILES_TRUE=
-  BUILD_STREAMS_FILES_FALSE='#'
-else
-  BUILD_STREAMS_FILES_TRUE='#'
-  BUILD_STREAMS_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_memory = Xyes; then
-  BUILD_MEMORY_FILES_TRUE=
-  BUILD_MEMORY_FILES_FALSE='#'
-else
-  BUILD_MEMORY_FILES_TRUE='#'
-  BUILD_MEMORY_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_token = Xyes; then
-  BUILD_TOKEN_FILES_TRUE=
-  BUILD_TOKEN_FILES_FALSE='#'
-else
-  BUILD_TOKEN_FILES_TRUE='#'
-  BUILD_TOKEN_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_other = Xyes; then
-  BUILD_OTHER_FILES_TRUE=
-  BUILD_OTHER_FILES_FALSE='#'
-else
-  BUILD_OTHER_FILES_TRUE='#'
-  BUILD_OTHER_FILES_FALSE=
-fi
-
-
-
-if test X$ace_user_enable_lib_full = Xyes; then
-  BUILD_FULL_LIBRARY_TRUE=
-  BUILD_FULL_LIBRARY_FALSE='#'
-else
-  BUILD_FULL_LIBRARY_TRUE='#'
-  BUILD_FULL_LIBRARY_FALSE=
-fi
-
-
-
-# Check whether --enable-debug or --disable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval="$enable_debug"
-  
-               case "${enableval}" in
-                yes)
-                  ACE_CXXFLAGS="$ACE_CXXFLAGS $DCXXFLAGS"
-                  ;;
-                no)
-                  cat >> confdefs.h <<\EOF
-#define ACE_NDEBUG 1
-EOF
-
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-debug" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --enable-exceptions or --disable-exceptions was given.
-if test "${enable_exceptions+set}" = set; then
-  enableval="$enable_exceptions"
-  
-               case "${enableval}" in
-                yes)
-                  ace_user_enable_exceptions=yes
-                  ;;
-                no)
-                  ace_user_enable_exceptions=no
-                  if test -n "$GXX"; then
-                    if g++ --version | egrep -v '^2\.[0-7]' > /dev/null; then
-                      ACE_CXXFLAGS="$ACE_CXXFLAGS -fno-exceptions"
-                    fi
-                  fi
-                  if test -n "$GCC"; then
-                    if gcc --version | egrep -v '^2\.[0-7]' > /dev/null; then
-                      ACE_CFLAGS="$ACE_CFLAGS -fno-exceptions" 
-                    fi
-                  fi
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-exceptions" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  
-               ace_user_enable_exceptions=yes
-              
-fi
-
-
-
-# Check whether --enable-fast or --disable-fast was given.
-if test "${enable_fast+set}" = set; then
-  enableval="$enable_fast"
-  
-               case "${enableval}" in
-                yes)
-                  ACE_CXXFLAGS="$ACE_CXXFLAGS -fast"
-                  ACE_CFLAGS="$ACE_CFLAGS -fast"
-                  ;;
-                no)
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-fast" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --enable-inline or --disable-inline was given.
-if test "${enable_inline+set}" = set; then
-  enableval="$enable_inline"
-  
-               case "${enableval}" in
-                yes)
-                  cat >> confdefs.h <<\EOF
-#define __ACE_INLINE__ 1
-EOF
-
-                  ;;
-                no)
-                  cat >> confdefs.h <<\EOF
-#define ACE_NO_INLINE 1
-EOF
-
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-inline" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  
-               cat >> confdefs.h <<\EOF
-#define __ACE_INLINE__ 1
-EOF
-
-              
-fi
-
-
-# Check whether --enable-log-msg-prop or --disable-log-msg-prop was given.
-if test "${enable_log_msg_prop+set}" = set; then
-  enableval="$enable_log_msg_prop"
-  
-               case "${enableval}" in
-                yes)
-                                    ;;
-                no)
-                  cat >> confdefs.h <<\EOF
-#define ACE_THREADS_DONT_INHERIT_LOG_MSG 1
-EOF
-
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-log-msg-prop" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --enable-logging or --disable-logging was given.
-if test "${enable_logging+set}" = set; then
-  enableval="$enable_logging"
-  
-               case "${enableval}" in
-                yes)
-                                    ;;
-                no)
-                  cat >> confdefs.h <<\EOF
-#define ACE_NLOGGING 1
-EOF
-
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-logging" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --enable-malloc-stats or --disable-malloc-stats was given.
-if test "${enable_malloc_stats+set}" = set; then
-  enableval="$enable_malloc_stats"
-  
-               case "${enableval}" in
-                yes)
-                  cat >> confdefs.h <<\EOF
-#define ACE_HAS_MALLOC_STATS 1
-EOF
-
-                  ;;
-                no)
-                                    ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-malloc-stats" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --enable-optimize or --disable-optimize was given.
-if test "${enable_optimize+set}" = set; then
-  enableval="$enable_optimize"
-  
-               case "${enableval}" in
-                yes)
-                  ace_user_enable_optimize=yes
-                  ;;
-                no)
-                  echo "configure: warning: Optimization configure support not implemented yet." 1>&2
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-optimize" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  
-               ace_user_enable_optimize=yes
-              
-fi
-
-
-# Check whether --enable-probe or --disable-probe was given.
-if test "${enable_probe+set}" = set; then
-  enableval="$enable_probe"
-  
-               case "${enableval}" in
-                yes)
-                  cat >> confdefs.h <<\EOF
-#define ACE_COMPILE_TIMEPROBES 1
-EOF
-
-                  ;;
-                no)
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-probe" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --enable-profile or --disable-profile was given.
-if test "${enable_profile+set}" = set; then
-  enableval="$enable_profile"
-  
-               case "${enableval}" in
-                yes)
-                  if test -z "$PROF"; then
-                    echo "configure: warning: No profiling program found.  Assuming 'prof' exists" 1>&2
-                    ACE_CXXFLAGS="$ACE_CXXFLAGS -p"
-                    ACE_CFLAGS="$ACE_CFLAGS -p"
-                  else
-                    case "$PROF" in
-                    gprof)
-                      echo "Building with 'gprof' support"
-                      ACE_CXXFLAGS="$ACE_CXXFLAGS -pg"
-                      ACE_CFLAGS="$ACE_CFLAGS -pg"
-                      ;;
-                    prof)
-                      echo "Building with 'prof' support"
-                      ACE_CXXFLAGS="$ACE_CXXFLAGS -p"
-                      ACE_CFLAGS="$ACE_CFLAGS -p"
-                      ;;
-                    *)
-                                            echo "configure: warning: Assuming 'prof' exists" 1>&2
-                      ACE_CXXFLAGS="$ACE_CXXFLAGS -p"
-                      ACE_CFLAGS="$ACE_CFLAGS -p"
-                      ;;
-                    esac
-                  fi
-                  ;;
-                no)
-                                    ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-profile" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --enable-purify or --disable-purify was given.
-if test "${enable_purify+set}" = set; then
-  enableval="$enable_purify"
-  
-               case "${enableval}" in
-                yes)
-                  # Extract the first word of "purify", so it can be a program name with args.
-set dummy purify; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3565: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_PURIFY'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$PURIFY"; then
-  ac_cv_prog_PURIFY="$PURIFY" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_PURIFY="purify"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-PURIFY="$ac_cv_prog_PURIFY"
-if test -n "$PURIFY"; then
-  echo "$ac_t""$PURIFY" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-                  if test -n "$PURIFY"; then
-                    PURE_CACHE_BASE_DIR=/tmp/purifycache
-                    PURE_CACHE_DIR=${PURE_CACHE_BASE_DIR}-${LOGNAME}-${notdir ${CXX} }
-                    PURELINK="$PURIFY -best-effort -chain-length=20 \
-             -cache-dir=$PURE_CACHE_DIR \
-             -fds-inuse-at-exit=no -ignore-signals=SIGINT -inuse-at-exit \
-             -max_threads=100"
-                    ACE_CXXFLAGS="$ACE_CXXFLAGS -DACE_HAS_PURIFY"
-                    ACE_CFLAGS="$ACE_CFLAGS -DACE_HAS_PURIFY"
-                  else
-                    echo "configure: warning: Purify program was not found." 1>&2
-                    echo "configure: warning: Disabling purify support." 1>&2
-                  fi
-                  ;;
-                no)
-                  PURELINK=""
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-purify" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  PURELINK=""
-fi
-
-
-# Check whether --enable-quantify or --disable-quantify was given.
-if test "${enable_quantify+set}" = set; then
-  enableval="$enable_quantify"
-  
-               case "${enableval}" in
-                yes)
-                  # Extract the first word of "quantify", so it can be a program name with args.
-set dummy quantify; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3627: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_QUANTIFY'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$QUANTIFY"; then
-  ac_cv_prog_QUANTIFY="$QUANTIFY" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_QUANTIFY="quantify"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-QUANTIFY="$ac_cv_prog_QUANTIFY"
-if test -n "$QUANTIFY"; then
-  echo "$ac_t""$QUANTIFY" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-                  if test -n "$QUANTIFY"; then
-                    PURE_CACHE_BASE_DIR=/tmp/purifycache
-                    PURE_CACHE_DIR=${PURE_CACHE_BASE_DIR}-${LOGNAME}-${notdir ${CXX} }
-                    PRELINK="$QUANTIFY  -best-effort -max_threads=100 \
-             -cache-dir=$PURE_CACHE_DIR"
-                    ACE_CXXFLAGS="$ACE_CXXFLAGS -DACE_HAS_QUANTIFY"
-                    ACE_CFLAGS="$ACE_CFLAGS -DACE_HAS_QUANTIFY"
-                  else
-                    echo "configure: warning: Quantify program was not found." 1>&2
-                    echo "configure: warning: Disabling quantify support." 1>&2
-                  fi
-                  ;;
-                no)
-                  PRELINK=""
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-quantify" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  PRELINK=""
-fi
-
-
-# Check whether --enable-reentrant or --disable-reentrant was given.
-if test "${enable_reentrant+set}" = set; then
-  enableval="$enable_reentrant"
-  
-               case "${enableval}" in
-                yes)
-                  ace_user_enable_reentrant_funcs=yes
-                  ;;
-                no)
-                  ace_user_enable_reentrant_funcs=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-reentrant" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  
-               ace_user_enable_reentrant_funcs=yes
-              
-fi
-
-
-
-# Check whether --enable-repo or --disable-repo was given.
-if test "${enable_repo+set}" = set; then
-  enableval="$enable_repo"
-  
-               case "${enableval}" in
-                yes)
-                  if test -n "$GXX"; then
-                    ace_user_enable_repo=yes
-                    ACE_CXXFLAGS="$ACE_CXXFLAGS -frepo"
-                    cat >> confdefs.h <<\EOF
-#define ACE_HAS_GNU_REPO 1
-EOF
-
-                  else
-                    ace_user_enable_repo=no
-                    echo "configure: warning: Not using GNU C++! GNU template respository disabled" 1>&2
-                  fi
-                  ;;
-                no)
-                  ace_user_enable_repo=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-repo" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  
-               ace_user_enable_repo=no
-              
-fi
-
-
-# Check whether --enable-rtti or --disable-rtti was given.
-if test "${enable_rtti+set}" = set; then
-  enableval="$enable_rtti"
-  
-               case "${enableval}" in
-                yes)
-                  if test -z "$GXX"; then
-                    case "$target" in
-                      *solaris*)
-                           ace_user_enable_rtti=yes
-                           ;;
-                      *)
-                           ;;
-                    esac
-                  else
-                    echo "configure: warning: Not using Sun C++. RTTI will not be enabled." 1>&2
-                  fi
-                  ;;
-                no)
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-rtti" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --enable-static-obj-mgr or --disable-static-obj-mgr was given.
-if test "${enable_static_obj_mgr+set}" = set; then
-  enableval="$enable_static_obj_mgr"
-  
-               case "${enableval}" in
-                yes)
-                                    ;;
-                no)
-                  cat >> confdefs.h <<\EOF
-#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
-EOF
-
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-static-obj-mgr" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --enable-threads or --disable-threads was given.
-if test "${enable_threads+set}" = set; then
-  enableval="$enable_threads"
-  
-               case "${enableval}" in
-                yes)
-                  ace_user_enable_threads=yes
-                  ;;
-                no)
-                  ace_user_enable_threads=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-threads" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  
-                ace_user_enable_threads=yes
-              
-fi
-
-
-
-# Check whether --enable-verb-not-sup or --disable-verb-not-sup was given.
-if test "${enable_verb_not_sup+set}" = set; then
-  enableval="$enable_verb_not_sup"
-  
-               case "${enableval}" in
-                yes)
-                  cat >> confdefs.h <<\EOF
-#define ACE_HAS_VERBOSE_NOTSUP 1
-EOF
-
-                  ;;
-                no)
-                                    ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-verb-not-sup" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --enable-trace or --disable-trace was given.
-if test "${enable_trace+set}" = set; then
-  enableval="$enable_trace"
-  
-               case "${enableval}" in
-                yes)
-                  ;;
-                no)
-                  cat >> confdefs.h <<\EOF
-#define ACE_NTRACE 1
-EOF
-
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-trace" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  
-               cat >> confdefs.h <<\EOF
-#define ACE_NTRACE 1
-EOF
-
-              
-fi
-
-
-# If we find X, set shell vars x_includes and x_libraries to the
-# paths, otherwise set no_x=yes.
-# Uses ac_ vars as temps to allow command line to override cache and checks.
-# --without-x overrides everything else, but does not touch the cache.
-echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:3862: checking for X" >&5
-
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
-  withval="$with_x"
-  :
-fi
-
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    # Both variables are already set.
-    have_x=yes
-  else
-if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=NO ac_x_libraries=NO
-rm -fr conftestdir
-if mkdir conftestdir; then
-  cd conftestdir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat > Imakefile <<'EOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-EOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-        test -f $ac_im_libdir/libX11.$ac_extension; then
-        ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case "$ac_im_incroot" in
-	/usr/include) ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
-    esac
-    case "$ac_im_usrlibdir" in
-	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
-    esac
-  fi
-  cd ..
-  rm -fr conftestdir
-fi
-
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-cat > conftest.$ac_ext <<EOF
-#line 3924 "configure"
-#include "confdefs.h"
-#include <$x_direct_test_include>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
-fi
-rm -f conftest*
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
-  # Check for the libraries.
-
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3998 "configure"
-#include "confdefs.h"
-
-int main() {
-${x_direct_test_function}()
-; return 0; }
-EOF
-if { (eval echo configure:4005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-    /usr/X11/lib          \
-    /usr/X11R6/lib        \
-    /usr/X11R5/lib        \
-    /usr/X11R4/lib        \
-                          \
-    /usr/lib/X11          \
-    /usr/lib/X11R6        \
-    /usr/lib/X11R5        \
-    /usr/lib/X11R4        \
-                          \
-    /usr/local/X11/lib    \
-    /usr/local/X11R6/lib  \
-    /usr/local/X11R5/lib  \
-    /usr/local/X11R4/lib  \
-                          \
-    /usr/local/lib/X11    \
-    /usr/local/lib/X11R6  \
-    /usr/local/lib/X11R5  \
-    /usr/local/lib/X11R4  \
-                          \
-    /usr/X386/lib         \
-    /usr/x386/lib         \
-    /usr/XFree86/lib/X11  \
-                          \
-    /usr/lib              \
-    /usr/local/lib        \
-    /usr/unsupported/lib  \
-    /usr/athena/lib       \
-    /usr/local/x11r5/lib  \
-    /usr/lpp/Xamples/lib  \
-    /lib/usr/lib/X11	  \
-                          \
-    /usr/openwin/lib      \
-    /usr/openwin/share/lib \
-    ; \
-do
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-rm -f conftest*
-fi # $ac_x_libraries = NO
-
-if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
-  # Didn't find X anywhere.  Cache the known absence of X.
-  ac_cv_have_x="have_x=no"
-else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
-fi
-  fi
-  eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
-  echo "$ac_t""$have_x" 1>&6
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
-fi
-
-# Check whether --enable-xt-reactor or --disable-xt-reactor was given.
-if test "${enable_xt_reactor+set}" = set; then
-  enableval="$enable_xt_reactor"
-  
-               case "${enableval}" in
-                yes)
-                  if test "$no_x" = yes; then
-  # Not all programs may use this symbol, but it does not hurt to define it.
-  cat >> confdefs.h <<\EOF
-#define X_DISPLAY_MISSING 1
-EOF
-
-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
-  fi
-
-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n "$x_libraries"; then
-    X_LIBS="$X_LIBS -L$x_libraries"
-    # For Solaris; some versions of Sun CC require a space after -R and
-    # others require no space.  Words are not sufficient . . . .
-    case "`(uname -sr) 2>/dev/null`" in
-    "SunOS 5"*)
-      echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:4117: checking whether -R must be followed by a space" >&5
-      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-      cat > conftest.$ac_ext <<EOF
-#line 4120 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_R_nospace=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_R_nospace=no
-fi
-rm -f conftest*
-      if test $ac_R_nospace = yes; then
-	echo "$ac_t""no" 1>&6
-	X_LIBS="$X_LIBS -R$x_libraries"
-      else
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
-	cat > conftest.$ac_ext <<EOF
-#line 4143 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_R_space=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_R_space=no
-fi
-rm -f conftest*
-	if test $ac_R_space = yes; then
-	  echo "$ac_t""yes" 1>&6
-	  X_LIBS="$X_LIBS -R $x_libraries"
-	else
-	  echo "$ac_t""neither works" 1>&6
-	fi
-      fi
-      LIBS="$ac_xsave_LIBS"
-    esac
-  fi
-
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
-
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-  else
-    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And karl@cs.umb.edu says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4182: checking for dnet_ntoa in -ldnet" >&5
-ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldnet  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4190 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa();
-
-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:4204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:4226: checking for dnet_ntoa in -ldnet_stub" >&5
-ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldnet_stub  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4234 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa();
-
-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:4248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-
-    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # The nsl library prevents programs from opening the X display
-    # on Irix 5.2, according to dickey@clark.net.
-    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:4277: checking for gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4282 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
-choke me
-#else
-gethostbyname();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:4308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_func_gethostbyname = no; then
-      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4329: checking for gethostbyname in -lnsl" >&5
-ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lnsl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4337 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-gethostbyname()
-; return 0; }
-EOF
-if { (eval echo configure:4351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-
-    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says simon@lia.di.epfl.ch: it contains
-    # gethostby* variants that don't use the nameserver (or something).
-    # -lsocket must be given before -lnsl if both are needed.
-    # We assume that if connect needs -lnsl, so does gethostbyname.
-    echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4381: checking for connect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4386 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_connect) || defined (__stub___connect)
-choke me
-#else
-connect();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:4412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_connect=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_connect=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_func_connect = no; then
-      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4433: checking for connect in -lsocket" >&5
-ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4441 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-connect()
-; return 0; }
-EOF
-if { (eval echo configure:4455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-
-    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-    echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4479: checking for remove" >&5
-if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4484 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char remove();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_remove) || defined (__stub___remove)
-choke me
-#else
-remove();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:4510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_remove=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_remove=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_func_remove = no; then
-      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4531: checking for remove in -lposix" >&5
-ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lposix  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4539 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char remove();
-
-int main() {
-remove()
-; return 0; }
-EOF
-if { (eval echo configure:4553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4577: checking for shmat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4582 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shmat();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shmat) || defined (__stub___shmat)
-choke me
-#else
-shmat();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:4608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_func_shmat = no; then
-      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4629: checking for shmat in -lipc" >&5
-ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lipc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4637 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shmat();
-
-int main() {
-shmat()
-; return 0; }
-EOF
-if { (eval echo configure:4651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS="$LDFLAGS"
-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # libraries we check for below, so use a different variable.
-  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4684: checking for IceConnectionNumber in -lICE" >&5
-ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4692 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber();
-
-int main() {
-IceConnectionNumber()
-; return 0; }
-EOF
-if { (eval echo configure:4706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  LDFLAGS="$ac_save_LDFLAGS"
-
-fi
-
-                  if test "$no_x" != yes; then
-                    ACE_XLIBS="-lX11 -lXt"
-                    cat >> confdefs.h <<\EOF
-#define ACE_HAS_XT 1
-EOF
-
-                    ace_user_enable_xt_reactor=yes
-                  else
-                    ACE_XLIBS=""
-                    ace_user_enable_xt_reactor=no
-                    echo "configure: warning: X was not found or it was disabled." 1>&2
-                    echo "configure: warning: ACE_XtReactor will not be enabled." 1>&2
-                  fi
-                  ;;
-                no)
-                  ACE_XLIBS=""
-                  ace_user_enable_xt_reactor=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-xt-reactor" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --enable-fl-reactor or --disable-fl-reactor was given.
-if test "${enable_fl_reactor+set}" = set; then
-  enableval="$enable_fl_reactor"
-  
-               case "${enableval}" in
-                yes)
-                  { echo "configure: error: --enable-fl-reactor currently unimplemented" 1>&2; exit 1; }
-                  ace_user_enable_fl_reactor=yes
-                  ;;
-                no)
-                  { echo "configure: error: --enable-fl-reactor currently unimplemented" 1>&2; exit 1; }
-                  ace_user_enable_fl_reactor=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${enableval} for --enable-fl-reactor" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --with-gperf or --without-gperf was given.
-if test "${with_gperf+set}" = set; then
-  withval="$with_gperf"
-  
-               case "${withval}" in
-                yes)
-                  ace_user_with_gperf=yes
-                  cat >> confdefs.h <<\EOF
-#define ACE_HAS_GPERF 1
-EOF
-
-                  if test -n "$GPERF"; then
-                    echo "configure: warning: gperf program already exists" 1>&2
-                    echo "configure: warning: existing gperf may be overwritten during installation" 1>&2
-                  fi
-                  ;;
-                no)
-                  ace_user_with_gperf=no
-                  ;;
-                *)
-                  { echo "configure: error: bad value ${withval} for --with-gperf" 1>&2; exit 1; }
-                  ;;
-               esac
-              
-else
-  
-               ace_user_with_gperf=yes
-               cat >> confdefs.h <<\EOF
-#define ACE_HAS_GPERF 1
-EOF
-
-               if test -n "$GPERF"; then
-                 echo "configure: warning: gperf program already exists" 1>&2
-                 echo "configure: warning: existing gperf may be overwritten during installation" 1>&2
-               fi
-              
-fi
-
-
-
-if test X$ace_user_with_gperf = Xyes; then
-  COMPILE_GPERF_TRUE=
-  COMPILE_GPERF_FALSE='#'
-else
-  COMPILE_GPERF_TRUE='#'
-  COMPILE_GPERF_FALSE=
-fi
-
-# Check whether --with-orbix or --without-orbix was given.
-if test "${with_orbix+set}" = set; then
-  withval="$with_orbix"
-  
-               case "${withval}" in
-                yes)
-                  echo "configure: warning: Orbix configure support not implemented yet." 1>&2
-                  ;;
-                no)
-                  ;;
-                *)
-                  echo "configure: warning: Orbix configure support not implemented yet." 1>&2
-                  ;;
-               esac
-              
-fi
-
-
-# Check whether --with-tli-device or --without-tli-device was given.
-if test "${with_tli_device+set}" = set; then
-  withval="$with_tli_device"
-  
-               case "${withval}" in
-                yes)
-                  { echo "configure: error: Specify the TLI/TCP device if you use this option." 1>&2; exit 1; }
-                  ;;
-                no)
-                  ;;
-                *)
-                  if test -e "${withval}"; then
-                    cat >> confdefs.h <<EOF
-#define ACE_TLI_TCP_DEVICE "${withval}"
-EOF
-
-                  else
-                    { echo "configure: error: TLI/TCP device ${withval} does not exist." 1>&2; exit 1; }
-                  fi
-                  ;;
-               esac
-              
-fi
-
-
-
-  
-  
- 
- 
-
-          
- case "$target" in
-   *aix4.2* | *aix4.3*)
-     case "$CXX" in
-       xlC*)
-         CXXFLAGS="$CXXFLAGS"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS -qtempinc -qlanglvl=ansi -qflag=w:w -qinfo"
-         DCXXFLAGS="-g -qcheck=nobounds:div:null"
-         OCXXFLAGS="-qarch=com"
-         ;;
-       *)
-         if test -n "$GXX"; then
-           ACE_CXXFLAGS="-mcpu=common"
-         fi
-         ;;
-     esac
-     ;;
-   *aix4.1*)
-     case "$CXX" in
-       xlC*)
-         CXXFLAGS="$CXXFLAGS"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS -qxcall -qtempinc"
-         DCXXFLAGS="-g"
-         OCXXFLAGS="-qarch=ppc -qtune=604"
-         ;;
-       *)
-         if test -n "$GXX"; then
-           ACE_CXXFLAGS="-mcpu=common"
-         fi
-         ;;
-     esac
-     ;;
-   *chorus*)
-     ;;
-   *cray*)
-     ;;
-   *dgux*)
-     case "$CXX" in
-       ec++)
-         CXXFLAGS="$CXXFLAGS"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS -relax -v -eh"
-         DCXXFLAGS="-g"
-         OCXXFLAGS=""
-         ;;
-       *)
-         if test -n "$GXX"; then
-           ACE_CXXFLAGS="$ACE_CXXFLAGS"
-         fi
-         ;;
-     esac
-     ;;
-   *freebsd*)
-     case "$CXX" in
-       *)
-         if test -n "$GXX"; then       
-           CXXFLAGS="$CXXFLAGS"
-           ACE_CXXFLAGS="$ACE_CXXFLAGS -w -fno-strict-prototypes"
-           DCXXFLAGS=""
-           OCXXFLAGS=""
-         fi
-         ;;
-     esac
-     ;;
-   *hpux*)
-     case "$CXX" in
-       CC)
-         CXXFLAGS="$CXXFLAGS -pta -ti,/bin/true -tr,/bin/true"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS -Aa -z +a1"
-         DCXXFLAGS="-g"
-         OCXXFLAGS=""
-         ;;
-       aCC)
-         CXXFLAGS="$CXXFLAGS"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS +W829,302"
-         DCXXFLAGS="-g"
-         OCXXFLAGS=""
-         ;;
-       *)
-         if test -n "$GXX"; then
-           ACE_CXXFLAGS="$ACE_CXXFLAGS -w"
-         fi
-         ;;
-     esac
-     ;;
-   *irix*)
-
-     ;;
-   *linux*)
-     case "$CXX" in
-       *)
-         if test -n "$GXX"; then
-           CXXFLAGS="$CXXFLAGS"
-           ACE_CXXFLAGS="$ACE_CXXFLAGS"
-           DCXXFLAGS="$DCXXFLAGS"
-           OCXXFLAGS="-O3"
-         fi
-         ;;
-     esac
-     ;;
-   *lynxos*)
-     ;;
-   *m88k*)
-     ;;
-   *mvs*)
-     ;;
-   *netbsd*)
-     ;;
-   *osf*)
-     ;;
-   *psos*)
-     ;;
-   *sco*)
-     ;;
-   *sunos4*)
-     ;;
-   *solaris2*)
-     case "$CXX" in
-       CC)
-                  if (CC -V 2>&1 | egrep 'Compilers 4\.2' > /dev/null); then
-           CXXFLAGS="$CXXFLAGS -features=castop"
-           if test "$ace_user_enable_rtti" = yes; then
-             CXXFLAGS="$CXXFLAGS -features=rtti"
-           fi 
-         fi
-
-         if test "$ace_user_enable_exceptions" != yes; then
-           CXXFLAGS="$CXXFLAGS -noex"
-         fi
-
-         CXXFLAGS="$CXXFLAGS"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS"
-         DCXXFLAGS="$DCXXFLAGS -g"
-         OCXXFLAGS="$OCXXFLAGS -O"
-         LDFLAGS="$LDFLAGS -xildoff"
-         ;;
-     esac
-     ;;
-   *tandem*)
-     ;;
-   *unixware*)
-     ;;
-   *vxworks*)
-     ;;
-   *)
-     CXXFLAGS="$CXXFLAGS"
-     ACE_CXXFLAGS="$ACE_CXXFLAGS"
-     DCXXFLAGS="-g"
-     OCXXFLAGS="-O"
-     ;;
- esac
-
-
-
-case "$target" in
-  *aix3*)
-    ;;
-  *aix4.1*)
-    cat >> confdefs.h <<\EOF
-#define _BSD 44
-EOF
-
-    ;;
-  *aix4.2*)
-    cat >> confdefs.h <<\EOF
-#define _BSD 44
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define _BSD_INCLUDES 1
-EOF
-
-    ;;
-  t3e-cray-unicosmk*)
-    cat >> confdefs.h <<\EOF
-#define _CRAYMPP 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define _CRAYT3E 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define _UNICOS 
-EOF
-
-    ;;
-  t3e-cray*)
-    cat >> confdefs.h <<\EOF
-#define _CRAYT3E 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define _UNICOS 
-EOF
-
-    ;;
-  *cray-unicos*)
-    cat >> confdefs.h <<\EOF
-#define _UNICOS 
-EOF
-
-    ;;
-  *dgux4.11*)
-    LIBS="$LIBS -lc"
-    cat >> confdefs.h <<\EOF
-#define _POSIX_SOURCE 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define _DGUX_SOURCE 1
-EOF
-
-    ;;
-  *dgux4*)
-    LIBS="$LIBS -lc"
-    cat >> confdefs.h <<\EOF
-#define _POSIX4A_DRAFT10_SOURCE 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define _POSIX4_DRAFT_SOURCE 1
-EOF
-
-    ;;
-  *freebsd*)
-    LIBS="$LIBS -lcompat"
-    ;;
-  *hpux9*)
-    LIBS="$LIBS -lcma -lrt"
-    cat >> confdefs.h <<\EOF
-#define HPUX 1
-EOF
-
-    ;;
-  *hpux10*)
-    LIBS="$LIBS -lcma -lrt"
-    cat >> confdefs.h <<\EOF
-#define _HPUX_SOURCE 1
-EOF
-
-    ;;
-  *hpux11*)
-    LIBS="$LIBS -lcma -lrt"
-    ;;
-  *irix5.2*)
-    ;;
-  *irix5.3*)
-    if test -z "$GXX"; then
-      cat >> confdefs.h <<\EOF
-#define _BSD_TYPES 1
-EOF
-
-    fi
-    ;;
-  *irix6*)
-    cat >> confdefs.h <<\EOF
-#define _SGI_MP_SOURCE 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define _MODERN_C_ 1
-EOF
-
-    ;;
-  *linux*)
-    ;;
-  *lynxos*)
-    cat >> confdefs.h <<\EOF
-#define _POSIX_THREADS_CALLS 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define __NO_INCLUDE_WARN__ 1
-EOF
-
-    ;;
-  *m88k*)
-    ;;
-  *mvs*)
-    cat >> confdefs.h <<\EOF
-#define _ALL_SOURCE 1
-EOF
-
-    ;;
-  *netbsd*)
-    ;;
-  *osf3.2*)
-    LIBS="$LIBS -lmach -lsys5 -lcxx -lc -lrt"
-    ;;
-  *osf4.0*)
-    LIBS="$LIBS -lmach -lrt"
-    ;;
-  *psos*)
-    LIBS="$LIBS -lm"
-    ;;
-  *sco4.2*)
-    ;;
-  *sco5*)
-    cat >> confdefs.h <<\EOF
-#define _SVID3 1
-EOF
-
-    ;;
-  *sunos4*)
-    ;;
-  *solaris2.4*)
-    ;;
-  *solaris2.5*)
-    ;;
-  *solaris2.6*)
-    ;;
-  *86*solaris*)
-    ;;
-  *tandem*)
-    ;;
-  *unixware2.0*)
-    ;;
-  *unixware2.1*)
-    ;;
-  *vxworks*)
-    ;;
-  *cygwin32*)
-    ;;
-  *win32*)
-    ;;
-  *)
-    ;;
-esac
-
-
-
-if test "$ace_user_enable_xt_reactor" = yes; then
-XTREACTOR_TEST_XLIBS=""
-  T_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS $X_LIBS"
-
-
-  xt_reactor_go=no
-  echo $ac_n "checking for XmCreateRowColumn in -lXm""... $ac_c" 1>&6
-echo "configure:5213: checking for XmCreateRowColumn in -lXm" >&5
-ac_lib_var=`echo Xm'_'XmCreateRowColumn | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lXm -lXt $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5221 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char XmCreateRowColumn();
-
-int main() {
-XmCreateRowColumn()
-; return 0; }
-EOF
-if { (eval echo configure:5235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      
-     XTREACTOR_TEST_XLIBS="-lXm"
-     xt_reactor_go=yes
-    
-else
-  echo "$ac_t""no" 1>&6
-
-     cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MOTIF 1
-EOF
-
-     echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6
-echo "configure:5262: checking for XawInitializeWidgetSet in -lXaw" >&5
-ac_lib_var=`echo Xaw'_'XawInitializeWidgetSet | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lXaw -lXmu $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5270 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char XawInitializeWidgetSet();
-
-int main() {
-XawInitializeWidgetSet()
-; return 0; }
-EOF
-if { (eval echo configure:5284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-        XTREACTOR_TEST_XLIBS="-lXaw -lXmu"
-        xt_reactor_go=yes
-       
-else
-  echo "$ac_t""no" 1>&6
-
-        xt_reactor_go=no
-        echo "configure: warning: No usable X widget libraries were found." 1>&2
-        echo "configure: warning: XtReactor test compilation will be disabled." 1>&2
-       
-fi
-
-    
-fi
-
-
-  
-
-  
-
-if test X$xt_reactor_go = Xyes; then
-  COMPILE_XTREACTOR_TEST_TRUE=
-  COMPILE_XTREACTOR_TEST_FALSE='#'
-else
-  COMPILE_XTREACTOR_TEST_TRUE='#'
-  COMPILE_XTREACTOR_TEST_FALSE=
-fi
-
-  LDFLAGS="$T_LDFLAGS"
-
-fi 
-
-
- echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6
-echo "configure:5334: checking for library containing dlopen" >&5
-if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_dlopen="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 5345 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-dlopen();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_dlopen="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_dlopen" = "no" && for i in dl svld; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 5385 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-dlopen();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_dlopen="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_dlopen" 1>&6
-
-  if test "$ac_cv_search_dlopen" != "no"; then
-    test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS"
-    ace_has_svr4_dynamic_linking=yes
-  else :
-      
-   ace_has_svr4_dynamic_linking=no
-   echo $ac_n "checking for shl_get in -ldld""... $ac_c" 1>&6
-echo "configure:5438: checking for shl_get in -ldld" >&5
-ac_lib_var=`echo dld'_'shl_get | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5446 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shl_get();
-
-int main() {
-shl_get()
-; return 0; }
-EOF
-if { (eval echo configure:5460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo dld | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ldld $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  
-  fi
-
-
-
- echo $ac_n "checking for library containing socket""... $ac_c" 1>&6
-echo "configure:5493: checking for library containing socket" >&5
-if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_socket="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 5504 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char socket(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char socket();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_socket) || defined (__stub___socket)
-choke me
-#else
-socket();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_socket="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_socket" = "no" && for i in socket; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 5544 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char socket(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char socket();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_socket) || defined (__stub___socket)
-choke me
-#else
-socket();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_socket="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_socket" 1>&6
-
-  if test "$ac_cv_search_socket" != "no"; then
-    test "$ac_cv_search_socket" = "none required" || LIBS="$ac_cv_search_socket $LIBS"
-    
-  else :
-    
-  fi
-
-
- echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6
-echo "configure:5599: checking for library containing gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_gethostbyname="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 5610 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
-choke me
-#else
-gethostbyname();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_gethostbyname="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_gethostbyname" = "no" && for i in nsl; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 5650 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
-choke me
-#else
-gethostbyname();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_gethostbyname="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_gethostbyname" 1>&6
-
-  if test "$ac_cv_search_gethostbyname" != "no"; then
-    test "$ac_cv_search_gethostbyname" = "none required" || LIBS="$ac_cv_search_gethostbyname $LIBS"
-    
-  else :
-    
-  fi
-
-
- echo $ac_n "checking for library containing getservbyname""... $ac_c" 1>&6
-echo "configure:5705: checking for library containing getservbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_search_getservbyname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_getservbyname="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 5716 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getservbyname(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getservbyname();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getservbyname) || defined (__stub___getservbyname)
-choke me
-#else
-getservbyname();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_getservbyname="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_getservbyname" = "no" && for i in xnet; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 5756 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getservbyname(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getservbyname();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getservbyname) || defined (__stub___getservbyname)
-choke me
-#else
-getservbyname();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_getservbyname="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_getservbyname" 1>&6
-
-  if test "$ac_cv_search_getservbyname" != "no"; then
-    test "$ac_cv_search_getservbyname" = "none required" || LIBS="$ac_cv_search_getservbyname $LIBS"
-    
-  else :
-    cat >> confdefs.h <<\EOF
-#define ACE_LACKS_GETSERVBYNAME 1
-EOF
-
-  fi
-
-
-
- echo $ac_n "checking for library containing compile""... $ac_c" 1>&6
-echo "configure:5815: checking for library containing compile" >&5
-if eval "test \"`echo '$''{'ac_cv_search_compile'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_compile="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 5826 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char compile(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char compile();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_compile) || defined (__stub___compile)
-choke me
-#else
-compile();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_compile="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_compile" = "no" && for i in gen; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 5866 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char compile(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char compile();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_compile) || defined (__stub___compile)
-choke me
-#else
-compile();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_compile="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_compile" 1>&6
-
-  if test "$ac_cv_search_compile" != "no"; then
-    test "$ac_cv_search_compile" = "none required" || LIBS="$ac_cv_search_compile $LIBS"
-    
-  else :
-    
-  fi
-
-
- echo $ac_n "checking for library containing exc_continue""... $ac_c" 1>&6
-echo "configure:5921: checking for library containing exc_continue" >&5
-if eval "test \"`echo '$''{'ac_cv_search_exc_continue'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_exc_continue="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 5932 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char exc_continue(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char exc_continue();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_exc_continue) || defined (__stub___exc_continue)
-choke me
-#else
-exc_continue();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_exc_continue="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_exc_continue" = "no" && for i in exc; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 5972 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char exc_continue(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char exc_continue();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_exc_continue) || defined (__stub___exc_continue)
-choke me
-#else
-exc_continue();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_exc_continue="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_exc_continue" 1>&6
-
-  if test "$ac_cv_search_exc_continue" != "no"; then
-    test "$ac_cv_search_exc_continue" = "none required" || LIBS="$ac_cv_search_exc_continue $LIBS"
-    
-  else :
-    
-  fi
-
-
- echo $ac_n "checking for library containing ctime_r""... $ac_c" 1>&6
-echo "configure:6027: checking for library containing ctime_r" >&5
-if eval "test \"`echo '$''{'ac_cv_search_ctime_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_ctime_r="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 6038 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char ctime_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char ctime_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_ctime_r) || defined (__stub___ctime_r)
-choke me
-#else
-ctime_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_ctime_r="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_ctime_r" = "no" && for i in c_r; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 6078 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char ctime_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char ctime_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_ctime_r) || defined (__stub___ctime_r)
-choke me
-#else
-ctime_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_ctime_r="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_ctime_r" 1>&6
-
-  if test "$ac_cv_search_ctime_r" != "no"; then
-    test "$ac_cv_search_ctime_r" = "none required" || LIBS="$ac_cv_search_ctime_r $LIBS"
-    
-  else :
-    
-  fi
-
-
- echo $ac_n "checking for library containing t_accept""... $ac_c" 1>&6
-echo "configure:6133: checking for library containing t_accept" >&5
-if eval "test \"`echo '$''{'ac_cv_search_t_accept'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_t_accept="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 6144 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char t_accept(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char t_accept();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_t_accept) || defined (__stub___t_accept)
-choke me
-#else
-t_accept();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_t_accept="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_t_accept" = "no" && for i in xti tli_r tli nsl; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 6184 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char t_accept(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char t_accept();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_t_accept) || defined (__stub___t_accept)
-choke me
-#else
-t_accept();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_t_accept="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_t_accept" 1>&6
-
-  if test "$ac_cv_search_t_accept" != "no"; then
-    test "$ac_cv_search_t_accept" = "none required" || LIBS="$ac_cv_search_t_accept $LIBS"
-      ace_has_tli_funcs=yes
-  else :
-    ace_has_tli_funcs=no
-  fi
-
-
-if test "$ace_user_enable_threads" = yes; then
-  
-
- 
-  echo $ac_n "checking if compiler may need a thread flag""... $ac_c" 1>&6
-echo "configure:6243: checking if compiler may need a thread flag" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_may_need_thread_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-cat > conftest.$ac_ext <<EOF
-#line 6267 "configure"
-#include "confdefs.h"
-
-#ifndef _REENTRANT
-#error _REENTRANT was not defined
-THROW ME AN ERROR!
-#endif
-
-#ifdef __cplusplus
-extern "C"
-#endif
-
-
-char thr_create();
-
-int main() {
-
-thr_create();
-
-; return 0; }
-EOF
-if { (eval echo configure:6288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-       ace_cv_feature_may_need_thread_flag=no
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-  
-
-  cat > conftest.$ac_ext <<EOF
-#line 6301 "configure"
-#include "confdefs.h"
-
-#include <pthread.h>
-    
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  
-     cat > conftest.$ac_ext <<EOF
-
-#include <pthread.h>
-  ACE_REAL_FUNCTION pthread_create
-
-EOF
-
-     if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-        egrep "ACE_REAL_FUNCTION" | 
-        (eval "$AWK '{print \$2}' > conftest.awk 2>&1"); then
-          rm -f conftest.$ac_ext
-          ace_real_function=`cat conftest.awk`
-          rm -f conftest.awk
-     fi
-    
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-     ace_real_function="pthread_create"
-    
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 6340 "configure"
-#include "confdefs.h"
-
-#ifndef _REENTRANT
-#error _REENTRANT was not defined
-THROW ME AN ERROR!
-#endif
-
-#ifdef __cplusplus
-extern "C"
-#endif
-
-char $ace_real_function();
-
-int main() {
-
-$ace_real_function();
-
-; return 0; }
-EOF
-if { (eval echo configure:6360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-       ace_cv_feature_may_need_thread_flag=no
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_feature_may_need_thread_flag=yes
-      
-fi
-rm -f conftest*
-
-  
-fi
-rm -f conftest*
- 
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
-
-
-   
-fi
-
-  echo "$ac_t""$ace_cv_feature_may_need_thread_flag" 1>&6
-  if test "$ace_cv_feature_may_need_thread_flag" != no; then
-    ace_just_a_place_holder=fixme
-
-                    
- 
-  echo $ac_n "checking for compiler thread flag""... $ac_c" 1>&6
-echo "configure:6393: checking for compiler thread flag" >&5
-  if eval "test \"`echo '$''{'ace_cv_thread_flag_search'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ace_save_CXXFLAGS="$CXXFLAGS"
-    ace_save_CFLAGS="$CFLAGS"
-
-    for i in mt pthread pthreads mthreads threads Kthread -thread_safe; do
-      CXXFLAGS="$CXXFLAGS -$i"
-      CFLAGS="$CFLAGS -$i"
-
-      
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-cat > conftest.$ac_ext <<EOF
-#line 6424 "configure"
-#include "confdefs.h"
-
-#ifndef _REENTRANT
-#error _REENTRANT was not defined
-THROW ME AN ERROR!
-#endif
-
-#ifdef __cplusplus
-extern "C"
-#endif
-
-
-char thr_create();
-
-int main() {
-
-thr_create();
-
-; return 0; }
-EOF
-if { (eval echo configure:6445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ace_cv_thread_flag_search="-$i"
-
-                  break;
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-  
-
-  cat > conftest.$ac_ext <<EOF
-#line 6460 "configure"
-#include "confdefs.h"
-
-#include <pthread.h>
-    
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  
-     cat > conftest.$ac_ext <<EOF
-
-#include <pthread.h>
-  ACE_REAL_FUNCTION pthread_create
-
-EOF
-
-     if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-        egrep "ACE_REAL_FUNCTION" | 
-        (eval "$AWK '{print \$2}' > conftest.awk 2>&1"); then
-          rm -f conftest.$ac_ext
-          ace_real_function=`cat conftest.awk`
-          rm -f conftest.awk
-     fi
-    
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-     ace_real_function="pthread_create"
-    
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 6499 "configure"
-#include "confdefs.h"
-
-#ifndef _REENTRANT
-#error _REENTRANT was not defined
-THROW ME AN ERROR!
-#endif
-
-#ifdef __cplusplus
-extern "C"
-#endif
-
-char $ace_real_function();
-
-int main() {
-
-$ace_real_function();
-
-; return 0; }
-EOF
-if { (eval echo configure:6519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ace_cv_thread_flag_search="-$i"
-
-                  break;
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_thread_flag_search=no
-        
-fi
-rm -f conftest*
-
-  
-fi
-rm -f conftest*
- 
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
-
-
-
-            CXXFLAGS="$ace_save_CXXFLAGS"
-      CFLAGS="$ace_save_CFLAGS"
-    done
-
-                CXXFLAGS="$ace_save_CXXFLAGS"
-    CFLAGS="$ace_save_CFLAGS"
-   
-fi
-
-  echo "$ac_t""$ace_cv_thread_flag_search" 1>&6
-  if test "$ace_cv_thread_flag_search" != no; then
-    ace_just_a_place_holder=fixme
-
-        CXXFLAGS="$CXXFLAGS $ace_cv_thread_flag_search"
-    CFLAGS="$CFLAGS $ace_cv_thread_flag_search"
-
-    
-   
-  else
-    ace_just_a_place_holder=fixme
-
-    
-   
-
-  fi
-
-
-                     
-  else
-    ace_just_a_place_holder=fixme
-
-       
-
-  fi
-
-
-  
- echo $ac_n "checking for library containing thr_create""... $ac_c" 1>&6
-echo "configure:6583: checking for library containing thr_create" >&5
-if eval "test \"`echo '$''{'ac_cv_search_thr_create'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_thr_create="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 6594 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char thr_create(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char thr_create();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_thr_create) || defined (__stub___thr_create)
-choke me
-#else
-thr_create();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_thr_create="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_thr_create" = "no" && for i in thread; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 6634 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char thr_create(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char thr_create();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_thr_create) || defined (__stub___thr_create)
-choke me
-#else
-thr_create();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_thr_create="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_thr_create" 1>&6
-
-  if test "$ac_cv_search_thr_create" != "no"; then
-    test "$ac_cv_search_thr_create" = "none required" || LIBS="$ac_cv_search_thr_create $LIBS"
-    
-    ace_has_sthreads=yes
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_STHREADS 1
-EOF
-
-   
-  else :
-    
-    ace_has_sthreads=no
-   
-  fi
-
-
-   
- echo $ac_n "checking for library containing rwlock_destroy""... $ac_c" 1>&6
-echo "configure:6698: checking for library containing rwlock_destroy" >&5
-if eval "test \"`echo '$''{'ac_cv_search_rwlock_destroy'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_rwlock_destroy="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 6709 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char rwlock_destroy(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char rwlock_destroy();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_rwlock_destroy) || defined (__stub___rwlock_destroy)
-choke me
-#else
-rwlock_destroy();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_rwlock_destroy="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_rwlock_destroy" = "no" && for i in thread; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 6749 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char rwlock_destroy(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char rwlock_destroy();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_rwlock_destroy) || defined (__stub___rwlock_destroy)
-choke me
-#else
-rwlock_destroy();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_rwlock_destroy="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_rwlock_destroy" 1>&6
-
-  if test "$ac_cv_search_rwlock_destroy" != "no"; then
-    test "$ac_cv_search_rwlock_destroy" = "none required" || LIBS="$ac_cv_search_rwlock_destroy $LIBS"
-    
-  else :
-    
-  fi
-
-
-         
- 
-  echo $ac_n "checking for pthreads backward compatibility macros""... $ac_c" 1>&6
-echo "configure:6806: checking for pthreads backward compatibility macros" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_pthread_compat_macros'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 6812 "configure"
-#include "confdefs.h"
-
-#include <pthread.h>
-
-#if defined (pthread_create)
-  ACE_PTHREAD_MACROS
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_PTHREAD_MACROS" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-       ace_cv_lib_pthread_compat_macros=yes
-      
-else
-  rm -rf conftest*
-  
-       ace_cv_lib_pthread_compat_macros=no
-      
-fi
-rm -f conftest*
-
-   
-fi
-
-  echo "$ac_t""$ace_cv_lib_pthread_compat_macros" 1>&6
-  if test "$ace_cv_lib_pthread_compat_macros" != no; then
-    ace_just_a_place_holder=fixme
-
-            
-  
-
-  cat > conftest.$ac_ext <<EOF
-#line 6847 "configure"
-#include "confdefs.h"
-
-#include <pthread.h>
-    
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ace_header_exists=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ace_header_exists=no
-fi
-rm -f conftest*
-
-  cat > conftest.$ac_ext <<EOF
-
-#include <pthread.h>
-  ACE_REAL_FUNCTION pthread_create
-
-EOF
-
-  if test "$ace_header_exists" = yes; then
-    if test -z "$AWK"; then
-      echo "configure: warning: No awk program found.  "Real" function may not be found." 1>&2
-    fi
-
-    if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-       egrep "ACE_REAL_FUNCTION" | 
-       (eval "$AWK '{print \$2}' > conftest.awk 2>&1"); then
-         rm -f conftest.$ac_ext
-         ace_real_function=`cat conftest.awk`
-         rm -f conftest.awk
-    fi
-
-    if test pthread_create != "$ace_real_function"; then
-      echo $ac_n "checking for real pthread_create from pthread.h""... $ac_c" 1>&6
-echo "configure:6890: checking for real pthread_create from pthread.h" >&5
-      echo "$ac_t""$ace_real_function" 1>&6
-    fi
-  else
-    ace_real_function=pthread_create
-  fi 
-  echo $ac_n "checking for $ace_real_function""... $ac_c" 1>&6
-echo "configure:6897: checking for $ace_real_function" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ace_real_function'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6902 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ace_real_function(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ace_real_function();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ace_real_function) || defined (__stub___$ace_real_function)
-choke me
-#else
-$ace_real_function();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ace_real_function=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ace_real_function=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ace_real_function`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  ace_has_pthreads=yes
-       cat >> confdefs.h <<\EOF
-#define ACE_HAS_PTHREADS 1
-EOF
-
-      
-else
-  echo "$ac_t""no" 1>&6
-
-  
-
-  cat > conftest.$ac_ext <<EOF
-#line 6954 "configure"
-#include "confdefs.h"
-
-#include <pthread.h>
-    
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ace_header_exists=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ace_header_exists=no
-fi
-rm -f conftest*
-
-  cat > conftest.$ac_ext <<EOF
-
-#include <pthread.h>
-  ACE_REAL_FUNCTION pthread_create
-
-EOF
-
-  if test "$ace_header_exists" = yes; then
-    if test -z "$AWK"; then
-      echo "configure: warning: No awk program found.  "Real" function in library may not be found." 1>&2
-    fi
-
-    if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-       egrep "ACE_REAL_FUNCTION" |
-       eval "$AWK '{print \$2}'" > conftest.awk 2>&1; then
-        rm -f conftest.$ac_ext
-        ace_real_function=`cat conftest.awk`
-        rm -f conftest.awk
-    fi
-
-    if test pthread_create != "$ace_real_function"; then
-      echo $ac_n "checking for real pthread_create from pthread.h""... $ac_c" 1>&6
-echo "configure:6997: checking for real pthread_create from pthread.h" >&5
-      echo "$ac_t""$ace_real_function" 1>&6
-    fi
-  else
-    ace_real_function=pthread_create
-  fi 
-  echo $ac_n "checking for $ace_real_function in -lpthread""... $ac_c" 1>&6
-echo "configure:7004: checking for $ace_real_function in -lpthread" >&5
-ac_lib_var=`echo pthread'_'$ace_real_function | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lpthread  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7012 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ace_real_function();
-
-int main() {
-$ace_real_function()
-; return 0; }
-EOF
-if { (eval echo configure:7026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  ace_has_pthreads=yes
-                                        LIBS="$LIBS -lpthread"
-          cat >> confdefs.h <<\EOF
-#define ACE_HAS_PTHREADS 1
-EOF
-
-         
-else
-  echo "$ac_t""no" 1>&6
-ace_has_pthreads=yes
-         
-fi
-
-
-      
-fi
-
-
-   
-  else
-    ace_just_a_place_holder=fixme
-
-    
- echo $ac_n "checking for library containing pthread_create""... $ac_c" 1>&6
-echo "configure:7065: checking for library containing pthread_create" >&5
-if eval "test \"`echo '$''{'ac_cv_search_pthread_create'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_pthread_create="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 7076 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_create(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_create();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_create) || defined (__stub___pthread_create)
-choke me
-#else
-pthread_create();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_pthread_create="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_pthread_create" = "no" && for i in pthread pthreads c_r gthreads; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 7116 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_create(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_create();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_create) || defined (__stub___pthread_create)
-choke me
-#else
-pthread_create();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_pthread_create="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_pthread_create" 1>&6
-
-  if test "$ac_cv_search_pthread_create" != "no"; then
-    test "$ac_cv_search_pthread_create" = "none required" || LIBS="$ac_cv_search_pthread_create $LIBS"
-    
-       ace_has_pthreads=yes
-       cat >> confdefs.h <<\EOF
-#define ACE_HAS_PTHREADS 1
-EOF
-
-      
-  else :
-    
-       ace_has_pthreads=no
-      
-  fi
-
-   
-
-  fi
-
-
-
-  if test "$ace_has_pthreads" != yes && 
-    test "$ace_has_sthreads" != yes; then
-   ace_user_enable_threads=no
- fi
-
-fi 
-
- echo $ac_n "checking for library containing sched_yield""... $ac_c" 1>&6
-echo "configure:7191: checking for library containing sched_yield" >&5
-if eval "test \"`echo '$''{'ac_cv_search_sched_yield'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_sched_yield="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 7202 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sched_yield(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sched_yield();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sched_yield) || defined (__stub___sched_yield)
-choke me
-#else
-sched_yield();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_sched_yield="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_sched_yield" = "no" && for i in posix4; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 7242 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sched_yield(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sched_yield();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sched_yield) || defined (__stub___sched_yield)
-choke me
-#else
-sched_yield();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_sched_yield="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_sched_yield" 1>&6
-
-  if test "$ac_cv_search_sched_yield" != "no"; then
-    test "$ac_cv_search_sched_yield" = "none required" || LIBS="$ac_cv_search_sched_yield $LIBS"
-    ace_has_sched_yield=yes
-  else :
-    
-  fi
-
-
- 
- 
- 
-
-      ace_save_LIBS="$LIBS"
-
-      
- echo $ac_n "checking for library containing aio_read""... $ac_c" 1>&6
-echo "configure:7304: checking for library containing aio_read" >&5
-if eval "test \"`echo '$''{'ac_cv_search_aio_read'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_aio_read="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 7315 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char aio_read(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char aio_read();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_aio_read) || defined (__stub___aio_read)
-choke me
-#else
-aio_read();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_aio_read="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_aio_read" = "no" && for i in aio posix4 rt; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 7355 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char aio_read(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char aio_read();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_aio_read) || defined (__stub___aio_read)
-choke me
-#else
-aio_read();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_aio_read="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_aio_read" 1>&6
-
-  if test "$ac_cv_search_aio_read" != "no"; then
-    test "$ac_cv_search_aio_read" = "none required" || LIBS="$ac_cv_search_aio_read $LIBS"
-        ace_has_aio_funcs=yes
-  else :
-    ace_has_aio_funcs=no
-  fi
-
-
-if test "$ace_has_aio_funcs" = yes; then
-  
-  echo $ac_n "checking for working asynchronous IO""... $ac_c" 1>&6
-echo "configure:7412: checking for working asynchronous IO" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_aio_calls'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     if test "$cross_compiling" = yes; then
-  
-                                cat > conftest.$ac_ext <<EOF
-#line 7420 "configure"
-#include "confdefs.h"
-
-#include <aio.h>
-          
-int main() {
-
-           aiocb* aiocb_ptr (void);
-          
-; return 0; }
-EOF
-if { (eval echo configure:7431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           ace_cv_feature_aio_calls=yes
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           ace_cv_feature_aio_calls=no
-          
-fi
-rm -f conftest*
-       
-else
-  cat > conftest.$ac_ext <<EOF
-#line 7448 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-#ifndef ACE_LACKS_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#include <signal.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
-#include <iostream.h>
-
-#include <aio.h>
-
-class Test_Aio
-{
-public:
-  Test_Aio (void);
-  // Default constructor.
-
-  int init (void);
-  // Initting the output file and the buffer.
-
-  int do_aio (void);
-  // Doing the testing stuff.
-
-  ~Test_Aio (void);
-  // Destructor.
-private:
-  int out_fd_;
-  // Output file descriptor.
-
-  struct aiocb *aiocb_write_;
-  // For writing to the file.
-
-  struct aiocb *aiocb_read_;
-  // Reading stuff from the file.
-
-  char *buffer_write_;
-  // The buffer to be written to the out_fd.
-
-  char *buffer_read_;
-  // The buffer to be read back from the file.
-};
-
-Test_Aio::Test_Aio (void)
-  : aiocb_write_ (new struct aiocb),
-    aiocb_read_ (new struct aiocb),
-    buffer_write_ (0),
-    buffer_read_ (0)
-{
-}
-
-Test_Aio::~Test_Aio (void)
-{
-  delete aiocb_write_;
-  delete aiocb_read_;
-  delete buffer_write_;
-  delete buffer_read_;
-}
-
-// Init the output file and init the buffer.
-int
-Test_Aio::init (void)
-{
-  // Open the output file.
-  this->out_fd_ = open ("test_aio.log", O_RDWR | O_CREAT | O_TRUNC, 0666);
-  if (this->out_fd_ == 0)
-    {
-      //cout << "Error : Opening file" << endl;
-      return -1;
-    }
-
-  // Init the buffers.
-  this->buffer_write_ = strdup ("Welcome to the world of AIO... AIO Rules !!!");
-  // cout << "The buffer : " << this->buffer_write_ << endl;
-  this->buffer_read_ = new char [strlen (this->buffer_write_)];
-
-  return 0;
-}
-
-// Set the necessary things for the AIO stuff.
-// Write the buffer asynchly.hmm Disable signals.
-// Go on aio_suspend. Wait for completion.
-// Print out the result.
-int
-Test_Aio::do_aio (void)
-{
-  // = Write to the file.
-
-  // Setup AIOCB.
-  this->aiocb_write_->aio_fildes = this->out_fd_;
-  this->aiocb_write_->aio_offset = 0;
-  this->aiocb_write_->aio_buf = this->buffer_write_;
-  this->aiocb_write_->aio_nbytes = strlen (this->buffer_write_);
-  this->aiocb_write_->aio_reqprio = 0;
-  this->aiocb_write_->aio_sigevent.sigev_notify = SIGEV_NONE;
-  //this->this->aiocb_.aio_sigevent.sigev_signo = SIGRTMAX;
-  this->aiocb_write_->aio_sigevent.sigev_value.sival_ptr =
-    (void *) this->aiocb_write_;
-
-  // Fire off the aio write.
-  if (aio_write (this->aiocb_write_) != 0)
-    {
-      perror ("aio_write");
-      return -1;
-    }
-
-  // = Read from that file.
-
-  // Setup AIOCB.
-  this->aiocb_read_->aio_fildes = this->out_fd_;
-  this->aiocb_read_->aio_offset = 0;
-  this->aiocb_read_->aio_buf = this->buffer_read_;
-  this->aiocb_read_->aio_nbytes = strlen (this->buffer_write_);
-  this->aiocb_read_->aio_reqprio = 0;
-  this->aiocb_read_->aio_sigevent.sigev_notify = SIGEV_NONE;
-  //this->this->aiocb_.aio_sigevent.sigev_signo = SIGRTMAX;
-  this->aiocb_read_->aio_sigevent.sigev_value.sival_ptr =
-    (void *) this->aiocb_read_;
-
-  // Fire off the aio write. If it doesnt get queued, carry on to get
-  // the completion for the first one.
-  if (aio_read (this->aiocb_read_) < 0)
-    perror ("aio_read");
-  
-  // Wait for the completion on aio_suspend.
-  struct aiocb *list_aiocb[2];
-  list_aiocb [0] = this->aiocb_write_;
-  list_aiocb [1] = this->aiocb_read_;
-
-  // Do suspend till all the aiocbs in the list are done.
-  int done = 0;
-  int return_val = 0;
-  while (!done)
-    {
-      return_val = aio_suspend (list_aiocb,
-                                2,
-                                0);
-      cerr << "Return value :" << return_val << endl;
-
-      // Analyze return and error values.
-      if (aio_error (list_aiocb [0]) != EINPROGRESS)
-        {
-          if (aio_return (list_aiocb [0]) == -1)
-            {
-              perror ("aio_return");
-              return -1;
-            }
-          else
-            {
-              // Successful. Store the pointer somewhere and make the
-              // entry NULL in the list.
-              this->aiocb_write_ = list_aiocb [0];
-              list_aiocb [0] = 0;
-            }
-        }
-      else
-        //cout << "AIO in progress" << endl;
-
-      if (aio_error (list_aiocb [1]) != EINPROGRESS)
-        {
-          if (aio_return (list_aiocb [1]) == -1)
-            {
-              perror ("aio_return");
-              return -1;
-            }
-          else
-            {
-              // Successful. Store the pointer somewhere and make the
-              // entry NULL in the list.
-              this->aiocb_read_ = list_aiocb [1];
-              list_aiocb [1] = 0;
-            }
-        }
-      else
-        //cout << "AIO in progress" << endl;
-
-      // Is it done?
-      if ((list_aiocb [0] == 0) && (list_aiocb [1] == 0))
-        done = 1;
-    }
-
-  //cout << "Both the AIO operations done." << endl;
-  //cout << "The buffer is :" << this->buffer_read_ << endl;
-  
-  return 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  Test_Aio test_aio;
-
-  if (test_aio.init () != 0)
-    {
-      //printf ("AIOCB test failed:\n"
-      //        "ACE_POSIX_AIOCB_PROACTOR may not work in this platform\n");
-      return -1;
-    }
-  
-  if (test_aio.do_aio () != 0)
-    {
-      //printf ("AIOCB test failed:\n"
-      //        "ACE_POSIX_AIOCB_PROACTOR may not work in this platform\n"); 
-      return -1;
-    }
-  //printf ("AIOCB test successful:\n"
-  //        "ACE_POSIX_AIOCB_PROACTOR should work in this platform\n");
-  return 0;
-}
-       
-EOF
-if { (eval echo configure:7669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  
-                if test "$cross_compiling" = yes; then
-  
-                                                            ace_just_a_place_holder=ignoreme
-         
-else
-  cat > conftest.$ac_ext <<EOF
-#line 7678 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-#ifndef ACE_LACKS_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#include <signal.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
-
-#include <limits.h>
-
-#include <aio.h>
-
-
-int file_handle = -1;
-char mb1 [BUFSIZ + 1];
-char mb2 [BUFSIZ + 1];
-aiocb aiocb1, aiocb2;
-sigset_t completion_signal;
-
-// Function prototypes.
-int setup_signal_delivery (void);
-int issue_aio_calls (void);
-int query_aio_completions (void);
-int test_aio_calls (void);
-int setup_signal_handler (void);
-int setup_signal_handler (int signal_number);
-
-int 
-setup_signal_delivery (void)
-{
-  // Make the sigset_t consisting of the completion signal.
-  if (sigemptyset (&completion_signal) == -1)
-    {
-      perror ("Error:Couldnt init the RT completion signal set\n");
-      return -1;
-    }
-  
-  if (sigaddset (&completion_signal, SIGRTMIN) == -1)
-    {
-      perror ("Error:Couldnt init the RT completion signal set\n");
-      return -1;
-    }
-  
-  // Mask them.
-  if (pthread_sigmask (SIG_BLOCK, &completion_signal, 0) == -1)
-    {
-      perror ("Error:Couldnt maks the RT completion signals\n");
-      return -1;
-    }
-  
-  return setup_signal_handler (SIGRTMIN);
-}
-
-int
-issue_aio_calls (void)
-{
-  // Setup AIOCB.
-  aiocb1.aio_fildes = file_handle;
-  aiocb1.aio_offset = 0;
-  aiocb1.aio_buf = mb1;
-  aiocb1.aio_nbytes = BUFSIZ;
-  aiocb1.aio_reqprio = 0;
-  aiocb1.aio_sigevent.sigev_notify = SIGEV_SIGNAL;
-  aiocb1.aio_sigevent.sigev_signo = SIGRTMIN;
-  aiocb1.aio_sigevent.sigev_value.sival_ptr = (void *) &aiocb1; 
-  
-  // Fire off the aio write.
-  if (aio_read (&aiocb1) == -1)
-    {
-      // Queueing failed.
-      perror ("Error:Asynch_Read_Stream: aio_read queueing failed\n");
-      return -1;
-    }
-  
-  // Setup AIOCB.
-  aiocb2.aio_fildes = file_handle;
-  aiocb2.aio_offset = BUFSIZ + 1;
-  aiocb2.aio_buf = mb2;
-  aiocb2.aio_nbytes = BUFSIZ;
-  aiocb2.aio_reqprio = 0;
-  aiocb2.aio_sigevent.sigev_notify = SIGEV_SIGNAL;
-  aiocb2.aio_sigevent.sigev_signo = SIGRTMIN;
-  aiocb2.aio_sigevent.sigev_value.sival_ptr = (void *) &aiocb2; 
-  
-  // Fire off the aio write.
-  if (aio_read (&aiocb2) == -1)
-    {
-      // Queueing failed.
-      perror ("Error:Asynch_Read_Stream: aio_read queueing failed\n");
-      return -1;
-    }
-  return 0;
-}
-
-int
-query_aio_completions (void)
-{
-  int result = 0;
-  size_t number_of_compleions = 0;
-  for (number_of_compleions = 0;
-       number_of_compleions < 2;
-       number_of_compleions ++)
-    {
-      // Wait for <milli_seconds> amount of time.
-      // @@ Assigning <milli_seconds> to tv_sec.
-      timespec timeout;
-      timeout.tv_sec = INT_MAX;
-      timeout.tv_nsec = 0;
-  
-      // To get back the signal info.
-      siginfo_t sig_info;
-      
-      // Await the RT completion signal.
-      int sig_return = sigtimedwait (&completion_signal,
-                                     &sig_info,
-                                     &timeout);
-      
-      // Error case.
-      // If failure is coz of timeout, then return *0* but set
-      // errno appropriately. This is what the WinNT proactor
-      // does.
-      if (sig_return == -1)
-        {
-          perror ("Error:Error waiting for RT completion signals\n");
-          return -1;
-        }
-      
-      // RT completion signals returned.
-      if (sig_return != SIGRTMIN)
-        {
-          //printf ("Unexpected signal (%d) has been received while waiting for RT Completion Signals\n",
-          //        sig_return);
-          return -1;
-        }
-      
-      // @@ Debugging.
-      //printf ("Sig number found in the sig_info block : %d\n",
-      //        sig_info.si_signo);
-  
-      // Is the signo returned consistent?
-      if (sig_info.si_signo != sig_return)
-        {
-          //printf ("Inconsistent signal number (%d) in the signal info block\n",
-          //        sig_info.si_signo);
-          return -1;
-        }
-  
-      // @@ Debugging.
-      //printf ("Signal code for this signal delivery : %d\n",
-      //        sig_info.si_code);
-  
-      // Is the signal code an aio completion one?
-      if ((sig_info.si_code != SI_ASYNCIO) &&
-          (sig_info.si_code != SI_QUEUE))
-        {
-          //printf ("Unexpected signal code (%d) returned on completion querying\n",
-          //        sig_info.si_code);
-          return -1;
-        }
-  
-      // Retrive the aiocb.
-      aiocb* aiocb_ptr = (aiocb *) sig_info.si_value.sival_ptr;
-      
-      // Analyze error and return values. Return values are
-      // actually <errno>'s associated with the <aio_> call
-      // corresponding to aiocb_ptr.
-      int error_code = aio_error (aiocb_ptr);
-      if (error_code == -1)
-        {
-          perror ("Error:Invalid control block was sent to <aio_error> for compleion querying\n");
-          return -1;
-        }
-  
-      if (error_code != 0)
-        {
-          // Error occurred in the <aio_>call. Return the errno
-          // corresponding to that <aio_> call.
-          //printf ("Error:An AIO call has failed:Error code = %d\n",
-          //        error_code);
-          return -1;
-        }
-
-      // No error occured in the AIO operation.
-      int nbytes = aio_return (aiocb_ptr);
-      if (nbytes == -1)
-        {
-          perror ("Error:Invalid control block was send to <aio_return>\n");
-          return -1;
-        }
-      
-      if (number_of_compleions == 0)
-        // Print the buffer.
-        //printf ("Number of bytes transferred : %d\n The buffer : %s \n",
-        //        nbytes,
-        //        mb1);
-      else
-        // Print the buffer.
-        //printf ("Number of bytes transferred : %d\n The buffer : %s \n",
-        //        nbytes,
-        //        mb2);
-    }
-  return 0;
-}
-
-int
-test_aio_calls (void) 
-{
-  // Set up the input file.
-  // Open file (in SEQUENTIAL_SCAN mode)
-  file_handle = open ("test_aiosig.cpp", O_RDONLY);
-  
-  if (file_handle == -1)
-    {
-      perror ("Error:Opening the inputfile");
-      return -1;
-    }
-  
-  if (setup_signal_delivery () < 0)
-    return -1;
-  
-  if (issue_aio_calls () < 0)
-    return -1;
-  
-  if (query_aio_completions () < 0)
-    return -1;
-  
-  return 0;
-}
-
-int
-setup_signal_handler (int signal_number)
-{
-   // Setting up the handler(!) for these signals.
-  struct sigaction reaction;
-  sigemptyset (&reaction.sa_mask);   // Nothing else to mask.
-  reaction.sa_flags = SA_SIGINFO;    // Realtime flag.
-#if defined (SA_SIGACTION)
-  // Lynx says, it is better to set this bit to be portable.
-  reaction.sa_flags &= SA_SIGACTION;
-#endif /* SA_SIGACTION */      
-  reaction.sa_sigaction = null_handler;     // Null handler.
-  int sigaction_return = sigaction (SIGRTMIN,
-                                    &reaction,
-                                    0);
-  if (sigaction_return == -1)
-    {
-      perror ("Error:Proactor couldnt do sigaction for the RT SIGNAL");
-      return -1;
-    }
-  
-  return 0;
-}
-
-void
-null_handler (int         /* signal_number */,
-              siginfo_t * /* info */,
-              void *      /* context */)
-{
-}
-
-int
-main (int, char *[])
-{
-  if (test_aio_calls () == 0)
-    //printf ("RT SIG test successful:\n"
-    //        "ACE_POSIX_SIG_PROACTOR should work in this platform\n");
-  else
-    //printf ("RT SIG test failed:\n"
-    //        "ACE_POSIX_SIG_PROACTOR may not work in this platform\n");
-  return 0;
-}
-         
-EOF
-if { (eval echo configure:7962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  
-          ace_cv_feature_aio_calls=yes
-         
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  
-          ace_cv_feature_aio_calls=no
-         
-fi
-rm -fr conftest*
-fi
-
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  
-        ace_cv_feature_aio_calls=no
-       
-fi
-rm -fr conftest*
-fi
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_feature_aio_calls" 1>&6
-  if test "$ace_cv_feature_aio_calls" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_AIO_CALLS 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-LIBS="$ace_save_LIBS"
-
-  fi
-
-fi 
-
-
- echo $ac_n "checking for library containing clock_gettime""... $ac_c" 1>&6
-echo "configure:8010: checking for library containing clock_gettime" >&5
-if eval "test \"`echo '$''{'ac_cv_search_clock_gettime'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ac_func_search_save_LIBS="$LIBS"
-
-    ac_cv_search_clock_gettime="no"
-
-    
-cat > conftest.$ac_ext <<EOF
-#line 8021 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char clock_gettime(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char clock_gettime();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime)
-choke me
-#else
-clock_gettime();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:8047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_clock_gettime="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-
-    test "$ac_cv_search_clock_gettime" = "no" && for i in posix4; do
-      LIBS="-l$i  $ac_func_search_save_LIBS"
-      
-cat > conftest.$ac_ext <<EOF
-#line 8061 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char clock_gettime(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char clock_gettime();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime)
-choke me
-#else
-clock_gettime();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:8087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ac_cv_search_clock_gettime="-l$i"
-         break
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-    done
-
-    LIBS="$ac_func_search_save_LIBS"
-   
-fi
-
-echo "$ac_t""$ac_cv_search_clock_gettime" 1>&6
-
-  if test "$ac_cv_search_clock_gettime" != "no"; then
-    test "$ac_cv_search_clock_gettime" = "none required" || LIBS="$ac_cv_search_clock_gettime $LIBS"
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_CLOCK_GETTIME 1
-EOF
-
-  else :
-    
-  fi
-
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=no
-fi
-
-
-
-
-save_CC="$CC"
-CC="$CXX"
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=yes
-fi
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_fast_install=yes
-fi
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8196: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:8235: checking for ld used by GCC" >&5
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:8259: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:8262: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:8298: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
-
-
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:8314: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  ac_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$ac_dir/nm -B"
-	break
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$ac_dir/nm -p"
-	break
-      else
-	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-fi
-fi
-
-NM="$ac_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
-
-
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-libtool_flags="$libtool_flags --enable-dlopen"
-
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-  :
-fi
-
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 8374 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:8375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:8396: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8401 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:8408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-
-esac
-
-
-# Save cache, so that ltconfig can load it
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
-# Reload cache, that may have been modified by ltconfig
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-
-
-CC="$save_CC"
-
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:8518: checking for $ac_hdr that defines DIR" >&5
-if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8523 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <$ac_hdr>
-int main() {
-DIR *dirp = 0;
-; return 0; }
-EOF
-if { (eval echo configure:8531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_header_dirent_$ac_safe=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_dirent_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- ac_header_dirent=$ac_hdr; break
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:8556: checking for opendir in -ldir" >&5
-ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldir  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 8564 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char opendir();
-
-int main() {
-opendir()
-; return 0; }
-EOF
-if { (eval echo configure:8578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -ldir"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:8600: checking for opendir in -lx" >&5
-ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lx  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 8608 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char opendir();
-
-int main() {
-opendir()
-; return 0; }
-EOF
-if { (eval echo configure:8622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lx"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-
-if test "$ac_cv_header_dirent_dirent_h" = yes ||
-   test "$ac_cv_header_dirent_sys_ndir_h" = yes ||
-   test "$ac_cv_header_dirent_sys_dir_h" = yes ||
-   test "$ac_cv_header_dirent_ndir_h" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_DIRENT 1
-EOF
-
-fi
-
-echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:8656: checking for sys/wait.h that is POSIX.1 compatible" >&5
-if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8661 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/wait.h>
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif
-int main() {
-int s;
-wait (&s);
-s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-; return 0; }
-EOF
-if { (eval echo configure:8677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_header_sys_wait_h=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_sys_wait_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
-if test $ac_cv_header_sys_wait_h = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_SYS_WAIT_H 1
-EOF
-
-fi
-
-
-if test "$ac_cv_cygwin" = yes; then
-  ac_safe=`echo "cygwin32/socket.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for cygwin32/socket.h""... $ac_c" 1>&6
-echo "configure:8701: checking for cygwin32/socket.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8706 "configure"
-#include "confdefs.h"
-#include <cygwin32/socket.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-       cat >> confdefs.h <<\EOF
-#define ACE_HAS_CYGWIN32_SOCKET_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:8739: checking for dlfcn.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8744 "configure"
-#include "confdefs.h"
-#include <dlfcn.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-                     if test "$ace_has_svr4_dynamic_linking" = yes; then
-     cat >> confdefs.h <<\EOF
-#define ACE_HAS_SVR4_DYNAMIC_LINKING 1
-EOF
-
-   fi
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "malloc.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for malloc.h""... $ac_c" 1>&6
-echo "configure:8780: checking for malloc.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8785 "configure"
-#include "confdefs.h"
-#include <malloc.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MALLOC_H 1
-EOF
-
-fi
-
-
-ac_safe=`echo "memory.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for memory.h""... $ac_c" 1>&6
-echo "configure:8818: checking for memory.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8823 "configure"
-#include "confdefs.h"
-#include <memory.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MEMORY_H 1
-EOF
-
-fi
-
-
-ac_safe=`echo "bytesex.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for bytesex.h""... $ac_c" 1>&6
-echo "configure:8856: checking for bytesex.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8861 "configure"
-#include "confdefs.h"
-#include <bytesex.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_BYTESEX_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:8894: checking for sys/msg.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8899 "configure"
-#include "confdefs.h"
-#include <sys/msg.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   
-  echo $ac_n "checking if _KERNEL is needed for msg prototypes""... $ac_c" 1>&6
-echo "configure:8923: checking if _KERNEL is needed for msg prototypes" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_broken_msg_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 8929 "configure"
-#include "confdefs.h"
-
-#include <sys/msg.h>
-        
-int main() {
-
-         struct msg ace_msg;
-        
-; return 0; }
-EOF
-if { (eval echo configure:8940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_broken_msg_h=no
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         cat > conftest.$ac_ext <<EOF
-#line 8951 "configure"
-#include "confdefs.h"
-
-#ifndef _KERNEL
-# define _KERNEL
-#endif
-#include <sys/msg.h>
-           
-int main() {
-
-            struct msg ace_msg;
-           
-; return 0; }
-EOF
-if { (eval echo configure:8965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-            ace_cv_lib_broken_msg_h=yes
-           
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                        ace_cv_lib_broken_msg_h=no
-           
-fi
-rm -f conftest*
-        
-fi
-rm -f conftest*
-     
-fi
-
-  echo "$ac_t""$ace_cv_lib_broken_msg_h" 1>&6
-  if test "$ace_cv_lib_broken_msg_h" != no; then
-    ace_just_a_place_holder=fixme
-
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_MSG_H 1
-EOF
-
-     
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-  
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SYSV_MSG_H 1
-EOF
-
-fi
-
-
-ac_safe=`echo "sys/param.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/param.h""... $ac_c" 1>&6
-echo "configure:9011: checking for sys/param.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9016 "configure"
-#include "confdefs.h"
-#include <sys/param.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_PARAM_H 1
-EOF
-
-fi
-
-
-ac_safe=`echo "sys/priocntl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/priocntl.h""... $ac_c" 1>&6
-echo "configure:9049: checking for sys/priocntl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9054 "configure"
-#include "confdefs.h"
-#include <sys/priocntl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "ucontext.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for ucontext.h""... $ac_c" 1>&6
-echo "configure:9083: checking for ucontext.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9088 "configure"
-#include "confdefs.h"
-#include <ucontext.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_UCONTEXT_H 1
-EOF
-
-fi
-
-
-ac_safe=`echo "sys/procfs.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/procfs.h""... $ac_c" 1>&6
-echo "configure:9121: checking for sys/procfs.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9126 "configure"
-#include "confdefs.h"
-#include <sys/procfs.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-            
-  echo $ac_n "checking if sys/procfs.h conflicts with ucontext.h""... $ac_c" 1>&6
-echo "configure:9150: checking if sys/procfs.h conflicts with ucontext.h" >&5
-  if eval "test \"`echo '$''{'ace_has_procfs_conflict'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 9156 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_UCONTEXT_H
-# include <ucontext.h>
-#endif
-
-#include <sys/procfs.h>
-        
-int main() {
-
-         int a = 0;
-        
-; return 0; }
-EOF
-if { (eval echo configure:9171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_has_procfs_conflict=no
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_has_procfs_conflict=yes
-        
-fi
-rm -f conftest*
-     
-fi
-
-  echo "$ac_t""$ace_has_procfs_conflict" 1>&6
-  if test "$ace_has_procfs_conflict" != no; then
-    ace_just_a_place_holder=fixme
-
-     
-  else
-    ace_just_a_place_holder=fixme
-
-            cat >> confdefs.h <<\EOF
-#define ACE_HAS_PROC_FS 1
-EOF
-
-     
-
-  fi
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "sys/select.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/select.h""... $ac_c" 1>&6
-echo "configure:9212: checking for sys/select.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9217 "configure"
-#include "confdefs.h"
-#include <sys/select.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_SELECT_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "netinet/tcp.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for netinet/tcp.h""... $ac_c" 1>&6
-echo "configure:9249: checking for netinet/tcp.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9254 "configure"
-#include "confdefs.h"
-#include <netinet/tcp.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_TCP_H 1
-EOF
-
-fi
-
-
-ac_safe=`echo "sys/sockio.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/sockio.h""... $ac_c" 1>&6
-echo "configure:9287: checking for sys/sockio.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9292 "configure"
-#include "confdefs.h"
-#include <sys/sockio.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_SOCKIO_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "sysent.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sysent.h""... $ac_c" 1>&6
-echo "configure:9324: checking for sysent.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9329 "configure"
-#include "confdefs.h"
-#include <sysent.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_SYSENT_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "sys/systeminfo.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/systeminfo.h""... $ac_c" 1>&6
-echo "configure:9361: checking for sys/systeminfo.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9366 "configure"
-#include "confdefs.h"
-#include <sys/systeminfo.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-ac_safe=`echo "sys/filio.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/filio.h""... $ac_c" 1>&6
-echo "configure:9394: checking for sys/filio.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9399 "configure"
-#include "confdefs.h"
-#include <sys/filio.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_SYS_FILIO_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "sys/uio.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/uio.h""... $ac_c" 1>&6
-echo "configure:9431: checking for sys/uio.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9436 "configure"
-#include "confdefs.h"
-#include <sys/uio.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-ac_safe=`echo "sys/ioctl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/ioctl.h""... $ac_c" 1>&6
-echo "configure:9464: checking for sys/ioctl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9469 "configure"
-#include "confdefs.h"
-#include <sys/ioctl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-     cat >> confdefs.h <<\EOF
-#define ACE_HAS_SYS_IOCTL_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "sys/types.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/types.h""... $ac_c" 1>&6
-echo "configure:9501: checking for sys/types.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9506 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SYS_TYPES_H 1
-EOF
-
-fi
-
-
-ac_safe=`echo "sys/termios.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/termios.h""... $ac_c" 1>&6
-echo "configure:9539: checking for sys/termios.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9544 "configure"
-#include "confdefs.h"
-#include <sys/termios.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   cat > conftest.$ac_ext <<EOF
-#line 9567 "configure"
-#include "confdefs.h"
-
-#include <sys/termios.h>
-
-#if defined (ACE_HAS_SYS_IOCTL_H)
-# include <sys/ioctl.h>
-#endif
-
-#if defined(TCGETS) && defined(TCSETS)
-          ACE_WITH_TERM_IOCTLS
-#elif defined(TCGETA) && defined(TCSETA)
-          ACE_WITH_TERM_IOCTLS
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_WITH_TERM_IOCTLS" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-       cat >> confdefs.h <<\EOF
-#define ACE_HAS_TERM_IOCTLS 1
-EOF
-
-      
-fi
-rm -f conftest*
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test "$ace_has_tli_funcs" = yes; then
-ac_safe=`echo "xti.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for xti.h""... $ac_c" 1>&6
-echo "configure:9604: checking for xti.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9609 "configure"
-#include "confdefs.h"
-#include <xti.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   ace_has_tli=yes
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_XTI 1
-EOF
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_TLI 1
-EOF
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "sys/xti.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/xti.h""... $ac_c" 1>&6
-echo "configure:9648: checking for sys/xti.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9653 "configure"
-#include "confdefs.h"
-#include <sys/xti.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   ace_has_tli=yes
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_SYS_XTI_H 1
-EOF
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_XTI 1
-EOF
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_TLI 1
-EOF
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "sys/timod.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/timod.h""... $ac_c" 1>&6
-echo "configure:9696: checking for sys/timod.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9701 "configure"
-#include "confdefs.h"
-#include <sys/timod.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_TIMOD_H 1
-EOF
-
-  
-else
-  echo "$ac_t""no" 1>&6
-
-   ac_safe=`echo "tli/timod.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for tli/timod.h""... $ac_c" 1>&6
-echo "configure:9733: checking for tli/timod.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9738 "configure"
-#include "confdefs.h"
-#include <tli/timod.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_OSF_TIMOD_H 1
-EOF
-
-     
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  
-fi
-
-
-ac_safe=`echo "tiuser.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for tiuser.h""... $ac_c" 1>&6
-echo "configure:9775: checking for tiuser.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9780 "configure"
-#include "confdefs.h"
-#include <tiuser.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   ace_has_tli=yes
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_TIUSER_H 1
-EOF
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_TLI 1
-EOF
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test "$ac_cv_header_tiuser_h" = yes; then
-  
-  echo $ac_n "checking if tiuser.h is protected by extern \"C\"""... $ac_c" 1>&6
-echo "configure:9820: checking if tiuser.h is protected by extern \"C\"" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_tiuser_with_extern_c'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-        cat > conftest.$ac_ext <<EOF
-#line 9826 "configure"
-#include "confdefs.h"
-#include <tiuser.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "extern \"C\"" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-           ace_cv_lib_tiuser_with_extern_c=yes 
-          
-else
-  rm -rf conftest*
-  
-           ace_cv_lib_tiuser_with_extern_c=no
-          
-fi
-rm -f conftest*
-
-      
-fi
-
-  echo "$ac_t""$ace_cv_lib_tiuser_with_extern_c" 1>&6
-  if test "$ace_cv_lib_tiuser_with_extern_c" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_TIUSER_H_BROKEN_EXTERN_C 1
-EOF
-
-
-  fi
-
-fi 
-ac_safe=`echo "xliuser.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for xliuser.h""... $ac_c" 1>&6
-echo "configure:9863: checking for xliuser.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9868 "configure"
-#include "confdefs.h"
-#include <xliuser.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   ace_has_tli=yes
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_XLI 1
-EOF
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_TLI 1
-EOF
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-if test "$ace_has_tli" = yes; then
- 
-  echo $ac_n "checking for TLI prototypes""... $ac_c" 1>&6
-echo "configure:9909: checking for TLI prototypes" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_tli_prototypes'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 9915 "configure"
-#include "confdefs.h"
-
-#if defined (ACE_HAS_TIMOD_H)
-# include <sys/timod.h>
-#endif
-
-#if defined (ACE_HAS_OSF_TIMOD_H)
-# include <tli/timod.h>
-#endif
-
-#if defined (ACE_HAS_TIUSER_H) || defined (ACE_HAS_XTI)
-#  if defined (ACE_HAS_TIUSER_H)
-#    include /**/ <tiuser.h>
-#  else
-#    if defined (ACE_HAS_BROKEN_XTI_MACROS)
-#      undef TCP_NODELAY
-#      undef TCP_MAXSEG
-#    endif /* ACE_HAS_BROKEN_XTI_MACROS */
-#    if defined ACE_HAS_SYS_XTI_H
-#      define class ace_xti_class
-#      include /**/ <sys/xti.h>
-#      undef class
-#    else
-#      include /**/ <xti.h>
-#    endif /* ACE_HAS_SYS_XTI_H */
-#  endif /* ACE_HAS_TIUSER_H */
-#endif /* ACE_HAS_TIUSER_H || ACE_HAS_XTI */
-
-#if defined (ACE_HAS_XLI)
-# include <xliuser.h>
-#endif
-     
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "t_accept" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-      ace_cv_lib_tli_prototypes=yes
-     
-else
-  rm -rf conftest*
-  
-      ace_cv_lib_tli_prototypes=no
-     
-fi
-rm -f conftest*
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_tli_prototypes" 1>&6
-  if test "$ace_cv_lib_tli_prototypes" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_TLI_PROTOTYPES 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
- 
-  echo $ac_n "checking for t_errno in TLI headers""... $ac_c" 1>&6
-echo "configure:9981: checking for t_errno in TLI headers" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_has_t_errno'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 9987 "configure"
-#include "confdefs.h"
-
-#if defined (ACE_HAS_TIMOD_H)
-# include <sys/timod.h>
-#endif
-
-#if defined (ACE_HAS_OSF_TIMOD_H)
-# include <tli/timod.h>
-#endif
-
-#if defined (ACE_HAS_TIUSER_H) || defined (ACE_HAS_XTI)
-#  if defined (ACE_HAS_TIUSER_H)
-#    include /**/ <tiuser.h>
-#  else
-#    if defined (ACE_HAS_BROKEN_XTI_MACROS)
-#      undef TCP_NODELAY
-#      undef TCP_MAXSEG
-#    endif /* ACE_HAS_BROKEN_XTI_MACROS */
-#    if defined ACE_HAS_SYS_XTI_H
-#      define class ace_xti_class
-#      include /**/ <sys/xti.h>
-#      undef class
-#    else
-#      include /**/ <xti.h>
-#    endif /* ACE_HAS_SYS_XTI_H */
-#  endif /* ACE_HAS_TIUSER_H */
-#endif /* ACE_HAS_TIUSER_H || ACE_HAS_XTI */
-
-#if defined (ACE_HAS_XLI)
-# include <xliuser.h>
-#endif
-
-#ifndef _THREAD_SAFE
-# define _THREAD_SAFE
-#endif
-     
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "t_errno" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-      ace_cv_lib_has_t_errno=yes
-     
-else
-  rm -rf conftest*
-  
-      ace_cv_lib_has_t_errno=no
-     
-fi
-rm -f conftest*
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_has_t_errno" 1>&6
-  if test "$ace_cv_lib_has_t_errno" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_T_ERRNO 1
-EOF
-
-
-  fi
-
-
-fi fi 
-ac_safe=`echo "sys/time.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/time.h""... $ac_c" 1>&6
-echo "configure:10059: checking for sys/time.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10064 "configure"
-#include "confdefs.h"
-#include <sys/time.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   cat > conftest.$ac_ext <<EOF
-#line 10087 "configure"
-#include "confdefs.h"
-#include <time.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "sys/time.h" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  
-       cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SYSTIME_H 1
-EOF
-
-      
-fi
-rm -f conftest*
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "sys/mman.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/mman.h""... $ac_c" 1>&6
-echo "configure:10113: checking for sys/mman.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10118 "configure"
-#include "confdefs.h"
-#include <sys/mman.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   cat > conftest.$ac_ext <<EOF
-#line 10141 "configure"
-#include "confdefs.h"
-#include <sys/mman.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "extern \"C\"" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  
-       cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_MMAP_H 1
-EOF
-
-      
-fi
-rm -f conftest*
-
-  
-else
-  echo "$ac_t""no" 1>&6
-
-   cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MMAP 1
-EOF
-
-  
-fi
-
-
-ac_safe=`echo "bstring.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for bstring.h""... $ac_c" 1>&6
-echo "configure:10173: checking for bstring.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10178 "configure"
-#include "confdefs.h"
-#include <bstring.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   cat > conftest.$ac_ext <<EOF
-#line 10201 "configure"
-#include "confdefs.h"
-#include <bstring.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "bzero" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_BSTRING 1
-EOF
-
-     
-fi
-rm -f conftest*
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "strings.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for strings.h""... $ac_c" 1>&6
-echo "configure:10225: checking for strings.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10230 "configure"
-#include "confdefs.h"
-#include <strings.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   cat > conftest.$ac_ext <<EOF
-#line 10253 "configure"
-#include "confdefs.h"
-#include <strings.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "bzero" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_STRINGS 1
-EOF
-
-     
-fi
-rm -f conftest*
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "sys/syscall.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/syscall.h""... $ac_c" 1>&6
-echo "configure:10277: checking for sys/syscall.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10282 "configure"
-#include "confdefs.h"
-#include <sys/syscall.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_SYSCALL_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "poll.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for poll.h""... $ac_c" 1>&6
-echo "configure:10314: checking for poll.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10319 "configure"
-#include "confdefs.h"
-#include <poll.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_POLL 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-for ac_hdr in pwd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10353: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10358 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
- 
-ac_safe=`echo "regexpr.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for regexpr.h""... $ac_c" 1>&6
-echo "configure:10391: checking for regexpr.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10396 "configure"
-#include "confdefs.h"
-#include <regexpr.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_REGEX 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "stropts.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for stropts.h""... $ac_c" 1>&6
-echo "configure:10428: checking for stropts.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10433 "configure"
-#include "confdefs.h"
-#include <stropts.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_STREAMS 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "siginfo.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for siginfo.h""... $ac_c" 1>&6
-echo "configure:10465: checking for siginfo.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10470 "configure"
-#include "confdefs.h"
-#include <siginfo.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SIGINFO_H 1
-EOF
-
-fi
-
-
-ac_safe=`echo "unistd.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for unistd.h""... $ac_c" 1>&6
-echo "configure:10503: checking for unistd.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10508 "configure"
-#include "confdefs.h"
-#include <unistd.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_UNISTD_H 1
-EOF
-
-fi
-
-
-ac_safe=`echo "utime.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for utime.h""... $ac_c" 1>&6
-echo "configure:10541: checking for utime.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10546 "configure"
-#include "confdefs.h"
-#include <utime.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_UTIME 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-ac_safe=`echo "libc.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for libc.h""... $ac_c" 1>&6
-echo "configure:10579: checking for libc.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10584 "configure"
-#include "confdefs.h"
-#include <libc.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_LIBC_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "osfcn.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for osfcn.h""... $ac_c" 1>&6
-echo "configure:10616: checking for osfcn.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10621 "configure"
-#include "confdefs.h"
-#include <osfcn.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_OSFCN_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "new" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for new""... $ac_c" 1>&6
-echo "configure:10653: checking for new" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10658 "configure"
-#include "confdefs.h"
-#include <new>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_NEW_NO_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-
-   ac_safe=`echo "new.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for new.h""... $ac_c" 1>&6
-echo "configure:10688: checking for new.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10693 "configure"
-#include "confdefs.h"
-#include <new.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_NEW_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  
-fi
-
-
-ac_safe=`echo "stdexcept" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for stdexcept""... $ac_c" 1>&6
-echo "configure:10728: checking for stdexcept" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10733 "configure"
-#include "confdefs.h"
-#include <stdexcept>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_STDEXCEPT_NO_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-
-   ac_safe=`echo "exception.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for exception.h""... $ac_c" 1>&6
-echo "configure:10763: checking for exception.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10768 "configure"
-#include "confdefs.h"
-#include <exception.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_EXCEPTION_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  
-fi
-
-
-ac_safe=`echo "iomanip" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iomanip""... $ac_c" 1>&6
-echo "configure:10803: checking for iomanip" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10808 "configure"
-#include "confdefs.h"
-#include <iomanip>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_IOMANIP_NO_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "cstring" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for cstring""... $ac_c" 1>&6
-echo "configure:10840: checking for cstring" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10845 "configure"
-#include "confdefs.h"
-#include <cstring>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_GNU_CSTRING_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "memory" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for memory""... $ac_c" 1>&6
-echo "configure:10877: checking for memory" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10882 "configure"
-#include "confdefs.h"
-#include <memory>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-ac_safe=`echo "map" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for map""... $ac_c" 1>&6
-echo "configure:10910: checking for map" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10915 "configure"
-#include "confdefs.h"
-#include <map>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-  ac_safe=`echo "net/if.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for net/if.h""... $ac_c" 1>&6
-echo "configure:10939: checking for net/if.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10944 "configure"
-#include "confdefs.h"
-#include <net/if.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-    
-  echo $ac_n "checking if STL map class conflicts with <net/if.h> map struct""... $ac_c" 1>&6
-echo "configure:10968: checking if STL map class conflicts with <net/if.h> map struct" >&5
-  if eval "test \"`echo '$''{'ace_cv_header_stl_map_conflict'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 10974 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <map>
-#include <net/if.h>
-       
-int main() {
-
-        map<char, char> ace_map;
-       
-; return 0; }
-EOF
-if { (eval echo configure:10989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_header_stl_map_conflict=no
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_header_stl_map_conflict=yes
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_header_stl_map_conflict" 1>&6
-  if test "$ace_cv_header_stl_map_conflict" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_STL_MAP_CONFLICT 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-ac_safe=`echo "queue" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for queue""... $ac_c" 1>&6
-echo "configure:11031: checking for queue" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11036 "configure"
-#include "confdefs.h"
-#include <queue>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-  ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:11060: checking for netinet/in.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11065 "configure"
-#include "confdefs.h"
-#include <netinet/in.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-    
-  echo $ac_n "checking if STL queue class conflicts with <netinet/in.h> queue struct""... $ac_c" 1>&6
-echo "configure:11089: checking if STL queue class conflicts with <netinet/in.h> queue struct" >&5
-  if eval "test \"`echo '$''{'ace_cv_header_stl_queue_conflict'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 11095 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <queue>
-#include <netinet/in.h>
-       
-int main() {
-
-        queue<char> ace_queue;
-       
-; return 0; }
-EOF
-if { (eval echo configure:11110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_header_stl_queue_conflict=no
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_header_stl_queue_conflict=yes
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_header_stl_queue_conflict" 1>&6
-  if test "$ace_cv_header_stl_queue_conflict" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_STL_QUEUE_CONFLICT 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-for ac_hdr in iomanip ios iostream istream ostream fstream streambuf
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11154: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11159 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-   
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_USES_OLD_IOSTREAMS 1
-EOF
-
-fi
-done
-
-
-ac_safe=`echo "iostream.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iostream.h""... $ac_c" 1>&6
-echo "configure:11197: checking for iostream.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11202 "configure"
-#include "confdefs.h"
-#include <iostream.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_safe=`echo "fstream.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for fstream.h""... $ac_c" 1>&6
-echo "configure:11225: checking for fstream.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11230 "configure"
-#include "confdefs.h"
-#include <fstream.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_IOSTREAM_TOTALLY 1
-EOF
-
-fi
-
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_IOSTREAM_TOTALLY 1
-EOF
-
-fi
-
-
-
-  echo $ac_n "checking sched.h for thread scheduling definitions""... $ac_c" 1>&6
-echo "configure:11271: checking sched.h for thread scheduling definitions" >&5
-  if eval "test \"`echo '$''{'ace_cv_needs_sched_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 11277 "configure"
-#include "confdefs.h"
-#include <sched.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "sched_yield" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-      ace_cv_needs_sched_h=yes
-     
-else
-  rm -rf conftest*
-  
-      ace_cv_needs_sched_h=no
-     
-fi
-rm -f conftest*
-
-   
-fi
-
-  echo "$ac_t""$ace_cv_needs_sched_h" 1>&6
-  if test "$ace_cv_needs_sched_h" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_NEEDS_SCHED_H 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking regexpr.h for regular expression support""... $ac_c" 1>&6
-echo "configure:11313: checking regexpr.h for regular expression support" >&5
-  if eval "test \"`echo '$''{'ace_cv_needs_regexpr_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 11319 "configure"
-#include "confdefs.h"
-#include <regexpr.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "compile" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-      ace_cv_needs_regexpr_h=yes
-      cat >> confdefs.h <<\EOF
-#define ACE_NEEDS_REGEXPR_H 1
-EOF
-
-     
-else
-  rm -rf conftest*
-  
-      cat > conftest.$ac_ext <<EOF
-#line 11337 "configure"
-#include "confdefs.h"
-#include <regexpr.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "step" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-         ace_cv_needs_regexpr_h=yes
-        
-else
-  rm -rf conftest*
-  
-         ace_cv_needs_regexpr_h=no
-        
-fi
-rm -f conftest*
-
-     
-fi
-rm -f conftest*
-
-   
-fi
-
-  echo "$ac_t""$ace_cv_needs_regexpr_h" 1>&6
-  if test "$ace_cv_needs_regexpr_h" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_NEEDS_REGEXPR_H 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-
-  echo $ac_n "checking if sprintf() returns char*""... $ac_c" 1>&6
-echo "configure:11394: checking if sprintf() returns char*" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_charptr_sprintf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 11400 "configure"
-#include "confdefs.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-    
-int main() {
-
-     char *str = 0;
-     const char *fmt = "%d";
-     int num = 0;
-
-     char *s = 0;
-
-     s = sprintf(str, fmt, num);
-    
-; return 0; }
-EOF
-if { (eval echo configure:11418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-     ace_cv_lib_charptr_sprintf=yes
-    
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-     ace_cv_lib_charptr_sprintf=no
-    
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_charptr_sprintf" 1>&6
-  if test "$ace_cv_lib_charptr_sprintf" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_CHARPTR_SPRINTF 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-  echo $ac_n "checking for getopt() prototype""... $ac_c" 1>&6
-echo "configure:11453: checking for getopt() prototype" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_getopt_proto'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-  cat > conftest.$ac_ext <<EOF
-#line 11459 "configure"
-#include "confdefs.h"
-#include <unistd.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "getopt" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-     ace_cv_lib_getopt_proto=yes
-    
-else
-  rm -rf conftest*
-  
-     cat > conftest.$ac_ext <<EOF
-#line 11473 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "getopt" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-        ace_cv_lib_getopt_proto=yes
-       
-else
-  rm -rf conftest*
-  
-        ace_cv_lib_getopt_proto=no
-       
-fi
-rm -f conftest*
-
-    
-fi
-rm -f conftest*
-
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_getopt_proto" 1>&6
-  if test "$ace_cv_lib_getopt_proto" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_GETOPT_PROTO 1
-EOF
-
-
-  fi
-
-
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-
-  echo $ac_n "checking for old malloc() prototype""... $ac_c" 1>&6
-echo "configure:11531: checking for old malloc() prototype" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_old_malloc_proto'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 11537 "configure"
-#include "confdefs.h"
-
-#include <stdlib.h>
-#ifndef ACE_LACKS_MALLOC_H
-# include <malloc.h>
-#endif
-    
-int main() {
-
-     char *s = 0;
-     s = malloc(sizeof(int));
-    
-; return 0; }
-EOF
-if { (eval echo configure:11552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-     ace_cv_lib_old_malloc_proto=yes
-    
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-     ace_cv_lib_old_malloc_proto=no
-    
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_old_malloc_proto" 1>&6
-  if test "$ace_cv_lib_old_malloc_proto" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_OLD_MALLOC 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-  echo $ac_n "checking for *_timedwait() prototypes""... $ac_c" 1>&6
-echo "configure:11587: checking for *_timedwait() prototypes" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_timedwait_proto'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-  cat > conftest.$ac_ext <<EOF
-#line 11593 "configure"
-#include "confdefs.h"
-#include <pthread.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "recv_timedwait" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-     ace_cv_lib_timedwait_proto=yes
-    
-else
-  rm -rf conftest*
-  
-     cat > conftest.$ac_ext <<EOF
-#line 11607 "configure"
-#include "confdefs.h"
-#include <fcntl.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "recv_timedwait" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-        ace_cv_lib_timedwait_proto=yes
-       
-else
-  rm -rf conftest*
-  
-        ace_cv_lib_timedwait_proto=no
-       
-fi
-rm -f conftest*
-
-    
-fi
-rm -f conftest*
-
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_timedwait_proto" 1>&6
-  if test "$ace_cv_lib_timedwait_proto" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_TIMEDWAIT_PROTOTYPES 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for ualarm() prototype""... $ac_c" 1>&6
-echo "configure:11648: checking for ualarm() prototype" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_ualarm_proto'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 11654 "configure"
-#include "confdefs.h"
-#include <unistd.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ualarm" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-                    ace_cv_lib_ualarm_proto=yes
-                   
-else
-  rm -rf conftest*
-  
-                    ace_cv_lib_ualarm_proto=no
-                   
-fi
-rm -f conftest*
-
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_ualarm_proto" 1>&6
-  if test "$ace_cv_lib_ualarm_proto" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_UALARM_PROTOTYPE 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for getrusage() in sys/resource.h""... $ac_c" 1>&6
-echo "configure:11691: checking for getrusage() in sys/resource.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_has_getrusage_proto'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 11697 "configure"
-#include "confdefs.h"
-#include <sys/resource.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "getrusage" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-          ace_cv_lib_has_getrusage_proto=yes
-         
-else
-  rm -rf conftest*
-  
-          ace_cv_lib_has_getrusage_proto=no
-         
-fi
-rm -f conftest*
-
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_has_getrusage_proto" 1>&6
-  if test "$ace_cv_lib_has_getrusage_proto" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_GETRUSAGE_PROTO 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for getrlimit() and setrlimit() in sys/resource.h""... $ac_c" 1>&6
-echo "configure:11733: checking for getrlimit() and setrlimit() in sys/resource.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_has_getsetrlimit_proto'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 11739 "configure"
-#include "confdefs.h"
-#include <sys/resource.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "getrlimit" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-          cat > conftest.$ac_ext <<EOF
-#line 11748 "configure"
-#include "confdefs.h"
-#include <sys/resource.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "getrlimit" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-              ace_cv_lib_has_getsetrlimit_proto=yes
-             
-else
-  rm -rf conftest*
-  
-              ace_cv_lib_has_getsetrlimit_proto=no
-             
-fi
-rm -f conftest*
-
-         
-else
-  rm -rf conftest*
-  
-          ace_cv_lib_has_getsetrlimit_proto=no
-         
-fi
-rm -f conftest*
-
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_has_getsetrlimit_proto" 1>&6
-  if test "$ace_cv_lib_has_getsetrlimit_proto" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_RLIMIT_PROTOTYPE 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking if dlfcn.h is protected by extern \"C\"""... $ac_c" 1>&6
-echo "configure:11794: checking if dlfcn.h is protected by extern \"C\"" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_dlfcn_with_extern_c'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 11800 "configure"
-#include "confdefs.h"
-#include <dlfcn.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "extern \"C\"" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-         ace_cv_lib_dlfcn_with_extern_c=yes 
-        
-else
-  rm -rf conftest*
-  
-         ace_cv_lib_dlfcn_with_extern_c=no
-        
-fi
-rm -f conftest*
-
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_dlfcn_with_extern_c" 1>&6
-  if test "$ace_cv_lib_dlfcn_with_extern_c" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_DLFCN_H_BROKEN_EXTERN_C 1
-EOF
-
-
-  fi
-
-
-
-echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:11837: checking for uid_t in sys/types.h" >&5
-if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11842 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "uid_t" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_uid_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_uid_t=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_type_uid_t" 1>&6
-if test $ac_cv_type_uid_t = no; then
-  cat >> confdefs.h <<\EOF
-#define uid_t int
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define gid_t int
-EOF
-
-fi
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:11871: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11876 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 11901 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 11919 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11940 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:11954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:11978: checking for mode_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11983 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_mode_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_mode_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_mode_t" 1>&6
-if test $ac_cv_type_mode_t = no; then
-  cat >> confdefs.h <<\EOF
-#define mode_t int
-EOF
-
-fi
-
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:12011: checking for off_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 12016 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_off_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_off_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_off_t" 1>&6
-if test $ac_cv_type_off_t = no; then
-  cat >> confdefs.h <<\EOF
-#define off_t long
-EOF
-
-fi
-
-echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:12044: checking for pid_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 12049 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_pid_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_pid_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_pid_t" 1>&6
-if test $ac_cv_type_pid_t = no; then
-  cat >> confdefs.h <<\EOF
-#define pid_t int
-EOF
-
-fi
-
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:12077: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 12082 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_size_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_size_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
-  cat >> confdefs.h <<\EOF
-#define size_t unsigned
-EOF
-
-fi
-
-
-
-
-  
-  echo $ac_n "checking for idtype_t in signal.h""... $ac_c" 1>&6
-echo "configure:12114: checking for idtype_t in signal.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_type_idtype_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 12120 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       
-int main() {
-
-        idtype_t ace_idtype_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_type_idtype_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_type_idtype_t=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_type_idtype_t" 1>&6
-  if test "$ace_cv_type_idtype_t" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_IDTYPE_T 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-
-  
-  echo $ac_n "checking for sem_t in semaphore.h""... $ac_c" 1>&6
-echo "configure:12165: checking for sem_t in semaphore.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_type_sem_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 12171 "configure"
-#include "confdefs.h"
-
-#include <semaphore.h>
-       
-int main() {
-
-        sem_t ace_sem_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_type_sem_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_type_sem_t=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_type_sem_t" 1>&6
-  if test "$ace_cv_type_sem_t" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-
-  
-  echo $ac_n "checking for key_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:12213: checking for key_t in sys/types.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_type_key_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 12219 "configure"
-#include "confdefs.h"
-
-#include <sys/types.h>
-       
-int main() {
-
-        key_t ace_key_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_type_key_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_type_key_t=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_type_key_t" 1>&6
-  if test "$ace_cv_type_key_t" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_KEY_T 1
-EOF
-
-
-  fi
-
-
-
-
-  
-  echo $ac_n "checking for ssize_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:12265: checking for ssize_t in sys/types.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_type_ssize_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 12271 "configure"
-#include "confdefs.h"
-
-#include <sys/types.h>
-       
-int main() {
-
-        ssize_t ace_ssize_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_type_ssize_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_type_ssize_t=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_type_ssize_t" 1>&6
-  if test "$ace_cv_type_ssize_t" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_SSIZE_T 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-
-  
-  echo $ac_n "checking for u_longlong_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:12316: checking for u_longlong_t in sys/types.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_type_u_longlong_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 12322 "configure"
-#include "confdefs.h"
-
-#include <sys/types.h>
-       
-int main() {
-
-        u_longlong_t ace_u_longlong_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_type_u_longlong_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_type_u_longlong_t=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_type_u_longlong_t" 1>&6
-  if test "$ace_cv_type_u_longlong_t" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_U_LONGLONG_T 1
-EOF
-
-
-  fi
-
-
-
-
-  
-  echo $ac_n "checking for pri_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:12368: checking for pri_t in sys/types.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_type_pri_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 12374 "configure"
-#include "confdefs.h"
-
-#include <sys/types.h>
-       
-int main() {
-
-        pri_t ace_pri_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_type_pri_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_type_pri_t=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_type_pri_t" 1>&6
-  if test "$ace_cv_type_pri_t" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_PRI_T 1
-EOF
-
-
-  fi
-
-
-
-
-  
-  echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
-echo "configure:12420: checking for socklen_t in sys/socket.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_type_socklen_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 12426 "configure"
-#include "confdefs.h"
-
-#include <sys/socket.h>
-       
-int main() {
-
-        socklen_t ace_socklen_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_type_socklen_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_type_socklen_t=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_type_socklen_t" 1>&6
-  if test "$ace_cv_type_socklen_t" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_SOCKLEN_T 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-
-  
-  echo $ac_n "checking for ucontext_t in ucontext.h""... $ac_c" 1>&6
-echo "configure:12471: checking for ucontext_t in ucontext.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_type_ucontext_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 12477 "configure"
-#include "confdefs.h"
-
-#include <ucontext.h>
-       
-int main() {
-
-        ucontext_t ace_ucontext_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_type_ucontext_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_type_ucontext_t=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_type_ucontext_t" 1>&6
-  if test "$ace_cv_type_ucontext_t" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_UCONTEXT_T 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-
-  
-  echo $ac_n "checking for wchar_t in wchar.h""... $ac_c" 1>&6
-echo "configure:12522: checking for wchar_t in wchar.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_type_wchar_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 12528 "configure"
-#include "confdefs.h"
-
-#include <wchar.h>
-       
-int main() {
-
-        wchar_t ace_wchar_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_type_wchar_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_type_wchar_t=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_type_wchar_t" 1>&6
-  if test "$ace_cv_type_wchar_t" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_XPG4_MULTIBYTE_CHAR 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-
-  
-  echo $ac_n "checking for wchar_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:12569: checking for wchar_t in sys/types.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_type_wchar_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 12575 "configure"
-#include "confdefs.h"
-
-#include <sys/types.h>
-       
-int main() {
-
-        wchar_t ace_wchar_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_type_wchar_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_type_wchar_t=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_type_wchar_t" 1>&6
-  if test "$ace_cv_type_wchar_t" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_WCHAR_T 1
-EOF
-
-
-  fi
-
-
-  
-
-  fi
-
-
-
-
-  echo $ac_n "checking for sig_atomic_t""... $ac_c" 1>&6
-echo "configure:12625: checking for sig_atomic_t" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_defines_sig_atomic_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-   
-      cat > conftest.$ac_ext <<EOF
-#line 12631 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <signal.h>
-         
-int main() {
-
-          sig_atomic_t sat;
-         
-; return 0; }
-EOF
-if { (eval echo configure:12645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-          ace_cv_lib_posix_defines_sig_atomic_t=yes
-         
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-          ace_cv_lib_posix_defines_sig_atomic_t=no
-         
-fi
-rm -f conftest*
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_defines_sig_atomic_t" 1>&6
-  if test "$ace_cv_lib_posix_defines_sig_atomic_t" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_SIG_ATOMIC_T 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-
-
-
-  
-  echo $ac_n "checking for struct flock in fcntl.h""... $ac_c" 1>&6
-echo "configure:12681: checking for struct flock in fcntl.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_flock'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     
-
-     cat > conftest.$ac_ext <<EOF
-#line 12689 "configure"
-#include "confdefs.h"
-
-#include <fcntl.h>
-       
-int main() {
-
-        struct flock ace_flock;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-        ace_cv_struct_flock=yes
-       
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 12713 "configure"
-#include "confdefs.h"
-
-#include <fcntl.h>
-          
-int main() {
-
-           flock ace_flock;
-          
-; return 0; }
-EOF
-if { (eval echo configure:12724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_flock=yes
-       
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_flock=no
-       
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_struct_flock" 1>&6
-  if test "$ace_cv_struct_flock" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_FILELOCKS 1
-EOF
-
-
-  fi
-
-
-
-
-
-  
-  echo $ac_n "checking for struct rwlock_t in synch.h""... $ac_c" 1>&6
-echo "configure:12768: checking for struct rwlock_t in synch.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_rwlock_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     
-
-     cat > conftest.$ac_ext <<EOF
-#line 12776 "configure"
-#include "confdefs.h"
-
-#include <synch.h>
-       
-int main() {
-
-        struct rwlock_t ace_rwlock_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-        ace_cv_struct_rwlock_t=yes
-       
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 12800 "configure"
-#include "confdefs.h"
-
-#include <synch.h>
-          
-int main() {
-
-           rwlock_t ace_rwlock_t;
-          
-; return 0; }
-EOF
-if { (eval echo configure:12811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_rwlock_t=yes
-       
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_rwlock_t=no
-       
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_struct_rwlock_t" 1>&6
-  if test "$ace_cv_struct_rwlock_t" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_RWLOCK_T 1
-EOF
-
-
-  fi
-
-
-
-
-
-  
-  echo $ac_n "checking for struct strbuf in stropts.h""... $ac_c" 1>&6
-echo "configure:12855: checking for struct strbuf in stropts.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_strbuf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     
-
-     cat > conftest.$ac_ext <<EOF
-#line 12863 "configure"
-#include "confdefs.h"
-
-#include <stropts.h>
-       
-int main() {
-
-        struct strbuf ace_strbuf;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-        ace_cv_struct_strbuf=yes
-       
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 12887 "configure"
-#include "confdefs.h"
-
-#include <stropts.h>
-          
-int main() {
-
-           strbuf ace_strbuf;
-          
-; return 0; }
-EOF
-if { (eval echo configure:12898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_strbuf=yes
-       
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_strbuf=no
-       
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_struct_strbuf" 1>&6
-  if test "$ace_cv_struct_strbuf" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_STRBUF_T 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-
-
-  
-  echo $ac_n "checking for struct msgbuf in sys/msg.h""... $ac_c" 1>&6
-echo "configure:12941: checking for struct msgbuf in sys/msg.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_msgbuf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     
-
-     cat > conftest.$ac_ext <<EOF
-#line 12949 "configure"
-#include "confdefs.h"
-
-#include <sys/msg.h>
-       
-int main() {
-
-        struct msgbuf ace_msgbuf;
-       
-; return 0; }
-EOF
-if { (eval echo configure:12960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-        ace_cv_struct_msgbuf=yes
-       
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 12973 "configure"
-#include "confdefs.h"
-
-#include <sys/msg.h>
-          
-int main() {
-
-           msgbuf ace_msgbuf;
-          
-; return 0; }
-EOF
-if { (eval echo configure:12984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_msgbuf=yes
-       
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_msgbuf=no
-       
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_struct_msgbuf" 1>&6
-  if test "$ace_cv_struct_msgbuf" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MSGBUF_T 1
-EOF
-
-
-  fi
-
-
-case "$target" in
-*irix*)
-    ;;
-*)
-  
-
-
-  
-  echo $ac_n "checking for struct prusage_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:13032: checking for struct prusage_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_prusage_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     
-
-     cat > conftest.$ac_ext <<EOF
-#line 13040 "configure"
-#include "confdefs.h"
-
-#include <sys/procfs.h>
-       
-int main() {
-
-        struct prusage_t ace_prusage_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:13051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-        ace_cv_struct_prusage_t=yes
-       
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 13064 "configure"
-#include "confdefs.h"
-
-#include <sys/procfs.h>
-          
-int main() {
-
-           prusage_t ace_prusage_t;
-          
-; return 0; }
-EOF
-if { (eval echo configure:13075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_prusage_t=yes
-       
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_prusage_t=no
-       
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_struct_prusage_t" 1>&6
-  if test "$ace_cv_struct_prusage_t" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_PRUSAGE_T 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
- 
-  ;;
-esac
-
-
-
-  
-  echo $ac_n "checking for struct strrecvfd in stropts.h""... $ac_c" 1>&6
-echo "configure:13120: checking for struct strrecvfd in stropts.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_strrecvfd'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     
-
-     cat > conftest.$ac_ext <<EOF
-#line 13128 "configure"
-#include "confdefs.h"
-
-#include <stropts.h>
-       
-int main() {
-
-        struct strrecvfd ace_strrecvfd;
-       
-; return 0; }
-EOF
-if { (eval echo configure:13139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-        ace_cv_struct_strrecvfd=yes
-       
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 13152 "configure"
-#include "confdefs.h"
-
-#include <stropts.h>
-          
-int main() {
-
-           strrecvfd ace_strrecvfd;
-          
-; return 0; }
-EOF
-if { (eval echo configure:13163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_strrecvfd=yes
-       
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_strrecvfd=no
-       
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_struct_strrecvfd" 1>&6
-  if test "$ace_cv_struct_strrecvfd" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_STRRECVFD 1
-EOF
-
-
-  fi
-
-
-
-
-
-  
-  echo $ac_n "checking for struct sembuf in sys/sem.h""... $ac_c" 1>&6
-echo "configure:13207: checking for struct sembuf in sys/sem.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_sembuf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     
-
-     cat > conftest.$ac_ext <<EOF
-#line 13215 "configure"
-#include "confdefs.h"
-
-#include <sys/sem.h>
-       
-int main() {
-
-        struct sembuf ace_sembuf;
-       
-; return 0; }
-EOF
-if { (eval echo configure:13226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-        ace_cv_struct_sembuf=yes
-       
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 13239 "configure"
-#include "confdefs.h"
-
-#include <sys/sem.h>
-          
-int main() {
-
-           sembuf ace_sembuf;
-          
-; return 0; }
-EOF
-if { (eval echo configure:13250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_sembuf=yes
-       
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_sembuf=no
-       
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_struct_sembuf" 1>&6
-  if test "$ace_cv_struct_sembuf" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SEMBUF_T 1
-EOF
-
-
-  fi
-
-
-
-
-
-  
-  echo $ac_n "checking for struct sigaction in signal.h""... $ac_c" 1>&6
-echo "configure:13294: checking for struct sigaction in signal.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_sigaction'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     
-
-     cat > conftest.$ac_ext <<EOF
-#line 13302 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       
-int main() {
-
-        struct sigaction ace_sigaction;
-       
-; return 0; }
-EOF
-if { (eval echo configure:13313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-        ace_cv_struct_sigaction=yes
-       
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 13326 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-          
-int main() {
-
-           sigaction ace_sigaction;
-          
-; return 0; }
-EOF
-if { (eval echo configure:13337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_sigaction=yes
-       
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_sigaction=no
-       
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_struct_sigaction" 1>&6
-  if test "$ace_cv_struct_sigaction" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SIGACTION 1
-EOF
-
-
-  fi
-
-
-
-
-
-  
-  echo $ac_n "checking for struct sigset_t in signal.h""... $ac_c" 1>&6
-echo "configure:13381: checking for struct sigset_t in signal.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_sigset_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     
-
-     cat > conftest.$ac_ext <<EOF
-#line 13389 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       
-int main() {
-
-        struct sigset_t ace_sigset_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:13400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-        ace_cv_struct_sigset_t=yes
-       
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 13413 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-          
-int main() {
-
-           sigset_t ace_sigset_t;
-          
-; return 0; }
-EOF
-if { (eval echo configure:13424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_sigset_t=yes
-       
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_sigset_t=no
-       
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_struct_sigset_t" 1>&6
-  if test "$ace_cv_struct_sigset_t" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SIGSET 1
-EOF
-
-
-  fi
-
-
-
-
-
-  
-  echo $ac_n "checking for struct utsname in sys/utsname.h""... $ac_c" 1>&6
-echo "configure:13468: checking for struct utsname in sys/utsname.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_utsname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     
-
-     cat > conftest.$ac_ext <<EOF
-#line 13476 "configure"
-#include "confdefs.h"
-
-#include <sys/utsname.h>
-       
-int main() {
-
-        struct utsname ace_utsname;
-       
-; return 0; }
-EOF
-if { (eval echo configure:13487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-        ace_cv_struct_utsname=yes
-       
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 13500 "configure"
-#include "confdefs.h"
-
-#include <sys/utsname.h>
-          
-int main() {
-
-           utsname ace_utsname;
-          
-; return 0; }
-EOF
-if { (eval echo configure:13511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_utsname=yes
-       
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-        ace_cv_struct_utsname=no
-       
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_struct_utsname" 1>&6
-  if test "$ace_cv_struct_utsname" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_UTSNAME_T 1
-EOF
-
-
-  fi
-
-
-
-
-  echo $ac_n "checking for struct siginfo_t""... $ac_c" 1>&6
-echo "configure:13553: checking for struct siginfo_t" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_siginfo_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-            
-
-     cat > conftest.$ac_ext <<EOF
-#line 13561 "configure"
-#include "confdefs.h"
-
-#include <siginfo.h>
-       
-int main() {
-
-        struct siginfo_t ace_siginfo_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:13572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-      ace_cv_struct_siginfo_t=yes
-     
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 13585 "configure"
-#include "confdefs.h"
-
-#include <siginfo.h>
-          
-int main() {
-
-           siginfo_t ace_siginfo_t;
-          
-; return 0; }
-EOF
-if { (eval echo configure:13596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-      ace_cv_struct_siginfo_t=yes
-     
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-      
-
-     cat > conftest.$ac_ext <<EOF
-#line 13612 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       
-int main() {
-
-        struct siginfo_t ace_siginfo_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:13623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        
-         ace_cv_struct_siginfo_t=yes
-        
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 13636 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-          
-int main() {
-
-           siginfo_t ace_siginfo_t;
-          
-; return 0; }
-EOF
-if { (eval echo configure:13647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           
-         ace_cv_struct_siginfo_t=yes
-        
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           
-         ace_cv_struct_siginfo_t=no
-        
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-     
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_struct_siginfo_t" 1>&6
-  if test "$ace_cv_struct_siginfo_t" != no; then
-    ace_just_a_place_holder=fixme
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_SIGINFO_T 1
-EOF
-
-  
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for struct msghdr""... $ac_c" 1>&6
-echo "configure:13697: checking for struct msghdr" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_msghdr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 13703 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-       
-int main() {
-
-        struct msghdr ace_msghdr;
-       
-; return 0; }
-EOF
-if { (eval echo configure:13717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_struct_msghdr=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_struct_msghdr=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_struct_msghdr" 1>&6
-  if test "$ace_cv_struct_msghdr" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_MSG 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for condition variable support""... $ac_c" 1>&6
-echo "configure:13749: checking for condition variable support" >&5
-  if eval "test \"`echo '$''{'ace_cv_struct_cond_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 13755 "configure"
-#include "confdefs.h"
-
-#include <pthread.h>
-       
-int main() {
-
-        pthread_cond_t ace_pthread_cond_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:13766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_struct_cond_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 13777 "configure"
-#include "confdefs.h"
-
-#include <synch.h>
-          
-int main() {
-
-           cond_t ace_cond_t;
-          
-; return 0; }
-EOF
-if { (eval echo configure:13788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           ace_cv_struct_cond_t=yes
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           ace_cv_struct_cond_t=no
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_struct_cond_t" 1>&6
-  if test "$ace_cv_struct_cond_t" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_COND_T 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for POSIX timer structure""... $ac_c" 1>&6
-echo "configure:13824: checking for POSIX timer structure" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_timer_struct'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 13830 "configure"
-#include "confdefs.h"
-
-#include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
-        
-int main() {
-
-         timespec sr;
-        
-; return 0; }
-EOF
-if { (eval echo configure:13845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_timer_struct=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                           cat > conftest.$ac_ext <<EOF
-#line 13856 "configure"
-#include "confdefs.h"
-
-#include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif       
-           
-int main() {
-
-            timestruc_t sr;
-           
-; return 0; }
-EOF
-if { (eval echo configure:13871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-            ace_cv_lib_posix_timer_struct=yes
-                        
-  echo $ac_n "checking for struct timespec in sys/timers.h""... $ac_c" 1>&6
-echo "configure:13877: checking for struct timespec in sys/timers.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_struct_timespec_broken'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-                cat > conftest.$ac_ext <<EOF
-#line 13883 "configure"
-#include "confdefs.h"
-
-#include <sys/timers.h> 
-                  
-int main() {
-
-                   timespec sr;
-                  
-; return 0; }
-EOF
-if { (eval echo configure:13894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                   ace_cv_lib_posix_struct_timespec_broken=yes
-                  
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                   ace_cv_lib_posix_struct_timespec_broken=no
-                  
-fi
-rm -f conftest*
-                
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_struct_timespec_broken" 1>&6
-  if test "$ace_cv_lib_posix_struct_timespec_broken" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_POSIX_TIME 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-           
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-            ace_cv_lib_posix_timer_struct=no
-           
-fi
-rm -f conftest*
-        
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_timer_struct" 1>&6
-  if test "$ace_cv_lib_posix_timer_struct" != no; then
-    ace_just_a_place_holder=fixme
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_POSIX_TIME 1
-EOF
-
-   if test "$ace_cv_lib_posix_struct_timespec_broken" = yes; then
-     cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_POSIX_TIME 1
-EOF
-
-   fi
-  
-  else
-    ace_just_a_place_holder=fixme
-
-      
-  echo $ac_n "checking for struct timespec in sys/timers.h""... $ac_c" 1>&6
-echo "configure:13959: checking for struct timespec in sys/timers.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_struct_timespec_broken'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-       cat > conftest.$ac_ext <<EOF
-#line 13965 "configure"
-#include "confdefs.h"
-
-#include <sys/timers.h> 
-         
-int main() {
-
-          timespec sr;
-         
-; return 0; }
-EOF
-if { (eval echo configure:13976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-          ace_cv_lib_posix_struct_timespec_broken=yes
-         
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-          ace_cv_lib_posix_struct_timespec_broken=no
-         
-fi
-rm -f conftest*
-     
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_struct_timespec_broken" 1>&6
-  if test "$ace_cv_lib_posix_struct_timespec_broken" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_POSIX_TIME 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-  
-
-  fi
-
-
-
-  echo $ac_n "checking for timespec_t""... $ac_c" 1>&6
-echo "configure:14012: checking for timespec_t" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_timespec_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 14018 "configure"
-#include "confdefs.h"
-
-#include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
-        
-int main() {
-
-         timespec_t tt;
-        
-; return 0; }
-EOF
-if { (eval echo configure:14033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_timespec_t=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_timespec_t=no
-        
-fi
-rm -f conftest*
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_timespec_t" 1>&6
-  if test "$ace_cv_lib_posix_timespec_t" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_TIMESPEC_T 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for union semun""... $ac_c" 1>&6
-echo "configure:14066: checking for union semun" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_defines_union_semun'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 14072 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/sem.h>
-        
-int main() {
-
-         semun us;
-        
-; return 0; }
-EOF
-if { (eval echo configure:14086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_defines_union_semun=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_defines_union_semun=no
-        
-fi
-rm -f conftest*
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_defines_union_semun" 1>&6
-  if test "$ace_cv_lib_posix_defines_union_semun" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_SEMUN 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-
-  echo $ac_n "checking for broken struct timespec members""... $ac_c" 1>&6
-echo "configure:14119: checking for broken struct timespec members" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_broken_timespec'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 14125 "configure"
-#include "confdefs.h"
-
-#include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
-        
-int main() {
-
-         timespec sr;
-         sr.ts_sec  = 0;
-         sr.ts_nsec = 0;
-        
-; return 0; }
-EOF
-if { (eval echo configure:14142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_broken_timespec=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_broken_timespec=no
-        
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_broken_timespec" 1>&6
-  if test "$ace_cv_lib_broken_timespec" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_TIMESPEC_MEMBERS 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for limited struct rusage""... $ac_c" 1>&6
-echo "configure:14174: checking for limited struct rusage" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_limited_rusage'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-        cat > conftest.$ac_ext <<EOF
-#line 14180 "configure"
-#include "confdefs.h"
-
-#include <sys/resource.h>
-          
-int main() {
-
-           rusage ace_rusage;
-           /*
-             We just pick three (i.e. > 2) of the fields that
-             ACE uses to see if we have a struct rusage that
-             has more than two fields.
-           */
-           ace_rusage.ru_ixrss = 0;
-           ace_rusage.ru_idrss = 0;
-           ace_rusage.ru_isrss = 0;
-          
-; return 0; }
-EOF
-if { (eval echo configure:14199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           ace_cv_lib_limited_rusage=no
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           ace_cv_lib_limited_rusage=yes
-          
-fi
-rm -f conftest*
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_limited_rusage" 1>&6
-  if test "$ace_cv_lib_limited_rusage" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_LIMITED_RUSAGE_T 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-if test "$ace_cv_struct_siginfo_t" = yes; then
-    
-  echo $ac_n "checking for si_addr member in struct siginfo_t""... $ac_c" 1>&6
-echo "configure:14232: checking for si_addr member in struct siginfo_t" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_si_addr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-        cat > conftest.$ac_ext <<EOF
-#line 14238 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SIGINFO_H
-# include <siginfo.h>
-#endif
-#include <signal.h>
-          
-int main() {
-
-           siginfo_t acesig;
-           acesig.si_addr = 0;
-          
-; return 0; }
-EOF
-if { (eval echo configure:14253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           ace_cv_lib_posix_si_addr=yes
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           ace_cv_lib_posix_si_addr=no
-          
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_si_addr" 1>&6
-  if test "$ace_cv_lib_posix_si_addr" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SI_ADDR 1
-EOF
-
-
-  fi
-
-fi 
-
-  echo $ac_n "checking for sin_len member in struct sockaddr_in""... $ac_c" 1>&6
-echo "configure:14286: checking for sin_len member in struct sockaddr_in" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_has_sin_len'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-        cat > conftest.$ac_ext <<EOF
-#line 14292 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <netinet/in.h>
-          
-int main() {
-
-           sockaddr_in ace_sin;
-           ace_sin.sin_len = sizeof(ace_sin);
-          
-; return 0; }
-EOF
-if { (eval echo configure:14307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           ace_cv_lib_has_sin_len=yes
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           ace_cv_lib_has_sin_len=no
-          
-fi
-rm -f conftest*
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_has_sin_len" 1>&6
-  if test "$ace_cv_lib_has_sin_len" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_SIN_LEN 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for sys_siglist""... $ac_c" 1>&6
-echo "configure:14339: checking for sys_siglist" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_sys_siglist'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 14345 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-#include <signal.h>
-#if !defined (_sys_siglist)
-# define _sys_siglist sys_siglist
-#endif
-        
-int main() {
-
-         void* vp = (void*) &_sys_siglist;
-        
-; return 0; }
-EOF
-if { (eval echo configure:14362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_sys_siglist=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_sys_siglist=no
-        
-fi
-rm -f conftest*
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_sys_siglist" 1>&6
-  if test "$ace_cv_lib_posix_sys_siglist" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_SYS_SIGLIST 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for sys_errlist""... $ac_c" 1>&6
-echo "configure:14394: checking for sys_errlist" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_sys_errlist'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 14400 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#include <errno.h>
-#if !defined (_sys_errlist)
-# define _sys_errlist sys_errlist
-#endif
-        
-int main() {
-
-         void* vp = (void*) &_sys_errlist;
-        
-; return 0; }
-EOF
-if { (eval echo configure:14415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_sys_errlist=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_sys_errlist=no
-        
-fi
-rm -f conftest*
-
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_sys_errlist" 1>&6
-  if test "$ace_cv_lib_posix_sys_errlist" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_SYS_ERRLIST 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for sys_nerr in headers""... $ac_c" 1>&6
-echo "configure:14447: checking for sys_nerr in headers" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_sys_nerr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-  cat > conftest.$ac_ext <<EOF
-#line 14453 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#include <errno.h>
-#if !defined (_sys_nerr)
-# define _sys_nerr sys_nerr
-#endif
-    
-int main() {
-
-     void* vp = (void*) &_sys_nerr;
-    
-; return 0; }
-EOF
-if { (eval echo configure:14468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-     ace_cv_lib_posix_sys_nerr=yes
-    
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-     ace_cv_lib_posix_sys_nerr=no
-    
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_sys_nerr" 1>&6
-  if test "$ace_cv_lib_posix_sys_nerr" != no; then
-    ace_just_a_place_holder=fixme
-
-     
-  else
-    ace_just_a_place_holder=fixme
-
-   echo $ac_n "checking for sys_nerr""... $ac_c" 1>&6
-echo "configure:14494: checking for sys_nerr" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sys_nerr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 14499 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sys_nerr(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sys_nerr();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sys_nerr) || defined (__stub___sys_nerr)
-choke me
-#else
-sys_nerr();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:14525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sys_nerr=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sys_nerr=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sys_nerr`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SYS_NERR 1
-EOF
-
-fi
-
-  
-
-  fi
-
-
-
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-  
-  echo $ac_n "checking if compiler accepts \"pragma once\" directive""... $ac_c" 1>&6
-echo "configure:14573: checking if compiler accepts \"pragma once\" directive" >&5
-  if eval "test \"`echo '$''{'ace_cv_has_pragma_once'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 14579 "configure"
-#include "confdefs.h"
-
-#pragma once
-       
-int main() {
-
-        int a = 0; /* Put this here so we don't have an empty main(). */
-       
-; return 0; }
-EOF
-if { (eval echo configure:14590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_has_pragma_once=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_has_pragma_once=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_has_pragma_once" 1>&6
-  if test "$ace_cv_has_pragma_once" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_PRAGMA_ONCE 1
-EOF
-
-
-  fi
-    
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-if test -n "$GXX"; then
-  PREPIPECXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -pipe"
-  PREPIPECFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -pipe"
-  
-  echo $ac_n "checking if \"-pipe\" compiler flag is supported""... $ac_c" 1>&6
-echo "configure:14631: checking if \"-pipe\" compiler flag is supported" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_gxx_has_pipe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 14637 "configure"
-#include "confdefs.h"
-
-int main() {
-int a = 0;
-; return 0; }
-EOF
-if { (eval echo configure:14644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_feature_gxx_has_pipe=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_feature_gxx_has_pipe=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_feature_gxx_has_pipe" 1>&6
-  if test "$ace_cv_feature_gxx_has_pipe" != no; then
-    ace_just_a_place_holder=fixme
-
-                        
-  else
-    ace_just_a_place_holder=fixme
-
-     CXXFLAGS="$PREPIPECXXFLAGS"
-     CFLAGS="$PREPIPECFLAGS"
-    
-
-  fi
-
-fi 
-
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:14679: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat > conftest.$ac_ext <<EOF
-#line 14686 "configure"
-#include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
-EOF
-if { (eval echo configure:14693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-
-fi
-
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
-  inline | yes) ;;
-  no) cat >> confdefs.h <<\EOF
-#define inline 
-EOF
- ;;
-  *)  cat >> confdefs.h <<EOF
-#define inline $ac_cv_c_inline
-EOF
- ;;
-esac
-
-if test "$ac_cv_c_inline" = no; then
-  cat >> confdefs.h <<\EOF
-#define ACE_LACKS_INLINE_FUNCTIONS 1
-EOF
-
-fi
-
-if test "$cross_compiling" != yes; then
-  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:14727: checking whether byte ordering is bigendian" >&5
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
-cat > conftest.$ac_ext <<EOF
-#line 14734 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:14745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat > conftest.$ac_ext <<EOF
-#line 14749 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:14760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_bigendian=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_bigendian=no
-fi
-rm -f conftest*
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-if test $ac_cv_c_bigendian = unknown; then
-if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 14780 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-main () {
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-EOF
-if { (eval echo configure:14796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_bigendian=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_bigendian=yes
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-if test $ac_cv_c_bigendian = yes; then
-  cat >> confdefs.h <<\EOF
-#define WORDS_BIGENDIAN 1
-EOF
-
-fi
-
-fi
-
-
-if test "$cross_compiling" != yes; then
-          echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:14824: checking size of short" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_short=2
-else
-  cat > conftest.$ac_ext <<EOF
-#line 14832 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(short));
-  exit(0);
-}
-EOF
-if { (eval echo configure:14846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_short=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_short=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_short" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-EOF
-
-
-  if test $ac_cv_sizeof_short != 0; then
-    cat >> confdefs.h <<EOF
-#define ACE_SIZEOF_SHORT $ac_cv_sizeof_short
-EOF
-
-  fi
-  echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:14872: checking size of int" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_int=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 14880 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int));
-  exit(0);
-}
-EOF
-if { (eval echo configure:14894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_int=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-EOF
-
-
-  if test $ac_cv_sizeof_int != 0; then
-    cat >> confdefs.h <<EOF
-#define ACE_SIZEOF_INT $ac_cv_sizeof_int
-EOF
-
-  fi
-  echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:14920: checking size of long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_long=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 14928 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long));
-  exit(0);
-}
-EOF
-if { (eval echo configure:14942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-EOF
-
-
-  if test $ac_cv_sizeof_long != 0; then
-    cat >> confdefs.h <<EOF
-#define ACE_SIZEOF_LONG $ac_cv_sizeof_long
-EOF
-
-  fi
-  echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:14968: checking size of long long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_long_long=8
-else
-  cat > conftest.$ac_ext <<EOF
-#line 14976 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long long));
-  exit(0);
-}
-EOF
-if { (eval echo configure:14990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long_long=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long_long=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-EOF
-
-
-  if test $ac_cv_sizeof_long_long != 0; then
-    cat >> confdefs.h <<EOF
-#define ACE_SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-EOF
-
-  else
-    cat >> confdefs.h <<\EOF
-#define ACE_LACKS_LONGLONG_T 1
-EOF
-
-  fi
-  echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:15021: checking size of void *" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_void_p=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 15029 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(void *));
-  exit(0);
-}
-EOF
-if { (eval echo configure:15043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_void_p=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_void_p=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_void_p" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
-EOF
-
-
-  if test $ac_cv_sizeof_void_p != 0; then
-    cat >> confdefs.h <<EOF
-#define ACE_SIZEOF_VOID_P $ac_cv_sizeof_void_p
-EOF
-
-  fi
-  echo $ac_n "checking size of float""... $ac_c" 1>&6
-echo "configure:15069: checking size of float" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_float=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 15077 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(float));
-  exit(0);
-}
-EOF
-if { (eval echo configure:15091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_float=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_float=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_float" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_FLOAT $ac_cv_sizeof_float
-EOF
-
-
-  if test $ac_cv_sizeof_float != 0; then
-    cat >> confdefs.h <<EOF
-#define ACE_SIZEOF_FLOAT $ac_cv_sizeof_float
-EOF
-
-  else
-    cat >> confdefs.h <<\EOF
-#define ACE_LACKS_FLOATING_POINT 1
-EOF
-
-  fi
-  echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:15122: checking size of double" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_double=8
-else
-  cat > conftest.$ac_ext <<EOF
-#line 15130 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(double));
-  exit(0);
-}
-EOF
-if { (eval echo configure:15144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_double=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_double=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_double" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_DOUBLE $ac_cv_sizeof_double
-EOF
-
-
-  if test $ac_cv_sizeof_double != 0; then
-    cat >> confdefs.h <<EOF
-#define ACE_SIZEOF_DOUBLE $ac_cv_sizeof_double
-EOF
-
-  else
-    cat >> confdefs.h <<\EOF
-#define ACE_LACKS_FLOATING_POINT 1
-EOF
-
-  fi
-  echo $ac_n "checking size of long double""... $ac_c" 1>&6
-echo "configure:15175: checking size of long double" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_long_double=16
-else
-  cat > conftest.$ac_ext <<EOF
-#line 15183 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long double));
-  exit(0);
-}
-EOF
-if { (eval echo configure:15197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long_double=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long_double=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_long_double" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
-EOF
-
-
-  if test $ac_cv_sizeof_long_double != 0; then
-    cat >> confdefs.h <<EOF
-#define ACE_SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
-EOF
-
-  fi
-
-    ACE_UINT64=""
-                if test $ac_cv_sizeof_long = 8; then
-    ACE_UINT64="unsigned long"
-    ace_u_long_long_typedef_set=yes
-  elif test $ac_cv_sizeof_long_long = 8; then
-    ACE_UINT64="unsigned long long"
-    ace_u_long_long_typedef_set=yes
-  else
-    ace_u_long_long_typedef_set=no
-  fi
-
-        echo $ac_n "checking size of signed char""... $ac_c" 1>&6
-echo "configure:15235: checking size of signed char" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_signed_char'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_signed_char=1
-else
-  cat > conftest.$ac_ext <<EOF
-#line 15243 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(signed char));
-  exit(0);
-}
-EOF
-if { (eval echo configure:15257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_signed_char=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_signed_char=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_signed_char" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
-EOF
-
-
-  if test $ac_cv_sizeof_signed_char = 0; then
-   cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SIGNED_CHAR 1
-EOF
-
-  fi
-fi 
-
-
-
-  echo $ac_n "checking for istream operator>> for char types""... $ac_c" 1>&6
-echo "configure:15287: checking for istream operator>> for char types" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_char_right_shifts'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 15293 "configure"
-#include "confdefs.h"
-
-#include <iostream.h>
-                  
-int main() {
-
-unsigned char a = 0;
-cin >> a;
-
-#ifndef ACE_LACKS_SIGNED_CHAR
-signed char b = 0;
-cin >> b;
-#endif
-                  
-; return 0; }
-EOF
-if { (eval echo configure:15310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                   ace_cv_feature_char_right_shifts=yes
-                  
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                   ace_cv_feature_char_right_shifts=no
-                  
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_char_right_shifts" 1>&6
-  if test "$ace_cv_feature_char_right_shifts" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_CHAR_RIGHT_SHIFTS 1
-EOF
-
-
-  fi
-
-
-
-
-  echo $ac_n "checking for istream operator>> for char * types""... $ac_c" 1>&6
-echo "configure:15344: checking for istream operator>> for char * types" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_char_ptr_right_shifts'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 15350 "configure"
-#include "confdefs.h"
-
-#include <iostream.h>
-                  
-int main() {
-
-unsigned char * a = 0;
-cin >> a;
-
-#ifndef ACE_LACKS_SIGNED_CHAR
-signed char * b = 0;
-cin >> b;
-#endif
-                  
-; return 0; }
-EOF
-if { (eval echo configure:15367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                   ace_cv_feature_char_ptr_right_shifts=yes
-                  
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                   ace_cv_feature_char_ptr_right_shifts=no
-                  
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_char_ptr_right_shifts" 1>&6
-  if test "$ace_cv_feature_char_ptr_right_shifts" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for working C++ explicit template destructors""... $ac_c" 1>&6
-echo "configure:15400: checking for working C++ explicit template destructors" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_working_explicit_des'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 15406 "configure"
-#include "confdefs.h"
-
-#include <iostream.h>
-
-class dyn
-{
- public:
-   dyn () { cout << "dyn" << endl; }
-   ~dyn () { cout << "~dyn" << endl; }
-};
-
-template <class T>
-class Base
-{
- public:
-   Base () { cout << "Base" << endl; }
-   virtual void f (void) { cout << "Base::f" << endl; }
-   ~Base () { cout << "~Base" << endl; }
-};
-
-template <class T>
-class Derived
-{
- public:
-   Derived ()
-     {
-      x_ = new Base<T> (); cout << "Derived" << endl ;
-     }
-   virtual void f (void) { cout << "Derived::f" << endl; }
-   ~Derived () { x_->~Base (); cout << "~Derived" << endl; }
- private:
-   Base<T> *x_;
-   T t_;
-};
-                  
-int main() {
-
-                   Derived<dyn> *x = new Derived<dyn> ();
-
-                   x->f ();
-
-                   delete x;
-                   return 0;
-                  
-; return 0; }
-EOF
-if { (eval echo configure:15453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                   ace_cv_feature_working_explicit_des=yes
-                  
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                   ace_cv_feature_working_explicit_des=no
-                  
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_working_explicit_des" 1>&6
-  if test "$ace_cv_feature_working_explicit_des" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for working C++ conversions""... $ac_c" 1>&6
-echo "configure:15485: checking for working C++ conversions" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_cxx_working_conversions'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 15491 "configure"
-#include "confdefs.h"
-
-                   template <class T>
-                   class Foo
-                   {
-                    public:
-                      Foo (void) { ace_ptr = 0; }
-                      operator T * (void) { return ace_ptr; }
-
-                    private:
-                      T * ace_ptr;
-                   };
-                  
-int main() {
-
-                   Foo<char> Bar;
-
-                   Foo<char> * Bar_ptr = &Bar;
-
-                   char * p = Bar_ptr->operator char * ();
-                  
-; return 0; }
-EOF
-if { (eval echo configure:15515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                   ace_cv_feature_cxx_working_conversions=yes
-                  
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                   ace_cv_feature_cxx_working_conversions=no
-                  
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_cxx_working_conversions" 1>&6
-  if test "$ace_cv_feature_cxx_working_conversions" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_CONVERSIONS 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for C++ namespace support""... $ac_c" 1>&6
-echo "configure:15548: checking for C++ namespace support" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_cxx_namespaces'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 15554 "configure"
-#include "confdefs.h"
-
-                   namespace ACE
-                   {
-                     int x;
-                   }
-                  
-int main() {
-
-                   ACE::x = 0;
-                  
-; return 0; }
-EOF
-if { (eval echo configure:15568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                   ace_cv_feature_cxx_namespaces=yes
-                  
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                   ace_cv_feature_cxx_namespaces=no
-                  
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_cxx_namespaces" 1>&6
-  if test "$ace_cv_feature_cxx_namespaces" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_NAMESPACES 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for C++ standard namespace""... $ac_c" 1>&6
-echo "configure:15601: checking for C++ standard namespace" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_posix_uses_std_namespace'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 15607 "configure"
-#include "confdefs.h"
-
-#include <iostream.h>
-                   
-int main() {
-
-                    std::cout << "FOO" << endl;
-                   
-; return 0; }
-EOF
-if { (eval echo configure:15618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                    ace_cv_feature_posix_uses_std_namespace=yes
-                   
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    ace_cv_feature_posix_uses_std_namespace=no
-                   
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_posix_uses_std_namespace" 1>&6
-  if test "$ace_cv_feature_posix_uses_std_namespace" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for C++ \"using\" keyword support""... $ac_c" 1>&6
-echo "configure:15650: checking for C++ \"using\" keyword support" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_cxx_using_keyword'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 15656 "configure"
-#include "confdefs.h"
-
-#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-# include <iostream.h>
-#elif !defined (ACE_HAS_BROKEN_NAMESPACES)
-  namespace ACE
-  {
-   int x;
-  }
-#endif
-                  
-int main() {
-
-#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-  using namespace std;
-
-  cout << "FOO" << endl;
-#elif !defined (ACE_HAS_BROKEN_NAMESPACES)
-  using namespace ACE;
-
-  x++;
-#else
-# error Namespaces are not supported on this platform.
-Throw in some extraneous text since compilers are stupid enough
-to interpret "#error" as a warning.  Go figure. :(
-This extraneous text should force an error.
-#endif
-                  
-; return 0; }
-EOF
-if { (eval echo configure:15687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                   ace_cv_feature_cxx_using_keyword=yes
-                  
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                   ace_cv_feature_cxx_using_keyword=no
-                  
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_cxx_using_keyword" 1>&6
-  if test "$ace_cv_feature_cxx_using_keyword" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_USING_KEYWORD 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for new style C++ include file support""... $ac_c" 1>&6
-echo "configure:15719: checking for new style C++ include file support" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_standard_includes'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ace_cv_lib_posix_standard_includes=no
-    if test "$ace_cv_feature_posix_uses_std_namespace" = yes; then
-      cat > conftest.$ac_ext <<EOF
-#line 15727 "configure"
-#include "confdefs.h"
-
-#include <string>
-        
-int main() {
-
-         std::string str;
-        
-; return 0; }
-EOF
-if { (eval echo configure:15738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_lib_posix_standard_includes=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-    else
-      cat > conftest.$ac_ext <<EOF
-#line 15748 "configure"
-#include "confdefs.h"
-
-#include <string>
-        
-int main() {
-
-         string str;
-        
-; return 0; }
-EOF
-if { (eval echo configure:15759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_lib_posix_standard_includes=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-    fi
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_standard_includes" 1>&6
-  if test "$ace_cv_lib_posix_standard_includes" != no; then
-    ace_just_a_place_holder=fixme
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_STDCPP_STL_INCLUDES 1
-EOF
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_STRING_CLASS 1
-EOF
-
-  
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-if test "$ac_cv_header_new" = yes &&
-   test "$ac_cv_header_iomanip" = yes &&
-   test "$ac_cv_header_memory" = yes; then
-
-    
-  echo $ac_n "checking for C++ auto_ptr class""... $ac_c" 1>&6
-echo "configure:15796: checking for C++ auto_ptr class" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_auto_ptr_class'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 15802 "configure"
-#include "confdefs.h"
-
-#include <memory>
-
-        template <class T>
-        class Foo
-        {
-        public:
-          Foo (void);
-          ~Foo (void);
-
-          T* bar (void) const { return this->bar_; }
-        private:
-          T* bar_;
-        };
-       
-int main() {
-
-        Foo<int *> Baz = 0;
-
-#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
-        std::auto_ptr<Foo<int *> > Foobar;
-#else
-        auto_ptr<Foo<int *> > Foobar;
-#endif
-        Foobar = Baz;
-       
-; return 0; }
-EOF
-if { (eval echo configure:15832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_lib_auto_ptr_class=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_lib_auto_ptr_class=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_lib_auto_ptr_class" 1>&6
-  if test "$ace_cv_lib_auto_ptr_class" != no; then
-    ace_just_a_place_holder=fixme
-
-     cat >> confdefs.h <<\EOF
-#define ACE_HAS_STANDARD_CPP_LIBRARY 1
-EOF
-
-    
-  else
-    ace_just_a_place_holder=fixme
-
-     cat >> confdefs.h <<\EOF
-#define ACE_LACKS_AUTO_PTR 1
-EOF
-
-    
-
-  fi
-
-fi
-
-
-  echo $ac_n "checking for ANSI C++ cast support""... $ac_c" 1>&6
-echo "configure:15873: checking for ANSI C++ cast support" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_standard_casts'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-    cat > conftest.$ac_ext <<EOF
-#line 15896 "configure"
-#include "confdefs.h"
-/* No headers */
-int main() {
-
-       class B { public: int b_; virtual int b() const = 0; };
-       class D : public B { virtual int b() const { return b_; } };
-
-       void* vp = 0;
-       char* cp = 0;
-       float f = 1.0;
-       int i = 0;
-       int* ip = 0;
-       const int* jp = 0;
-
-       i = static_cast<int> (f);
-       ip = const_cast<int*> (jp);
-       cp = reinterpret_cast<char*> (vp);
-
-       B* bp = new D;
-       D* dp = dynamic_cast<D*> (bp);
-       delete bp;
-      
-; return 0; }
-EOF
-if { (eval echo configure:15921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_standard_casts=yes
-       if eval "test \"`echo '$''{'ace_cv_lib_rtti'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ace_cv_lib_rtti=yes
-fi
-
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       cat > conftest.$ac_ext <<EOF
-#line 15938 "configure"
-#include "confdefs.h"
-/* No headers */
-int main() {
-
-          class B { public: int b_; virtual int b() const = 0; };
-          class D : public B { virtual int b() const { return b_; } };
-
-          void* vp = 0;
-          char* cp = 0;
-          float f = 1.0;
-          int i = 0;
-          int* ip = 0;
-          const int* jp = 0;
-
-          i = static_cast<int> (f);
-          ip = const_cast<int*> (jp);
-          cp = reinterpret_cast<char*> (vp);
-         
-; return 0; }
-EOF
-if { (eval echo configure:15959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-          ace_cv_lib_posix_standard_casts=yes
-          if eval "test \"`echo '$''{'ace_cv_lib_rtti'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ace_cv_lib_rtti=no
-fi
-
-         
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-          ace_cv_lib_posix_standard_casts=no
-         
-fi
-rm -f conftest*
-      
-fi
-rm -f conftest*
-   
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_standard_casts" 1>&6
-  if test "$ace_cv_lib_posix_standard_casts" != no; then
-    ace_just_a_place_holder=fixme
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_ANSI_CASTS 1
-EOF
-
-   if test "$ace_cv_lib_rtti" != yes; then
-     cat >> confdefs.h <<\EOF
-#define ACE_LACKS_RTTI 1
-EOF
-
-   fi
-  
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking if const char * can be rvalue in conditional operator""... $ac_c" 1>&6
-echo "configure:16012: checking if const char * can be rvalue in conditional operator" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_conditional_str_cast'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 16018 "configure"
-#include "confdefs.h"
-
-int main() {
-
-                   const char * foo = 0;
-                   const char * bar = 0;
-
-                   const char * ace = ((1 < 2) ? foo : bar);
-                  
-; return 0; }
-EOF
-if { (eval echo configure:16030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                   ace_cv_feature_conditional_str_cast=yes
-                  
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                   ace_cv_feature_conditional_str_cast=no
-                  
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_conditional_str_cast" 1>&6
-  if test "$ace_cv_feature_conditional_str_cast" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for explicit template instantiation""... $ac_c" 1>&6
-echo "configure:16063: checking for explicit template instantiation" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_explicit_template_instantiation'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 16069 "configure"
-#include "confdefs.h"
-
-                 template <class T>
-                 class Foo
-                 {
-                 public:
-                   Foo(T bar) : bar_(bar) {};
-                 private:
-                   T bar_;
-                 };
-
-                 template class Foo<int>;
-                
-int main() {
-
-                 Foo<int> foo(11);
-                
-; return 0; }
-EOF
-if { (eval echo configure:16089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-                 ace_cv_feature_explicit_template_instantiation=yes
-                
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                 ace_cv_feature_explicit_template_instantiation=no
-                
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_explicit_template_instantiation" 1>&6
-  if test "$ace_cv_feature_explicit_template_instantiation" != no; then
-    ace_just_a_place_holder=fixme
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION 1
-EOF
-
-  
-  else
-    ace_just_a_place_holder=fixme
-
-   
-  echo $ac_n "checking for pragma template instantiation""... $ac_c" 1>&6
-echo "configure:16120: checking for pragma template instantiation" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_pragma_template_instantiation'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-       cat > conftest.$ac_ext <<EOF
-#line 16126 "configure"
-#include "confdefs.h"
-
-                       template <class T>
-                       class Foo
-                       {
-                       public:
-                         Foo(T bar) : bar_(bar) {};
-                       private:
-                         T bar_;
-                       };
-#pragma instantiate Foo<int>;
-                      
-int main() {
-
-                       Foo<int> foo(11);
-                      
-; return 0; }
-EOF
-if { (eval echo configure:16145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                       ace_cv_feature_pragma_template_instantiation=yes
-                      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                       ace_cv_feature_pragma_template_instantiation=no
-                      
-fi
-rm -f conftest*
-     
-fi
-
-  echo "$ac_t""$ace_cv_feature_pragma_template_instantiation" 1>&6
-  if test "$ace_cv_feature_pragma_template_instantiation" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-  
-
-  fi
-
-
-
-  echo $ac_n "checking if templates require source""... $ac_c" 1>&6
-echo "configure:16181: checking if templates require source" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_templates_require_source'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.h <<EOF
-#ifndef FOO_H
-#define FOO_H
-template <class T>
-class Foo
-{
- public:
-   Foo (T val);
- private:
-   T value_;
-};
-#endif /* FOO_H */
-EOF
-
-      cat > conftest.$ac_ext <<EOF
-#include "conftest.h"
-#ifndef FOO_CXX
-#define FOO_CXX
-template <class T>
-Foo<T>::Foo (T val)
-{
- value_ = val;
-}
-#endif /* FOO_CXX */
-EOF
-
-      cat > conftestMain.$ac_ext <<EOF
-#include "conftest.h"
-int main ()
-{
- Foo<int> foo (15);
-
- return 0;
-}
-EOF
-
-   ace_save_ac_link="$ac_link"
-
-      ac_link='${CXX-g++} -o conftest${ac_exeext} conftestMain.$ac_ext 1>&5'
-
-      if { (eval echo configure:16226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-     rm -rf conftest*
-          ac_link="$ace_save_ac_link"
-
-          ace_cv_feature_templates_require_source=no
-   else
-          cat >> conftestMain.$ac_ext <<EOF
-
-#include "conftest.$ac_ext"
-EOF
-
-     if { (eval echo configure:16237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-       rm -rf conftest*
-              ac_link="$ace_save_ac_link"
-
-              ace_cv_feature_templates_require_source=yes
-     else
-              echo "configure: failed program was:" >&5
-       echo "conftest.h:" >&5
-       cat conftest.h >&5
-       echo "conftest.$ac_ext:" >&5
-       cat conftest.$ac_ext >&5
-       echo "conftestMain.$ac_ext:" >&5
-       cat conftestMain.$ac_ext >&5
-       rm -rf conftest*
-              ac_link="$ace_save_ac_link"
-
-       ace_cv_feature_templates_require_source=no
-     fi
-   fi
-   rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_templates_require_source" 1>&6
-  if test "$ace_cv_feature_templates_require_source" != no; then
-    ace_just_a_place_holder=fixme
-
-   cat >> confdefs.h <<\EOF
-#define ACE_TEMPLATES_REQUIRE_SOURCE 1
-EOF
-
-  
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for template specialization""... $ac_c" 1>&6
-echo "configure:16277: checking for template specialization" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_cxx_template_specialization'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 16283 "configure"
-#include "confdefs.h"
-
-// Some compilers have a hard time with this test since the syntax is
-// too "new" for them.
-
-// general vector type
-template<class T>
-class Vector
-{
-public:
-  Vector (void);
-  Vector (int);
-
-  T& elem (int i) { return v[i]; }
-  T& operator[] (int i);
-private:
-  T* v;
-  int sz;
-};
-
-// void * specialization
-template<>
-class Vector<void *>
-{
-public:
-  Vector (void);
-  Vector (int);
-
-  void*& elem (int i) { return p[i]; }
-  void*& operator[] (int i);
-private:
-  void** p;
-  int sz;
-};
-                   
-int main() {
-
-Vector<int> vi;
-Vector<void *> vpv;
-                   
-; return 0; }
-EOF
-if { (eval echo configure:16326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                    ace_cv_feature_cxx_template_specialization=yes
-                   
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                                        cat > conftest.$ac_ext <<EOF
-#line 16337 "configure"
-#include "confdefs.h"
-
-                       template <class T>
-                       class Foo
-                       {
-                       public:
-                         Foo(T bar) : bar_(bar) {};
-                       private:
-                         T bar_;
-                       };
-
-                       class Foo<int>
-                       {
-                       public:
-                         Foo(int bar) : bar_(bar + 1) {};
-                       private:
-                         int bar_;
-                       };
-                      
-int main() {
-
-                       Foo<int> foo(11);
-                      
-; return 0; }
-EOF
-if { (eval echo configure:16363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                       ace_cv_feature_cxx_template_specialization=yes
-                      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                       ace_cv_feature_cxx_template_specialization=no
-                      
-fi
-rm -f conftest*
-                   
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_cxx_template_specialization" 1>&6
-  if test "$ace_cv_feature_cxx_template_specialization" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_TEMPLATE_SPECIALIZATION 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for C++ typename keyword""... $ac_c" 1>&6
-echo "configure:16398: checking for C++ typename keyword" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_posix_typename_keyword'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 16404 "configure"
-#include "confdefs.h"
-
-                     class Bar
-                     {
-                     public:
-                       typedef int Y;
-                       Bar(int bar) : bar_(bar) {}
-                     private:
-                       int bar_;
-                     };
-
-                     template <class T>
-                     class Foo
-                     {
-                     public:
-                       typedef typename T::Y Y;
-                       Foo(T* foo) : foo_(foo) {}
-                       void bilbo(typename T::Y y);
-                     private:
-                       T* foo_;
-                     };
-
-                     template <class T>
-                     void Foo<T>::bilbo(typename T::Y y)
-                     {
-                     }
-                   
-int main() {
-
-                     Bar bar(15);
-                     Foo<Bar> foo(&bar);
-                     foo.bilbo(10);
-                   
-; return 0; }
-EOF
-if { (eval echo configure:16440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                    ace_cv_feature_posix_typename_keyword=yes
-                   
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    ace_cv_feature_posix_typename_keyword=no
-                   
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_posix_typename_keyword" 1>&6
-  if test "$ace_cv_feature_posix_typename_keyword" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_TYPENAME_KEYWORD 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for template typedefs""... $ac_c" 1>&6
-echo "configure:16472: checking for template typedefs" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_posix_template_typedefs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 16478 "configure"
-#include "confdefs.h"
-
-#if defined (ACE_HAS_TYPENAME_KEYWORD)
-#define TYPENAME typename
-#else
-#define TYPENAME
-#endif
-
-                     class Bar
-                     {
-                     public:
-                       typedef int Y;
-                       Bar(int bar) : bar_(bar) {}
-                       int value() const { return bar_; }
-                     private:
-                       int bar_;
-                     };
-
-                     template <class T>
-                     class Foo
-                     {
-                     public:
-                       typedef TYPENAME T::Y Y;
-                       Foo(T* foo) : foo_(foo) {}
-                       void print(Y y);
-                     private:
-                       T* foo_;
-                     };
-
-                     template <class T>
-                     void Foo<T>::print(TYPENAME T::Y y)
-                     {
-                     }
-                   
-int main() {
-
-                     Bar bar(15);
-                     Foo<Bar> foo(&bar);
-                     foo.print(11);
-                   
-; return 0; }
-EOF
-if { (eval echo configure:16521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                    ace_cv_feature_posix_template_typedefs=yes
-                   
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    ace_cv_feature_posix_template_typedefs=no
-                   
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_posix_template_typedefs" 1>&6
-  if test "$ace_cv_feature_posix_template_typedefs" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_TEMPLATE_TYPEDEFS 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for static data member templates""... $ac_c" 1>&6
-echo "configure:16553: checking for static data member templates" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_posix_static_data_member_templates'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 16559 "configure"
-#include "confdefs.h"
-
-                     template <class T>
-                     class Foo
-                     {
-                     public:
-                       static T* sdm;
-                     };
-
-                     template <class T> T* Foo<T>::sdm = 0;
-                   
-int main() {
-
-                    /* No body */
-                   
-; return 0; }
-EOF
-if { (eval echo configure:16577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                    ace_cv_feature_posix_static_data_member_templates=yes
-                   
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    ace_cv_feature_posix_static_data_member_templates=no
-                   
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_posix_static_data_member_templates" 1>&6
-  if test "$ace_cv_feature_posix_static_data_member_templates" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking if definition is needed for hidden functions""... $ac_c" 1>&6
-echo "configure:16610: checking if definition is needed for hidden functions" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_need_func_def'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 16616 "configure"
-#include "confdefs.h"
-
-      class Foo
-      {
-       public:
-         Foo (void) { a_ = 0; }
-       private:
-         Foo (const Foo &);
-         void operator= (const Foo &);
-
-         int a_;
-      };
-     
-int main() {
-
-       Foo Bar;
-     
-; return 0; }
-EOF
-if { (eval echo configure:16636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-      ace_cv_feature_need_func_def=no
-     
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-      cat > conftest.$ac_ext <<EOF
-#line 16647 "configure"
-#include "confdefs.h"
-
-         class Foo
-         {
-          public:
-            Foo (void) { a_ = 0; }
-          private:
-            Foo (const Foo &);
-            const Foo & operator= (const Foo &);
-
-            int a_;
-         };
-
-         Foo::Foo (const Foo &)
-         {
-          a_ = 0;
-         }
-
-         const Foo &
-         Foo::operator= (const Foo &)
-         {
-          a_ = 0;
-
-          return *this;
-         }
-        
-int main() {
-
-         Foo Bar;
-        
-; return 0; }
-EOF
-if { (eval echo configure:16680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-         ace_cv_feature_need_func_def=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                  ace_cv_feature_need_func_def=no
-        
-fi
-rm -f conftest*
-     
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_need_func_def" 1>&6
-  if test "$ace_cv_feature_need_func_def" != no; then
-    ace_just_a_place_holder=fixme
-
-   cat >> confdefs.h <<\EOF
-#define ACE_NEEDS_FUNC_DEFINITIONS 1
-EOF
-
-  
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-if test "$ace_user_enable_exceptions" = yes; then
-  
-  echo $ac_n "checking for C++ exceptions""... $ac_c" 1>&6
-echo "configure:16718: checking for C++ exceptions" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_posix_exceptions'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 16724 "configure"
-#include "confdefs.h"
-
-int main() {
-
-                       int ret = 0;
-                       class ACE {};
-                       try
-                         {
-                           throw ACE();
-                         }
-                       catch (ACE)
-                         {
-                           ret = 1;
-                         }
-                     
-; return 0; }
-EOF
-if { (eval echo configure:16742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                      ace_cv_feature_posix_exceptions=yes
-                     
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                      ace_cv_feature_posix_exceptions=no
-                     
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_feature_posix_exceptions" 1>&6
-  if test "$ace_cv_feature_posix_exceptions" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_EXCEPTIONS 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-ace_user_enable_exceptions=no
-
-  fi
-
-
-fi 
-                          
-
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:16780: checking for working alloca.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 16785 "configure"
-#include "confdefs.h"
-#include <alloca.h>
-int main() {
-char *p = alloca(2 * sizeof(int));
-; return 0; }
-EOF
-if { (eval echo configure:16792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_header_alloca_h=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_alloca_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
-if test $ac_cv_header_alloca_h = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA_H 1
-EOF
-
-fi
-
-echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:16813: checking for alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 16818 "configure"
-#include "confdefs.h"
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  if HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int main() {
-char *p = (char *) alloca(1);
-; return 0; }
-EOF
-if { (eval echo configure:16846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_func_alloca_works=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_func_alloca_works=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
-if test $ac_cv_func_alloca_works = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA 1
-EOF
-
-fi
-
-if test $ac_cv_func_alloca_works = no; then
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-  # that cause trouble.  Some versions do not even contain alloca or
-  # contain a buggy version.  If you still want to use their alloca,
-  # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.${ac_objext}
-  cat >> confdefs.h <<\EOF
-#define C_ALLOCA 1
-EOF
-
-
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:16878: checking whether alloca needs Cray hooks" >&5
-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 16883 "configure"
-#include "confdefs.h"
-#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "webecray" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_os_cray=yes
-else
-  rm -rf conftest*
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_os_cray" 1>&6
-if test $ac_cv_os_cray = yes; then
-for ac_func in _getb67 GETB67 getb67; do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16908: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 16913 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:16939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<EOF
-#define CRAY_STACKSEG_END $ac_func
-EOF
-
-  break
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-done
-fi
-
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:16966: checking stack direction for C alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat > conftest.$ac_ext <<EOF
-#line 16974 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
-main ()
-{
-  exit (find_stack_direction() < 0);
-}
-EOF
-if { (eval echo configure:16996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_stack_direction=1
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_stack_direction=-1
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
-cat >> confdefs.h <<EOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-EOF
-
-fi
-
-if test "$ac_cv_header_alloca_h" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_ALLOCA_H 1
-EOF
-
-fi
-if test "$ac_cv_func_alloca_works" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_ALLOCA 1
-EOF
-
-fi
-
-
-echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6
-echo "configure:17032: checking whether closedir returns void" >&5
-if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_closedir_void=yes
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17040 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-#include <sys/types.h>
-#include <$ac_header_dirent>
-int closedir(); main() { exit(closedir(opendir(".")) != 0); }
-EOF
-if { (eval echo configure:17049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_closedir_void=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_closedir_void=yes
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_closedir_void" 1>&6
-if test $ac_cv_func_closedir_void = yes; then
-  cat >> confdefs.h <<\EOF
-#define CLOSEDIR_VOID 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for getpwnam""... $ac_c" 1>&6
-echo "configure:17073: checking for getpwnam" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getpwnam'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17078 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getpwnam(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getpwnam();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getpwnam) || defined (__stub___getpwnam)
-choke me
-#else
-getpwnam();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_getpwnam=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_getpwnam=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'getpwnam`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- echo $ac_n "checking for setpwent""... $ac_c" 1>&6
-echo "configure:17123: checking for setpwent" >&5
-if eval "test \"`echo '$''{'ac_cv_func_setpwent'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17128 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char setpwent(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char setpwent();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_setpwent) || defined (__stub___setpwent)
-choke me
-#else
-setpwent();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_setpwent=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_setpwent=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'setpwent`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- echo $ac_n "checking for endpwent""... $ac_c" 1>&6
-echo "configure:17173: checking for endpwent" >&5
-if eval "test \"`echo '$''{'ac_cv_func_endpwent'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17178 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char endpwent(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char endpwent();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_endpwent) || defined (__stub___endpwent)
-choke me
-#else
-endpwent();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_endpwent=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_endpwent=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'endpwent`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- echo $ac_n "checking for getpwent""... $ac_c" 1>&6
-echo "configure:17223: checking for getpwent" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getpwent'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17228 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getpwent(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getpwent();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getpwent) || defined (__stub___getpwent)
-choke me
-#else
-getpwent();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_getpwent=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_getpwent=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'getpwent`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-if test "$ac_cv_func_getpwnam" != yes ||
-  test "$ac_cv_func_setpwent" != yes ||
-  test "$ac_cv_func_endpwent" != yes ||
-  test "$ac_cv_func_getpwent" != yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_LACKS_PWD_FUNCTIONS 1
-EOF
-
-fi
-
-echo $ac_n "checking for strftime""... $ac_c" 1>&6
-echo "configure:17284: checking for strftime" >&5
-if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17289 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strftime(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char strftime();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_strftime) || defined (__stub___strftime)
-choke me
-#else
-strftime();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_strftime=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_strftime=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'strftime`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_STRFTIME 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-# strftime is in -lintl on SCO UNIX.
-echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
-echo "configure:17337: checking for strftime in -lintl" >&5
-ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lintl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 17345 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char strftime();
-
-int main() {
-strftime()
-; return 0; }
-EOF
-if { (eval echo configure:17359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_STRFTIME 1
-EOF
-
-LIBS="-lintl $LIBS"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-
-case "$target" in
-  *win32*)
-     echo $ac_n "checking for CancelIO""... $ac_c" 1>&6
-echo "configure:17389: checking for CancelIO" >&5
-if eval "test \"`echo '$''{'ac_cv_func_CancelIO'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17394 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char CancelIO(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char CancelIO();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_CancelIO) || defined (__stub___CancelIO)
-choke me
-#else
-CancelIO();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_CancelIO=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_CancelIO=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'CancelIO`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-         cat >> confdefs.h <<\EOF
-#define ACE_HAS_CANCEL_IO 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-     echo $ac_n "checking for SignalObjectAndWait""... $ac_c" 1>&6
-echo "configure:17444: checking for SignalObjectAndWait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_SignalObjectAndWait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17449 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char SignalObjectAndWait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char SignalObjectAndWait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_SignalObjectAndWait) || defined (__stub___SignalObjectAndWait)
-choke me
-#else
-SignalObjectAndWait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_SignalObjectAndWait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_SignalObjectAndWait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'SignalObjectAndWait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-         cat >> confdefs.h <<\EOF
-#define ACE_HAS_SIGNAL_OBJECT_AND_WAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-     echo $ac_n "checking for TryEnterCriticalSection""... $ac_c" 1>&6
-echo "configure:17499: checking for TryEnterCriticalSection" >&5
-if eval "test \"`echo '$''{'ac_cv_func_TryEnterCriticalSection'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17504 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char TryEnterCriticalSection(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char TryEnterCriticalSection();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_TryEnterCriticalSection) || defined (__stub___TryEnterCriticalSection)
-choke me
-#else
-TryEnterCriticalSection();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_TryEnterCriticalSection=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_TryEnterCriticalSection=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'TryEnterCriticalSection`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-         cat >> confdefs.h <<\EOF
-#define ACE_HAS_WIN32_TRYLOCK 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-     ;;
-  *)
-     ;;
-esac
-
-echo $ac_n "checking for access""... $ac_c" 1>&6
-echo "configure:17558: checking for access" >&5
-if eval "test \"`echo '$''{'ac_cv_func_access'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17563 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char access(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char access();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_access) || defined (__stub___access)
-choke me
-#else
-access();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_access=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_access=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'access`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_ACCESS 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for bsearch""... $ac_c" 1>&6
-echo "configure:17614: checking for bsearch" >&5
-if eval "test \"`echo '$''{'ac_cv_func_bsearch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17619 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char bsearch(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char bsearch();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_bsearch) || defined (__stub___bsearch)
-choke me
-#else
-bsearch();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_bsearch=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_bsearch=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'bsearch`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_BSEARCH 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for qsort""... $ac_c" 1>&6
-echo "configure:17670: checking for qsort" >&5
-if eval "test \"`echo '$''{'ac_cv_func_qsort'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17675 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char qsort(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char qsort();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_qsort) || defined (__stub___qsort)
-choke me
-#else
-qsort();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_qsort=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_qsort=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'qsort`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_QSORT 1
-EOF
-
-fi
-
-
-for ac_func in execv execvp execve
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17728: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17733 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-   
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_EXEC 1
-EOF
-
-fi
-done
-
-
-echo $ac_n "checking for fcntl""... $ac_c" 1>&6
-echo "configure:17789: checking for fcntl" >&5
-if eval "test \"`echo '$''{'ac_cv_func_fcntl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17794 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char fcntl(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char fcntl();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_fcntl) || defined (__stub___fcntl)
-choke me
-#else
-fcntl();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_fcntl=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_fcntl=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'fcntl`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_FCNTL 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for fsync""... $ac_c" 1>&6
-echo "configure:17845: checking for fsync" >&5
-if eval "test \"`echo '$''{'ac_cv_func_fsync'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17850 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char fsync(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char fsync();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_fsync) || defined (__stub___fsync)
-choke me
-#else
-fsync();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_fsync=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_fsync=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'fsync`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_FSYNC 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for getmsg""... $ac_c" 1>&6
-echo "configure:17901: checking for getmsg" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getmsg'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17906 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getmsg(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getmsg();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getmsg) || defined (__stub___getmsg)
-choke me
-#else
-getmsg();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_getmsg=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_getmsg=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'getmsg`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_STREAM_PIPES 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6
-echo "configure:17956: checking for gethostbyaddr" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17961 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyaddr(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyaddr();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyaddr) || defined (__stub___gethostbyaddr)
-choke me
-#else
-gethostbyaddr();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:17987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyaddr=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyaddr=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gethostbyaddr`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-echo $ac_n "checking for difftime""... $ac_c" 1>&6
-echo "configure:18007: checking for difftime" >&5
-if eval "test \"`echo '$''{'ac_cv_func_difftime'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18012 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char difftime(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char difftime();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_difftime) || defined (__stub___difftime)
-choke me
-#else
-difftime();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_difftime=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_difftime=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'difftime`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_DIFFTIME 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for bind""... $ac_c" 1>&6
-echo "configure:18063: checking for bind" >&5
-if eval "test \"`echo '$''{'ac_cv_func_bind'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18068 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char bind(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char bind();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_bind) || defined (__stub___bind)
-choke me
-#else
-bind();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_bind=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_bind=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'bind`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   
-  echo $ac_n "checking if bind() will select the port if it is zero""... $ac_c" 1>&6
-echo "configure:18111: checking if bind() will select the port if it is zero" >&5
-  if eval "test \"`echo '$''{'ace_cv_have_wildcard_bind'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      if test "$cross_compiling" = yes; then
-  
-                  ace_cv_have_wildcard_bind=yes
-        
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18122 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <string.h>  /* for memset() */
-
-         int main () {
-
-           int sockfd = socket(AF_INET, SOCK_STREAM, 0);
-
-           sockaddr_in serv_addr;
-
-           (void) memset ((void *) &serv_addr, 0, sizeof(serv_addr));
-
-           serv_addr.sin_family      = AF_INET;
-           serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-           serv_addr.sin_port        = 0;
-
-           return bind (sockfd, (struct sockaddr *) &serv_addr,
-                        sizeof(serv_addr));
-         }
-        
-EOF
-if { (eval echo configure:18152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  
-         ace_cv_have_wildcard_bind=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  
-         ace_cv_have_wildcard_bind=no
-        
-fi
-rm -fr conftest*
-fi
-
-     
-fi
-
-  echo "$ac_t""$ace_cv_have_wildcard_bind" 1>&6
-  if test "$ace_cv_have_wildcard_bind" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_WILDCARD_BIND 1
-EOF
-
-
-  fi
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for poll""... $ac_c" 1>&6
-echo "configure:18191: checking for poll" >&5
-if eval "test \"`echo '$''{'ac_cv_func_poll'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18196 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char poll(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char poll();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_poll) || defined (__stub___poll)
-choke me
-#else
-poll();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_poll=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_poll=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'poll`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   
-  echo $ac_n "checking if poll is broken""... $ac_c" 1>&6
-echo "configure:18239: checking if poll is broken" >&5
-  if eval "test \"`echo '$''{'ace_cv_poll_is_broken'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      if test "$cross_compiling" = yes; then
-  
-                  ace_cv_poll_is_broken=no
-        
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18250 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-#include <poll.h>
-#include <time.h>
-
-#ifdef ACE_LACKS_SYSTIME_H
-# include <sys/time.h>
-#endif
-
-         int main () {
-
-         int timeout = 2000; /* 2000 milliseconds */
-         int timeout_arg = timeout;
-                      /* poll() modifies timeout argument on some platforms */
- 
-         int result = 0;
-
-         time_t *t = 0;
-
-         time_t time1 = time(t);
-
-         result = poll(0, 0, timeout_arg);
-
-         time_t time2 = time(t);
-         time_t diff = time2 - time1;
-
-         /* If (diff * 1000) < timeout then poll() is broken! */
-         if (result >= 0)
-           return (((diff * 1000) < timeout) ? 1 : 0);
-         else
-           return 1; /* We had a problem with poll() so we don't
-                        know what really happened. */
-         }
-        
-EOF
-if { (eval echo configure:18289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  
-         ace_cv_poll_is_broken=no
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  
-         ace_cv_poll_is_broken=yes
-        
-fi
-rm -fr conftest*
-fi
-
-     
-fi
-
-  echo "$ac_t""$ace_cv_poll_is_broken" 1>&6
-  if test "$ace_cv_poll_is_broken" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_POLL_IS_BROKEN 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_USE_POLL 1
-EOF
-
-
-  fi
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for gethrtime""... $ac_c" 1>&6
-echo "configure:18331: checking for gethrtime" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethrtime'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18336 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethrtime(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethrtime();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethrtime) || defined (__stub___gethrtime)
-choke me
-#else
-gethrtime();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_gethrtime=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_gethrtime=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gethrtime`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   
-
-  
-  echo $ac_n "checking for hrtime_t in sys/time.h""... $ac_c" 1>&6
-echo "configure:18381: checking for hrtime_t in sys/time.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_type_hrtime_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 18387 "configure"
-#include "confdefs.h"
-
-#include <sys/time.h>
-       
-int main() {
-
-        hrtime_t ace_hrtime_t;
-       
-; return 0; }
-EOF
-if { (eval echo configure:18398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_type_hrtime_t=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_type_hrtime_t=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_type_hrtime_t" 1>&6
-  if test "$ace_cv_type_hrtime_t" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_HI_RES_TIMER 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for pread""... $ac_c" 1>&6
-echo "configure:18435: checking for pread" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pread'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18440 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pread(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pread();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pread) || defined (__stub___pread)
-choke me
-#else
-pread();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pread=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pread=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pread`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    echo $ac_n "checking for pwrite""... $ac_c" 1>&6
-echo "configure:18481: checking for pwrite" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pwrite'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18486 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pwrite(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pwrite();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pwrite) || defined (__stub___pwrite)
-choke me
-#else
-pwrite();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pwrite=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pwrite=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pwrite`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_P_READ_WRITE 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for readv""... $ac_c" 1>&6
-echo "configure:18540: checking for readv" >&5
-if eval "test \"`echo '$''{'ac_cv_func_readv'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18545 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char readv(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char readv();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_readv) || defined (__stub___readv)
-choke me
-#else
-readv();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_readv=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_readv=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'readv`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_READV 1
-EOF
-
-fi
- 
-echo $ac_n "checking for writev""... $ac_c" 1>&6
-echo "configure:18595: checking for writev" >&5
-if eval "test \"`echo '$''{'ac_cv_func_writev'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18600 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char writev(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char writev();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_writev) || defined (__stub___writev)
-choke me
-#else
-writev();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_writev=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_writev=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'writev`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_WRITEV 1
-EOF
-
-fi
- 
-echo $ac_n "checking for set_t_errno""... $ac_c" 1>&6
-echo "configure:18650: checking for set_t_errno" >&5
-if eval "test \"`echo '$''{'ac_cv_func_set_t_errno'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18655 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char set_t_errno(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char set_t_errno();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_set_t_errno) || defined (__stub___set_t_errno)
-choke me
-#else
-set_t_errno();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_set_t_errno=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_set_t_errno=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'set_t_errno`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_SET_T_ERRNO 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-echo $ac_n "checking for socketpair""... $ac_c" 1>&6
-echo "configure:18704: checking for socketpair" >&5
-if eval "test \"`echo '$''{'ac_cv_func_socketpair'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18709 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char socketpair(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char socketpair();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_socketpair) || defined (__stub___socketpair)
-choke me
-#else
-socketpair();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_socketpair=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_socketpair=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'socketpair`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SOCKETPAIR 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
-echo "configure:18760: checking for strcasecmp" >&5
-if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18765 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strcasecmp(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char strcasecmp();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_strcasecmp) || defined (__stub___strcasecmp)
-choke me
-#else
-strcasecmp();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_strcasecmp=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_strcasecmp=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'strcasecmp`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_STRCASECMP 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for strdup""... $ac_c" 1>&6
-echo "configure:18816: checking for strdup" >&5
-if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18821 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strdup(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char strdup();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_strdup) || defined (__stub___strdup)
-choke me
-#else
-strdup();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_strdup=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_strdup=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'strdup`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_STRDUP_EMULATION 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for strrchr""... $ac_c" 1>&6
-echo "configure:18872: checking for strrchr" >&5
-if eval "test \"`echo '$''{'ac_cv_func_strrchr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18877 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strrchr(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char strrchr();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_strrchr) || defined (__stub___strrchr)
-choke me
-#else
-strrchr();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_strrchr=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_strrchr=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'strrchr`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_STRRCHR 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for memchr""... $ac_c" 1>&6
-echo "configure:18928: checking for memchr" >&5
-if eval "test \"`echo '$''{'ac_cv_func_memchr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18933 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char memchr(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char memchr();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_memchr) || defined (__stub___memchr)
-choke me
-#else
-memchr();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:18959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_memchr=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_memchr=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'memchr`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_MEMCHR 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for syscall""... $ac_c" 1>&6
-echo "configure:18983: checking for syscall" >&5
-if eval "test \"`echo '$''{'ac_cv_func_syscall'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18988 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char syscall(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char syscall();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_syscall) || defined (__stub___syscall)
-choke me
-#else
-syscall();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_syscall=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_syscall=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'syscall`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SYSCALL 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for ualarm""... $ac_c" 1>&6
-echo "configure:19039: checking for ualarm" >&5
-if eval "test \"`echo '$''{'ac_cv_func_ualarm'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19044 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char ualarm(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char ualarm();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_ualarm) || defined (__stub___ualarm)
-choke me
-#else
-ualarm();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_ualarm=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_ualarm=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'ualarm`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_UALARM 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for alarm""... $ac_c" 1>&6
-echo "configure:19094: checking for alarm" >&5
-if eval "test \"`echo '$''{'ac_cv_func_alarm'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19099 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char alarm(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char alarm();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_alarm) || defined (__stub___alarm)
-choke me
-#else
-alarm();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_alarm=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_alarm=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'alarm`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- echo $ac_n "checking for signal""... $ac_c" 1>&6
-echo "configure:19144: checking for signal" >&5
-if eval "test \"`echo '$''{'ac_cv_func_signal'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19149 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char signal(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char signal();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_signal) || defined (__stub___signal)
-choke me
-#else
-signal();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_signal=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_signal=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'signal`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-if test "$ac_cv_func_alarm" != yes &&
-   test "$ac_cv_func_signal" != yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_LACKS_UNIX_SIGNALS 1
-EOF
-
-fi
-
-echo $ac_n "checking for fork""... $ac_c" 1>&6
-echo "configure:19203: checking for fork" >&5
-if eval "test \"`echo '$''{'ac_cv_func_fork'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19208 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char fork(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char fork();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_fork) || defined (__stub___fork)
-choke me
-#else
-fork();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_fork=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_fork=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'fork`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_FORK 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for getrlimit""... $ac_c" 1>&6
-echo "configure:19259: checking for getrlimit" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getrlimit'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19264 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getrlimit(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getrlimit();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getrlimit) || defined (__stub___getrlimit)
-choke me
-#else
-getrlimit();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_getrlimit=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_getrlimit=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'getrlimit`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   echo $ac_n "checking for setrlimit""... $ac_c" 1>&6
-echo "configure:19306: checking for setrlimit" >&5
-if eval "test \"`echo '$''{'ac_cv_func_setrlimit'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19311 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char setrlimit(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char setrlimit();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_setrlimit) || defined (__stub___setrlimit)
-choke me
-#else
-setrlimit();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_setrlimit=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_setrlimit=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'setrlimit`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_RLIMIT 1
-EOF
-
-fi
-
-  
-else
-  echo "$ac_t""no" 1>&6
-
-   cat >> confdefs.h <<\EOF
-#define ACE_LACKS_RLIMIT 1
-EOF
-
-  
-fi
-
-
-echo $ac_n "checking for sysinfo""... $ac_c" 1>&6
-echo "configure:19373: checking for sysinfo" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sysinfo'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19378 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sysinfo(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sysinfo();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sysinfo) || defined (__stub___sysinfo)
-choke me
-#else
-sysinfo();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sysinfo=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sysinfo=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sysinfo`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   if test "$ac_cv_header_sys_systeminfo_h" = yes; then
-     cat >> confdefs.h <<\EOF
-#define ACE_HAS_SYSINFO 1
-EOF
-
-   fi
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for strerror""... $ac_c" 1>&6
-echo "configure:19432: checking for strerror" >&5
-if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19437 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strerror(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char strerror();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_strerror) || defined (__stub___strerror)
-choke me
-#else
-strerror();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_strerror=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_strerror=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'strerror`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_STRERROR 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for lstat""... $ac_c" 1>&6
-echo "configure:19487: checking for lstat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_lstat'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19492 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char lstat(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char lstat();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_lstat) || defined (__stub___lstat)
-choke me
-#else
-lstat();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_lstat=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_lstat=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'lstat`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_LSTAT 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for readlink""... $ac_c" 1>&6
-echo "configure:19543: checking for readlink" >&5
-if eval "test \"`echo '$''{'ac_cv_func_readlink'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19548 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char readlink(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char readlink();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_readlink) || defined (__stub___readlink)
-choke me
-#else
-readlink();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_readlink=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_readlink=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'readlink`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_READLINK 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for rename""... $ac_c" 1>&6
-echo "configure:19599: checking for rename" >&5
-if eval "test \"`echo '$''{'ac_cv_func_rename'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19604 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char rename(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char rename();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_rename) || defined (__stub___rename)
-choke me
-#else
-rename();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_rename=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_rename=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'rename`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_RENAME 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for recvmsg""... $ac_c" 1>&6
-echo "configure:19655: checking for recvmsg" >&5
-if eval "test \"`echo '$''{'ac_cv_func_recvmsg'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19660 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char recvmsg(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char recvmsg();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_recvmsg) || defined (__stub___recvmsg)
-choke me
-#else
-recvmsg();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_recvmsg=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_recvmsg=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'recvmsg`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_RECVMSG 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for sendmsg""... $ac_c" 1>&6
-echo "configure:19711: checking for sendmsg" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sendmsg'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19716 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sendmsg(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sendmsg();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sendmsg) || defined (__stub___sendmsg)
-choke me
-#else
-sendmsg();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sendmsg=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sendmsg=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sendmsg`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SENDMSG 1
-EOF
-
-fi
-
-
-if test "$ace_has_tli" = yes; then
-  echo $ac_n "checking for t_getname""... $ac_c" 1>&6
-echo "configure:19768: checking for t_getname" >&5
-if eval "test \"`echo '$''{'ac_cv_func_t_getname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19773 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char t_getname(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char t_getname();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_t_getname) || defined (__stub___t_getname)
-choke me
-#else
-t_getname();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_t_getname=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_t_getname=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'t_getname`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_SVR4_TLI 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-echo $ac_n "checking for getrusage""... $ac_c" 1>&6
-echo "configure:19824: checking for getrusage" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getrusage'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19829 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getrusage(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getrusage();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getrusage) || defined (__stub___getrusage)
-choke me
-#else
-getrusage();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_getrusage=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_getrusage=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'getrusage`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_GETRUSAGE 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for getpgid""... $ac_c" 1>&6
-echo "configure:19879: checking for getpgid" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getpgid'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19884 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getpgid(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getpgid();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getpgid) || defined (__stub___getpgid)
-choke me
-#else
-getpgid();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_getpgid=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_getpgid=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'getpgid`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_GETPGID 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for getpagesize""... $ac_c" 1>&6
-echo "configure:19935: checking for getpagesize" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getpagesize'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19940 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getpagesize(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getpagesize();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getpagesize) || defined (__stub___getpagesize)
-choke me
-#else
-getpagesize();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:19966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_getpagesize=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_getpagesize=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'getpagesize`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_GETPAGESIZE 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_PAGE_SIZE 4096
-EOF
-
-fi
-
-
-echo $ac_n "checking for msync""... $ac_c" 1>&6
-echo "configure:19994: checking for msync" >&5
-if eval "test \"`echo '$''{'ac_cv_func_msync'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19999 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char msync(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char msync();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_msync) || defined (__stub___msync)
-choke me
-#else
-msync();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_msync=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_msync=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'msync`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MSYNC 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for mprotect""... $ac_c" 1>&6
-echo "configure:20050: checking for mprotect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mprotect'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20055 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char mprotect(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char mprotect();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_mprotect) || defined (__stub___mprotect)
-choke me
-#else
-mprotect();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_mprotect=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_mprotect=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'mprotect`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MPROTECT 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for mkfifo""... $ac_c" 1>&6
-echo "configure:20106: checking for mkfifo" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mkfifo'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20111 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char mkfifo(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char mkfifo();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_mkfifo) || defined (__stub___mkfifo)
-choke me
-#else
-mkfifo();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_mkfifo=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_mkfifo=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'mkfifo`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MKFIFO 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for mktemp""... $ac_c" 1>&6
-echo "configure:20162: checking for mktemp" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mktemp'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20167 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char mktemp(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char mktemp();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_mktemp) || defined (__stub___mktemp)
-choke me
-#else
-mktemp();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_mktemp=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_mktemp=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'mktemp`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MKTEMP 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for madvise""... $ac_c" 1>&6
-echo "configure:20218: checking for madvise" >&5
-if eval "test \"`echo '$''{'ac_cv_func_madvise'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20223 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char madvise(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char madvise();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_madvise) || defined (__stub___madvise)
-choke me
-#else
-madvise();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_madvise=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_madvise=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'madvise`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MADVISE 1
-EOF
-
-fi
-
-
-if test "$ac_cv_header_sys_priocntl_h" = yes; then
-  echo $ac_n "checking for priocntl""... $ac_c" 1>&6
-echo "configure:20275: checking for priocntl" >&5
-if eval "test \"`echo '$''{'ac_cv_func_priocntl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20280 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char priocntl(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char priocntl();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_priocntl) || defined (__stub___priocntl)
-choke me
-#else
-priocntl();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_priocntl=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_priocntl=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'priocntl`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_PRIOCNTL 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  if test "$ac_cv_func_priocntl" = no; then
-    
-  echo $ac_n "checking for priocntl macro""... $ac_c" 1>&6
-echo "configure:20332: checking for priocntl macro" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_has_priocntl_macro'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-       cat > conftest.$ac_ext <<EOF
-#line 20338 "configure"
-#include "confdefs.h"
-
-#include <sys/priocntl.h>
-
-#if defined (priocntl)
-            ACE_PRIOCNTL_MACRO
-#endif
-         
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_PRIOCNTL_MACRO" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-          ace_cv_lib_has_priocntl_macro=yes
-         
-else
-  rm -rf conftest*
-  
-          ace_cv_lib_has_priocntl_macro=no
-         
-fi
-rm -f conftest*
-
-      
-fi
-
-  echo "$ac_t""$ace_cv_lib_has_priocntl_macro" 1>&6
-  if test "$ace_cv_lib_has_priocntl_macro" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_PRIOCNTL 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-  fi fi 
-echo $ac_n "checking for sbrk""... $ac_c" 1>&6
-echo "configure:20379: checking for sbrk" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sbrk'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20384 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sbrk(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sbrk();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sbrk) || defined (__stub___sbrk)
-choke me
-#else
-sbrk();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sbrk=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sbrk=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sbrk`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SBRK 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for msgctl""... $ac_c" 1>&6
-echo "configure:20435: checking for msgctl" >&5
-if eval "test \"`echo '$''{'ac_cv_func_msgctl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20440 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char msgctl(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char msgctl();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_msgctl) || defined (__stub___msgctl)
-choke me
-#else
-msgctl();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_msgctl=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_msgctl=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'msgctl`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:20487: checking for msgget" >&5
-if eval "test \"`echo '$''{'ac_cv_func_msgget'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20492 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char msgget(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char msgget();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_msgget) || defined (__stub___msgget)
-choke me
-#else
-msgget();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_msgget=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_msgget=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'msgget`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for msgrcv""... $ac_c" 1>&6
-echo "configure:20539: checking for msgrcv" >&5
-if eval "test \"`echo '$''{'ac_cv_func_msgrcv'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20544 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char msgrcv(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char msgrcv();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_msgrcv) || defined (__stub___msgrcv)
-choke me
-#else
-msgrcv();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_msgrcv=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_msgrcv=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'msgrcv`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for semctl""... $ac_c" 1>&6
-echo "configure:20591: checking for semctl" >&5
-if eval "test \"`echo '$''{'ac_cv_func_semctl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20596 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char semctl(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char semctl();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_semctl) || defined (__stub___semctl)
-choke me
-#else
-semctl();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_semctl=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_semctl=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'semctl`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for semget""... $ac_c" 1>&6
-echo "configure:20643: checking for semget" >&5
-if eval "test \"`echo '$''{'ac_cv_func_semget'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20648 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char semget(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char semget();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_semget) || defined (__stub___semget)
-choke me
-#else
-semget();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_semget=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_semget=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'semget`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for semop""... $ac_c" 1>&6
-echo "configure:20695: checking for semop" >&5
-if eval "test \"`echo '$''{'ac_cv_func_semop'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20700 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char semop(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char semop();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_semop) || defined (__stub___semop)
-choke me
-#else
-semop();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_semop=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_semop=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'semop`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:20747: checking for shmat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20752 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shmat();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shmat) || defined (__stub___shmat)
-choke me
-#else
-shmat();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for shmctl""... $ac_c" 1>&6
-echo "configure:20799: checking for shmctl" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmctl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20804 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmctl(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shmctl();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shmctl) || defined (__stub___shmctl)
-choke me
-#else
-shmctl();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shmctl=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shmctl=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shmctl`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for shmdt""... $ac_c" 1>&6
-echo "configure:20851: checking for shmdt" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmdt'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20856 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmdt(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shmdt();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shmdt) || defined (__stub___shmdt)
-choke me
-#else
-shmdt();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shmdt=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shmdt=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shmdt`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for shmget""... $ac_c" 1>&6
-echo "configure:20903: checking for shmget" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmget'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20908 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmget(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shmget();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shmget) || defined (__stub___shmget)
-choke me
-#else
-shmget();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shmget=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shmget=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shmget`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for read_real_time""... $ac_c" 1>&6
-echo "configure:20955: checking for read_real_time" >&5
-if eval "test \"`echo '$''{'ac_cv_func_read_real_time'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20960 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char read_real_time(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char read_real_time();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_read_real_time) || defined (__stub___read_real_time)
-choke me
-#else
-read_real_time();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:20986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_read_real_time=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_read_real_time=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'read_real_time`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_AIX_HI_RES_TIMER 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for shm_open""... $ac_c" 1>&6
-echo "configure:21010: checking for shm_open" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shm_open'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21015 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shm_open(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shm_open();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shm_open) || defined (__stub___shm_open)
-choke me
-#else
-shm_open();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shm_open=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shm_open=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shm_open`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-   echo "configure: warning: platform supports shm_open but shm_open support will not be" 1>&2
-   echo "configure: warning: enabled since ACE currently supports it only on LynxOS" 1>&2
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for tempnam""... $ac_c" 1>&6
-echo "configure:21065: checking for tempnam" >&5
-if eval "test \"`echo '$''{'ac_cv_func_tempnam'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21070 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char tempnam(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char tempnam();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_tempnam) || defined (__stub___tempnam)
-choke me
-#else
-tempnam();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_tempnam=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_tempnam=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'tempnam`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_TEMPNAM 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for truncate""... $ac_c" 1>&6
-echo "configure:21121: checking for truncate" >&5
-if eval "test \"`echo '$''{'ac_cv_func_truncate'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21126 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char truncate(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char truncate();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_truncate) || defined (__stub___truncate)
-choke me
-#else
-truncate();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_truncate=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_truncate=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'truncate`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_TRUNCATE 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for recv_timedwait""... $ac_c" 1>&6
-echo "configure:21177: checking for recv_timedwait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_recv_timedwait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21182 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char recv_timedwait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char recv_timedwait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_recv_timedwait) || defined (__stub___recv_timedwait)
-choke me
-#else
-recv_timedwait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_recv_timedwait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_recv_timedwait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'recv_timedwait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_RECV_TIMEDWAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for recvfrom_timedwait""... $ac_c" 1>&6
-echo "configure:21232: checking for recvfrom_timedwait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_recvfrom_timedwait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21237 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char recvfrom_timedwait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char recvfrom_timedwait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_recvfrom_timedwait) || defined (__stub___recvfrom_timedwait)
-choke me
-#else
-recvfrom_timedwait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_recvfrom_timedwait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_recvfrom_timedwait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'recvfrom_timedwait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_RECVFROM_TIMEDWAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for recvmsg_timedwait""... $ac_c" 1>&6
-echo "configure:21287: checking for recvmsg_timedwait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_recvmsg_timedwait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21292 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char recvmsg_timedwait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char recvmsg_timedwait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_recvmsg_timedwait) || defined (__stub___recvmsg_timedwait)
-choke me
-#else
-recvmsg_timedwait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_recvmsg_timedwait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_recvmsg_timedwait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'recvmsg_timedwait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_RECVMSG_TIMEDWAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for send_timedwait""... $ac_c" 1>&6
-echo "configure:21342: checking for send_timedwait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_send_timedwait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21347 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char send_timedwait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char send_timedwait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_send_timedwait) || defined (__stub___send_timedwait)
-choke me
-#else
-send_timedwait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_send_timedwait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_send_timedwait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'send_timedwait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_SEND_TIMEDWAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for sendto_timedwait""... $ac_c" 1>&6
-echo "configure:21397: checking for sendto_timedwait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sendto_timedwait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21402 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sendto_timedwait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sendto_timedwait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sendto_timedwait) || defined (__stub___sendto_timedwait)
-choke me
-#else
-sendto_timedwait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sendto_timedwait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sendto_timedwait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sendto_timedwait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_SENDTO_TIMEDWAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for sendmsg_timedwait""... $ac_c" 1>&6
-echo "configure:21452: checking for sendmsg_timedwait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sendmsg_timedwait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21457 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sendmsg_timedwait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sendmsg_timedwait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sendmsg_timedwait) || defined (__stub___sendmsg_timedwait)
-choke me
-#else
-sendmsg_timedwait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sendmsg_timedwait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sendmsg_timedwait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sendmsg_timedwait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_SENDMSG_TIMEDWAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for read_timedwait""... $ac_c" 1>&6
-echo "configure:21507: checking for read_timedwait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_read_timedwait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21512 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char read_timedwait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char read_timedwait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_read_timedwait) || defined (__stub___read_timedwait)
-choke me
-#else
-read_timedwait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_read_timedwait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_read_timedwait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'read_timedwait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_READ_TIMEDWAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for readv_timedwait""... $ac_c" 1>&6
-echo "configure:21562: checking for readv_timedwait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_readv_timedwait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21567 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char readv_timedwait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char readv_timedwait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_readv_timedwait) || defined (__stub___readv_timedwait)
-choke me
-#else
-readv_timedwait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_readv_timedwait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_readv_timedwait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'readv_timedwait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_READV_TIMEDWAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for write_timedwait""... $ac_c" 1>&6
-echo "configure:21617: checking for write_timedwait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_write_timedwait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21622 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char write_timedwait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char write_timedwait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_write_timedwait) || defined (__stub___write_timedwait)
-choke me
-#else
-write_timedwait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_write_timedwait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_write_timedwait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'write_timedwait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_WRITE_TIMEDWAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for writev_timedwait""... $ac_c" 1>&6
-echo "configure:21672: checking for writev_timedwait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_writev_timedwait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21677 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char writev_timedwait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char writev_timedwait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_writev_timedwait) || defined (__stub___writev_timedwait)
-choke me
-#else
-writev_timedwait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_writev_timedwait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_writev_timedwait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'writev_timedwait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_WRITEV_TIMEDWAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for sem_init""... $ac_c" 1>&6
-echo "configure:21727: checking for sem_init" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sem_init'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21732 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sem_init(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sem_init();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sem_init) || defined (__stub___sem_init)
-choke me
-#else
-sem_init();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sem_init=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sem_init=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sem_init`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- echo $ac_n "checking for sem_destroy""... $ac_c" 1>&6
-echo "configure:21777: checking for sem_destroy" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sem_destroy'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21782 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sem_destroy(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sem_destroy();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sem_destroy) || defined (__stub___sem_destroy)
-choke me
-#else
-sem_destroy();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sem_destroy=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sem_destroy=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sem_destroy`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- echo $ac_n "checking for sem_open""... $ac_c" 1>&6
-echo "configure:21827: checking for sem_open" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sem_open'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21832 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sem_open(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sem_open();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sem_open) || defined (__stub___sem_open)
-choke me
-#else
-sem_open();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sem_open=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sem_open=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sem_open`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- echo $ac_n "checking for sem_close""... $ac_c" 1>&6
-echo "configure:21877: checking for sem_close" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sem_close'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21882 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sem_close(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sem_close();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sem_close) || defined (__stub___sem_close)
-choke me
-#else
-sem_close();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sem_close=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sem_close=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sem_close`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-if test "$ac_cv_func_sem_init" = yes &&
-   test "$ac_cv_func_sem_destroy" = yes &&
-   test "$ace_cv_type_sem_t" = yes &&
-   test "$ace_has_sthreads" != yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_POSIX_SEM 1
-EOF
-
-
-  if test "$ac_cv_func_sem_open" != yes ||
-     test "$ac_cv_func_sem_close" != yes; then
-     cat >> confdefs.h <<\EOF
-#define ACE_LACKS_NAMED_POSIX_SEM 1
-EOF
-
-  fi
-fi 
-
-if test "$ace_user_enable_threads" = yes; then
-
- if test "$ace_has_pthreads" = yes; then
-
-  echo $ac_n "checking for pthread_sigmask""... $ac_c" 1>&6
-echo "configure:21950: checking for pthread_sigmask" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_sigmask'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21955 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_sigmask(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_sigmask();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_sigmask) || defined (__stub___pthread_sigmask)
-choke me
-#else
-pthread_sigmask();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:21981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_sigmask=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_sigmask=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_sigmask`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_PTHREAD_SIGMASK 1
-EOF
-
-fi
-
-
-  echo $ac_n "checking for pthread_key_create""... $ac_c" 1>&6
-echo "configure:22006: checking for pthread_key_create" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_key_create'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22011 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_key_create(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_key_create();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_key_create) || defined (__stub___pthread_key_create)
-choke me
-#else
-pthread_key_create();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_key_create=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_key_create=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_key_create`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_TSS_EMULATION 1
-EOF
-
-fi
-
-
-  echo $ac_n "checking for pthread_condattr_setkind_np""... $ac_c" 1>&6
-echo "configure:22065: checking for pthread_condattr_setkind_np" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_condattr_setkind_np'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22070 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_condattr_setkind_np(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_condattr_setkind_np();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_condattr_setkind_np) || defined (__stub___pthread_condattr_setkind_np)
-choke me
-#else
-pthread_condattr_setkind_np();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_setkind_np=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_setkind_np=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_condattr_setkind_np`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for pthread_mutexattr_setkind_np""... $ac_c" 1>&6
-echo "configure:22120: checking for pthread_mutexattr_setkind_np" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_mutexattr_setkind_np'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22125 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_mutexattr_setkind_np(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_mutexattr_setkind_np();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_mutexattr_setkind_np) || defined (__stub___pthread_mutexattr_setkind_np)
-choke me
-#else
-pthread_mutexattr_setkind_np();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_setkind_np=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_setkind_np=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_mutexattr_setkind_np`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for pthread_condattr_setpshared""... $ac_c" 1>&6
-echo "configure:22175: checking for pthread_condattr_setpshared" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_condattr_setpshared'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22180 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_condattr_setpshared(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_condattr_setpshared();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_condattr_setpshared) || defined (__stub___pthread_condattr_setpshared)
-choke me
-#else
-pthread_condattr_setpshared();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_setpshared=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_setpshared=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_condattr_setpshared`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_CONDATTR_PSHARED 1
-EOF
-
-fi
-
-
-  echo $ac_n "checking for pthread_attr_setstackaddr""... $ac_c" 1>&6
-echo "configure:22231: checking for pthread_attr_setstackaddr" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setstackaddr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22236 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_attr_setstackaddr(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_attr_setstackaddr();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_attr_setstackaddr) || defined (__stub___pthread_attr_setstackaddr)
-choke me
-#else
-pthread_attr_setstackaddr();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setstackaddr=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setstackaddr=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_attr_setstackaddr`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_THREAD_STACK_ADDR 1
-EOF
-
-fi
-
-
-  
-  
-
-  cat > conftest.$ac_ext <<EOF
-#line 22290 "configure"
-#include "confdefs.h"
-
-#include <pthread.h>
-    
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:22297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ace_header_exists=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ace_header_exists=no
-fi
-rm -f conftest*
-
-  cat > conftest.$ac_ext <<EOF
-
-#include <pthread.h>
-  ACE_REAL_FUNCTION pthread_attr_setstacksize
-
-EOF
-
-  if test "$ace_header_exists" = yes; then
-    if test -z "$AWK"; then
-      echo "configure: warning: No awk program found.  "Real" function may not be found." 1>&2
-    fi
-
-    if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-       egrep "ACE_REAL_FUNCTION" | 
-       (eval "$AWK '{print \$2}' > conftest.awk 2>&1"); then
-         rm -f conftest.$ac_ext
-         ace_real_function=`cat conftest.awk`
-         rm -f conftest.awk
-    fi
-
-    if test pthread_attr_setstacksize != "$ace_real_function"; then
-      echo $ac_n "checking for real pthread_attr_setstacksize from pthread.h""... $ac_c" 1>&6
-echo "configure:22333: checking for real pthread_attr_setstacksize from pthread.h" >&5
-      echo "$ac_t""$ace_real_function" 1>&6
-    fi
-  else
-    ace_real_function=pthread_attr_setstacksize
-  fi 
-  echo $ac_n "checking for $ace_real_function""... $ac_c" 1>&6
-echo "configure:22340: checking for $ace_real_function" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ace_real_function'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22345 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ace_real_function(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ace_real_function();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ace_real_function) || defined (__stub___$ace_real_function)
-choke me
-#else
-$ace_real_function();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ace_real_function=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ace_real_function=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ace_real_function`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_THREAD_STACK_SIZE 1
-EOF
-
-fi
-
-
-
-  
-  
-
-  cat > conftest.$ac_ext <<EOF
-#line 22400 "configure"
-#include "confdefs.h"
-
-#include <pthread.h>
-    
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:22407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ace_header_exists=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ace_header_exists=no
-fi
-rm -f conftest*
-
-  cat > conftest.$ac_ext <<EOF
-
-#include <pthread.h>
-  ACE_REAL_FUNCTION pthread_cancel
-
-EOF
-
-  if test "$ace_header_exists" = yes; then
-    if test -z "$AWK"; then
-      echo "configure: warning: No awk program found.  "Real" function may not be found." 1>&2
-    fi
-
-    if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-       egrep "ACE_REAL_FUNCTION" | 
-       (eval "$AWK '{print \$2}' > conftest.awk 2>&1"); then
-         rm -f conftest.$ac_ext
-         ace_real_function=`cat conftest.awk`
-         rm -f conftest.awk
-    fi
-
-    if test pthread_cancel != "$ace_real_function"; then
-      echo $ac_n "checking for real pthread_cancel from pthread.h""... $ac_c" 1>&6
-echo "configure:22443: checking for real pthread_cancel from pthread.h" >&5
-      echo "$ac_t""$ace_real_function" 1>&6
-    fi
-  else
-    ace_real_function=pthread_cancel
-  fi 
-  echo $ac_n "checking for $ace_real_function""... $ac_c" 1>&6
-echo "configure:22450: checking for $ace_real_function" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ace_real_function'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22455 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ace_real_function(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ace_real_function();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ace_real_function) || defined (__stub___$ace_real_function)
-choke me
-#else
-$ace_real_function();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ace_real_function=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ace_real_function=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ace_real_function`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_PTHREAD_CANCEL 1
-EOF
-
-fi
-
-
-
-  echo $ac_n "checking for pthread_yield""... $ac_c" 1>&6
-echo "configure:22507: checking for pthread_yield" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_yield'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22512 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_yield(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_yield();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_yield) || defined (__stub___pthread_yield)
-choke me
-#else
-pthread_yield();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_yield=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_yield=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_yield`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_PTHREAD_YIELD 1
-EOF
-
-fi
-
-
-  echo $ac_n "checking for pthread_thr_sigsetmask""... $ac_c" 1>&6
-echo "configure:22563: checking for pthread_thr_sigsetmask" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_thr_sigsetmask'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22568 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_thr_sigsetmask(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_thr_sigsetmask();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_thr_sigsetmask) || defined (__stub___pthread_thr_sigsetmask)
-choke me
-#else
-pthread_thr_sigsetmask();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_thr_sigsetmask=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_thr_sigsetmask=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_thr_sigsetmask`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1
-EOF
-
-fi
-
-
-  echo $ac_n "checking for pthread_attr_setdetachstate""... $ac_c" 1>&6
-echo "configure:22619: checking for pthread_attr_setdetachstate" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setdetachstate'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22624 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_attr_setdetachstate(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_attr_setdetachstate();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_attr_setdetachstate) || defined (__stub___pthread_attr_setdetachstate)
-choke me
-#else
-pthread_attr_setdetachstate();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setdetachstate=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setdetachstate=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_attr_setdetachstate`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SETDETACH 1
-EOF
-
-fi
-
-
-  echo $ac_n "checking for pthread_attr_setsched""... $ac_c" 1>&6
-echo "configure:22675: checking for pthread_attr_setsched" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setsched'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22680 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_attr_setsched(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_attr_setsched();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_attr_setsched) || defined (__stub___pthread_attr_setsched)
-choke me
-#else
-pthread_attr_setsched();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setsched=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setsched=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_attr_setsched`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-    echo $ac_n "checking for pthread_attr_setschedpolicy""... $ac_c" 1>&6
-echo "configure:22724: checking for pthread_attr_setschedpolicy" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setschedpolicy'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22729 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_attr_setschedpolicy(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_attr_setschedpolicy();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_attr_setschedpolicy) || defined (__stub___pthread_attr_setschedpolicy)
-choke me
-#else
-pthread_attr_setschedpolicy();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setschedpolicy=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setschedpolicy=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_attr_setschedpolicy`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SETSCHED 1
-EOF
-
-fi
-
-fi
-
-
-  echo $ac_n "checking for pthread_attr_setscope""... $ac_c" 1>&6
-echo "configure:22782: checking for pthread_attr_setscope" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setscope'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22787 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_attr_setscope(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_attr_setscope();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_attr_setscope) || defined (__stub___pthread_attr_setscope)
-choke me
-#else
-pthread_attr_setscope();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setscope=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setscope=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_attr_setscope`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_THREAD_PROCESS_SCOPING 1
-EOF
-
-fi
-
-
-  echo $ac_n "checking for pthread_mutexattr_setpshared""... $ac_c" 1>&6
-echo "configure:22838: checking for pthread_mutexattr_setpshared" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_mutexattr_setpshared'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22843 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_mutexattr_setpshared(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_mutexattr_setpshared();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_mutexattr_setpshared) || defined (__stub___pthread_mutexattr_setpshared)
-choke me
-#else
-pthread_mutexattr_setpshared();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_setpshared=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_setpshared=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_mutexattr_setpshared`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MUTEXATTR_PSHARED 1
-EOF
-
-fi
-
-
-  echo $ac_n "checking for pthread_mutexattr_create""... $ac_c" 1>&6
-echo "configure:22894: checking for pthread_mutexattr_create" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_mutexattr_create'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22899 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_mutexattr_create(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_mutexattr_create();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_mutexattr_create) || defined (__stub___pthread_mutexattr_create)
-choke me
-#else
-pthread_mutexattr_create();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_create=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_create=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_mutexattr_create`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_mutexattr_delete""... $ac_c" 1>&6
-echo "configure:22944: checking for pthread_mutexattr_delete" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_mutexattr_delete'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22949 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_mutexattr_delete(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_mutexattr_delete();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_mutexattr_delete) || defined (__stub___pthread_mutexattr_delete)
-choke me
-#else
-pthread_mutexattr_delete();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:22975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_delete=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_delete=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_mutexattr_delete`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_condattr_delete""... $ac_c" 1>&6
-echo "configure:22994: checking for pthread_condattr_delete" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_condattr_delete'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22999 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_condattr_delete(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_condattr_delete();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_condattr_delete) || defined (__stub___pthread_condattr_delete)
-choke me
-#else
-pthread_condattr_delete();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_delete=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_delete=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_condattr_delete`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_condattr_create""... $ac_c" 1>&6
-echo "configure:23044: checking for pthread_condattr_create" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_condattr_create'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23049 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_condattr_create(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_condattr_create();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_condattr_create) || defined (__stub___pthread_condattr_create)
-choke me
-#else
-pthread_condattr_create();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_create=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_create=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_condattr_create`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_setprio""... $ac_c" 1>&6
-echo "configure:23094: checking for pthread_setprio" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_setprio'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23099 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_setprio(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_setprio();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_setprio) || defined (__stub___pthread_setprio)
-choke me
-#else
-pthread_setprio();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setprio=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setprio=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_setprio`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_getprio""... $ac_c" 1>&6
-echo "configure:23144: checking for pthread_getprio" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_getprio'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23149 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_getprio(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_getprio();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_getprio) || defined (__stub___pthread_getprio)
-choke me
-#else
-pthread_getprio();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_getprio=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_getprio=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_getprio`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_setcancel""... $ac_c" 1>&6
-echo "configure:23194: checking for pthread_setcancel" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_setcancel'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23199 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_setcancel(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_setcancel();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_setcancel) || defined (__stub___pthread_setcancel)
-choke me
-#else
-pthread_setcancel();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setcancel=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setcancel=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_setcancel`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_setasynccancel""... $ac_c" 1>&6
-echo "configure:23244: checking for pthread_setasynccancel" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_setasynccancel'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23249 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_setasynccancel(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_setasynccancel();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_setasynccancel) || defined (__stub___pthread_setasynccancel)
-choke me
-#else
-pthread_setasynccancel();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setasynccancel=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setasynccancel=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_setasynccancel`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_kill""... $ac_c" 1>&6
-echo "configure:23294: checking for pthread_kill" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_kill'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23299 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_kill(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_kill();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_kill) || defined (__stub___pthread_kill)
-choke me
-#else
-pthread_kill();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_kill=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_kill=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_kill`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_attr_setprio""... $ac_c" 1>&6
-echo "configure:23344: checking for pthread_attr_setprio" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setprio'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23349 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_attr_setprio(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_attr_setprio();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_attr_setprio) || defined (__stub___pthread_attr_setprio)
-choke me
-#else
-pthread_attr_setprio();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setprio=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setprio=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_attr_setprio`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_attr_getprio""... $ac_c" 1>&6
-echo "configure:23394: checking for pthread_attr_getprio" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_getprio'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23399 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_attr_getprio(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_attr_getprio();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_attr_getprio) || defined (__stub___pthread_attr_getprio)
-choke me
-#else
-pthread_attr_getprio();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_getprio=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_getprio=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_attr_getprio`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_setintr""... $ac_c" 1>&6
-echo "configure:23444: checking for pthread_setintr" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_setintr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23449 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_setintr(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_setintr();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_setintr) || defined (__stub___pthread_setintr)
-choke me
-#else
-pthread_setintr();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setintr=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setintr=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_setintr`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_setintrtype""... $ac_c" 1>&6
-echo "configure:23494: checking for pthread_setintrtype" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_setintrtype'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23499 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_setintrtype(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_setintrtype();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_setintrtype) || defined (__stub___pthread_setintrtype)
-choke me
-#else
-pthread_setintrtype();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setintrtype=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setintrtype=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_setintrtype`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_mutexattr_init""... $ac_c" 1>&6
-echo "configure:23544: checking for pthread_mutexattr_init" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_mutexattr_init'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23549 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_mutexattr_init(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_mutexattr_init();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_mutexattr_init) || defined (__stub___pthread_mutexattr_init)
-choke me
-#else
-pthread_mutexattr_init();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_init=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_init=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_mutexattr_init`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_mutexattr_destroy""... $ac_c" 1>&6
-echo "configure:23594: checking for pthread_mutexattr_destroy" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_mutexattr_destroy'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23599 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_mutexattr_destroy(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_mutexattr_destroy();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_mutexattr_destroy) || defined (__stub___pthread_mutexattr_destroy)
-choke me
-#else
-pthread_mutexattr_destroy();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_destroy=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_mutexattr_destroy=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_mutexattr_destroy`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_condattr_init""... $ac_c" 1>&6
-echo "configure:23644: checking for pthread_condattr_init" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_condattr_init'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23649 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_condattr_init(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_condattr_init();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_condattr_init) || defined (__stub___pthread_condattr_init)
-choke me
-#else
-pthread_condattr_init();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_init=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_init=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_condattr_init`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_condattr_destroy""... $ac_c" 1>&6
-echo "configure:23694: checking for pthread_condattr_destroy" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_condattr_destroy'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23699 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_condattr_destroy(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_condattr_destroy();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_condattr_destroy) || defined (__stub___pthread_condattr_destroy)
-choke me
-#else
-pthread_condattr_destroy();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_destroy=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_condattr_destroy=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_condattr_destroy`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_setschedparam""... $ac_c" 1>&6
-echo "configure:23744: checking for pthread_setschedparam" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_setschedparam'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23749 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_setschedparam(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_setschedparam();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_setschedparam) || defined (__stub___pthread_setschedparam)
-choke me
-#else
-pthread_setschedparam();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setschedparam=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setschedparam=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_setschedparam`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_getschedparam""... $ac_c" 1>&6
-echo "configure:23794: checking for pthread_getschedparam" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_getschedparam'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23799 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_getschedparam(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_getschedparam();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_getschedparam) || defined (__stub___pthread_getschedparam)
-choke me
-#else
-pthread_getschedparam();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_getschedparam=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_getschedparam=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_getschedparam`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_setcancelstate""... $ac_c" 1>&6
-echo "configure:23844: checking for pthread_setcancelstate" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_setcancelstate'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23849 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_setcancelstate(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_setcancelstate();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_setcancelstate) || defined (__stub___pthread_setcancelstate)
-choke me
-#else
-pthread_setcancelstate();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setcancelstate=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setcancelstate=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_setcancelstate`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-   echo $ac_n "checking for pthread_setcanceltype""... $ac_c" 1>&6
-echo "configure:23894: checking for pthread_setcanceltype" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_setcanceltype'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 23899 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_setcanceltype(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_setcanceltype();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pthread_setcanceltype) || defined (__stub___pthread_setcanceltype)
-choke me
-#else
-pthread_setcanceltype();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:23925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setcanceltype=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_setcanceltype=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_setcanceltype`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  
-  
-
-  cat > conftest.$ac_ext <<EOF
-#line 23948 "configure"
-#include "confdefs.h"
-
-#include <pthread.h>
-    
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:23955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ace_header_exists=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ace_header_exists=no
-fi
-rm -f conftest*
-
-  cat > conftest.$ac_ext <<EOF
-
-#include <pthread.h>
-  ACE_REAL_FUNCTION pthread_self
-
-EOF
-
-  if test "$ace_header_exists" = yes; then
-    if test -z "$AWK"; then
-      echo "configure: warning: No awk program found.  "Real" function may not be found." 1>&2
-    fi
-
-    if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-       egrep "ACE_REAL_FUNCTION" | 
-       (eval "$AWK '{print \$2}' > conftest.awk 2>&1"); then
-         rm -f conftest.$ac_ext
-         ace_real_function=`cat conftest.awk`
-         rm -f conftest.awk
-    fi
-
-    if test pthread_self != "$ace_real_function"; then
-      echo $ac_n "checking for real pthread_self from pthread.h""... $ac_c" 1>&6
-echo "configure:23991: checking for real pthread_self from pthread.h" >&5
-      echo "$ac_t""$ace_real_function" 1>&6
-    fi
-  else
-    ace_real_function=pthread_self
-  fi 
-  echo $ac_n "checking for $ace_real_function""... $ac_c" 1>&6
-echo "configure:23998: checking for $ace_real_function" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ace_real_function'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24003 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ace_real_function(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ace_real_function();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ace_real_function) || defined (__stub___$ace_real_function)
-choke me
-#else
-$ace_real_function();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ace_real_function=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ace_real_function=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ace_real_function`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for thread_self""... $ac_c" 1>&6
-echo "configure:24047: checking for thread_self" >&5
-if eval "test \"`echo '$''{'ac_cv_func_thread_self'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24052 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char thread_self(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char thread_self();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_thread_self) || defined (__stub___thread_self)
-choke me
-#else
-thread_self();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_thread_self=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_thread_self=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'thread_self`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-                     cat >> confdefs.h <<\EOF
-#define ACE_HAS_THREAD_SELF 1
-EOF
-
-                    
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-                 
-fi
-
-
-
-  
-  echo $ac_n "checking for PTHREAD_PROCESS_* values in pthread.h""... $ac_c" 1>&6
-echo "configure:24109: checking for PTHREAD_PROCESS_* values in pthread.h" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_pthread_process_enum'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-                   cat > conftest.$ac_ext <<EOF
-#line 24115 "configure"
-#include "confdefs.h"
-
-#include <pthread.h>
-                     
-int main() {
-
-int foo = PTHREAD_PROCESS_SHARED;
-                     
-; return 0; }
-EOF
-if { (eval echo configure:24126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                      ace_cv_lib_pthread_process_enum=yes
-                     
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                      ace_cv_lib_pthread_process_enum=no
-                     
-fi
-rm -f conftest*
-                  
-fi
-
-  echo "$ac_t""$ace_cv_lib_pthread_process_enum" 1>&6
-  if test "$ace_cv_lib_pthread_process_enum" != no; then
-    ace_just_a_place_holder=fixme
-
-                   cat >> confdefs.h <<\EOF
-#define ACE_HAS_PTHREAD_PROCESS_ENUM 1
-EOF
-
-                  
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-                  
-  echo $ac_n "checking for minimum thread priority""... $ac_c" 1>&6
-echo "configure:24159: checking for minimum thread priority" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_pthread_pthread_min_priority'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      ace_cv_lib_pthread_pthread_min_priority=0
-      cat > conftest.$ac_ext <<EOF
-#line 24166 "configure"
-#include "confdefs.h"
-#include <pthread.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "PTHREAD_MIN_PRIORITY" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ace_cv_lib_pthread_pthread_min_priority=PTHREAD_MIN_PRIORITY
-fi
-rm -f conftest*
-
-      cat > conftest.$ac_ext <<EOF
-#line 24178 "configure"
-#include "confdefs.h"
-#include <pthread.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "PX_PRIO_MIN" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ace_cv_lib_pthread_pthread_min_priority=PX_PRIO_MIN
-fi
-rm -f conftest*
-
-    
-fi
-
-echo "$ac_t""$ace_cv_lib_pthread_pthread_min_priority" 1>&6
-  cat >> confdefs.h <<EOF
-#define ACE_THREAD_MIN_PRIORITY $ace_cv_lib_pthread_pthread_min_priority
-EOF
-
-
-  echo $ac_n "checking for maximum thread priority""... $ac_c" 1>&6
-echo "configure:24199: checking for maximum thread priority" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_pthread_pthread_max_priority'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      ace_cv_lib_pthread_pthread_max_priority=99
-      case "$target" in
-        *linux*)
-          if test "$ac_cv_func_pthread_sigmask" = yes; then
-            ace_cv_lib_pthread_pthread_max_priority=99
-          else
-            ace_cv_lib_pthread_pthread_max_priority=32
-          fi
-        ;;
-        *)
-      esac
-      cat > conftest.$ac_ext <<EOF
-#line 24216 "configure"
-#include "confdefs.h"
-#include <pthread.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "PTHREAD_MAX_PRIORITY" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ace_cv_lib_pthread_pthread_max_priority=PTHREAD_MAX_PRIORITY
-fi
-rm -f conftest*
-
-      cat > conftest.$ac_ext <<EOF
-#line 24228 "configure"
-#include "confdefs.h"
-#include <pthread.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "PX_PRIO_MAX" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ace_cv_lib_pthread_pthread_max_priority=PX_PRIO_MAX
-fi
-rm -f conftest*
-
-    
-fi
-
-echo "$ac_t""$ace_cv_lib_pthread_pthread_max_priority" 1>&6
-  cat >> confdefs.h <<EOF
-#define ACE_THREAD_MAX_PRIORITY $ace_cv_lib_pthread_pthread_max_priority
-EOF
-
-
- fi 
- if test "$ace_has_sthreads" = yes; then
-  echo $ac_n "checking for thr_keycreate""... $ac_c" 1>&6
-echo "configure:24251: checking for thr_keycreate" >&5
-if eval "test \"`echo '$''{'ac_cv_func_thr_keycreate'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24256 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char thr_keycreate(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char thr_keycreate();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_thr_keycreate) || defined (__stub___thr_keycreate)
-choke me
-#else
-thr_keycreate();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_thr_keycreate=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_thr_keycreate=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'thr_keycreate`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_TSS_EMULATION 1
-EOF
-
-fi
-
-
-  echo $ac_n "checking for thr_yield""... $ac_c" 1>&6
-echo "configure:24310: checking for thr_yield" >&5
-if eval "test \"`echo '$''{'ac_cv_func_thr_yield'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24315 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char thr_yield(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char thr_yield();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_thr_yield) || defined (__stub___thr_yield)
-choke me
-#else
-thr_yield();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_thr_yield=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_thr_yield=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'thr_yield`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_THR_YIELD 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for thr_keydelete""... $ac_c" 1>&6
-echo "configure:24365: checking for thr_keydelete" >&5
-if eval "test \"`echo '$''{'ac_cv_func_thr_keydelete'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24370 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char thr_keydelete(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char thr_keydelete();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_thr_keydelete) || defined (__stub___thr_keydelete)
-choke me
-#else
-thr_keydelete();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_thr_keydelete=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_thr_keydelete=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'thr_keydelete`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_THR_KEYDELETE 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for thr_min_stack""... $ac_c" 1>&6
-echo "configure:24420: checking for thr_min_stack" >&5
-if eval "test \"`echo '$''{'ac_cv_func_thr_min_stack'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24425 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char thr_min_stack(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char thr_min_stack();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_thr_min_stack) || defined (__stub___thr_min_stack)
-choke me
-#else
-thr_min_stack();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_thr_min_stack=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_thr_min_stack=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'thr_min_stack`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-      
-else
-  echo "$ac_t""no" 1>&6
-
-     echo $ac_n "checking for thr_minstack""... $ac_c" 1>&6
-echo "configure:24470: checking for thr_minstack" >&5
-if eval "test \"`echo '$''{'ac_cv_func_thr_minstack'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24475 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char thr_minstack(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char thr_minstack();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_thr_minstack) || defined (__stub___thr_minstack)
-choke me
-#else
-thr_minstack();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_thr_minstack=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_thr_minstack=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'thr_minstack`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_THR_MINSTACK 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    
-fi
-
-
- fi 
-fi  
-
-echo $ac_n "checking for sigwait""... $ac_c" 1>&6
-echo "configure:24531: checking for sigwait" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sigwait'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24536 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sigwait(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sigwait();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sigwait) || defined (__stub___sigwait)
-choke me
-#else
-sigwait();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sigwait=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sigwait=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sigwait`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_SIGWAIT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-if test "$ace_user_enable_reentrant_funcs" = yes; then
-  echo $ac_n "checking for rand_r""... $ac_c" 1>&6
-echo "configure:24588: checking for rand_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_rand_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24593 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char rand_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char rand_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_rand_r) || defined (__stub___rand_r)
-choke me
-#else
-rand_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_rand_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_rand_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'rand_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for strtok_r""... $ac_c" 1>&6
-echo "configure:24640: checking for strtok_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_strtok_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24645 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strtok_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char strtok_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_strtok_r) || defined (__stub___strtok_r)
-choke me
-#else
-strtok_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_strtok_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_strtok_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'strtok_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for getpwnam_r""... $ac_c" 1>&6
-echo "configure:24692: checking for getpwnam_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getpwnam_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24697 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getpwnam_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getpwnam_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getpwnam_r) || defined (__stub___getpwnam_r)
-choke me
-#else
-getpwnam_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_getpwnam_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_getpwnam_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'getpwnam_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS 1
-EOF
-
-fi
-
-
-  echo $ac_n "checking for ctime_r""... $ac_c" 1>&6
-echo "configure:24748: checking for ctime_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_ctime_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24753 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char ctime_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char ctime_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_ctime_r) || defined (__stub___ctime_r)
-choke me
-#else
-ctime_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_ctime_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_ctime_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'ctime_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for localtime_r""... $ac_c" 1>&6
-echo "configure:24800: checking for localtime_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_localtime_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24805 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char localtime_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char localtime_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_localtime_r) || defined (__stub___localtime_r)
-choke me
-#else
-localtime_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_localtime_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_localtime_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'localtime_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for gmtime_r""... $ac_c" 1>&6
-echo "configure:24852: checking for gmtime_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gmtime_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24857 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gmtime_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gmtime_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gmtime_r) || defined (__stub___gmtime_r)
-choke me
-#else
-gmtime_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_gmtime_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_gmtime_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gmtime_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for asctime_r""... $ac_c" 1>&6
-echo "configure:24904: checking for asctime_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_asctime_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24909 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char asctime_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char asctime_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_asctime_r) || defined (__stub___asctime_r)
-choke me
-#else
-asctime_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_asctime_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_asctime_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'asctime_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for getprotobyname_r""... $ac_c" 1>&6
-echo "configure:24956: checking for getprotobyname_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getprotobyname_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 24961 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getprotobyname_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getprotobyname_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getprotobyname_r) || defined (__stub___getprotobyname_r)
-choke me
-#else
-getprotobyname_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:24987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_getprotobyname_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_getprotobyname_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'getprotobyname_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for getprotobynumber_r""... $ac_c" 1>&6
-echo "configure:25008: checking for getprotobynumber_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getprotobynumber_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 25013 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getprotobynumber_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getprotobynumber_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getprotobynumber_r) || defined (__stub___getprotobynumber_r)
-choke me
-#else
-getprotobynumber_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:25039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_getprotobynumber_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_getprotobynumber_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'getprotobynumber_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for gethostbyaddr_r""... $ac_c" 1>&6
-echo "configure:25060: checking for gethostbyaddr_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 25065 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyaddr_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyaddr_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyaddr_r) || defined (__stub___gethostbyaddr_r)
-choke me
-#else
-gethostbyaddr_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:25091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyaddr_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyaddr_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gethostbyaddr_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6
-echo "configure:25112: checking for gethostbyname_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 25117 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyname_r) || defined (__stub___gethostbyname_r)
-choke me
-#else
-gethostbyname_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:25143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gethostbyname_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  echo $ac_n "checking for getservbyname_r""... $ac_c" 1>&6
-echo "configure:25164: checking for getservbyname_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getservbyname_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 25169 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getservbyname_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getservbyname_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_getservbyname_r) || defined (__stub___getservbyname_r)
-choke me
-#else
-getservbyname_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:25195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_getservbyname_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_getservbyname_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'getservbyname_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi 
-echo $ac_n "checking for readdir_r""... $ac_c" 1>&6
-echo "configure:25216: checking for readdir_r" >&5
-if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 25221 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char readdir_r(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char readdir_r();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_readdir_r) || defined (__stub___readdir_r)
-choke me
-#else
-readdir_r();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:25247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_readdir_r=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_readdir_r=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'readdir_r`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_READDIR_R 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for seekdir""... $ac_c" 1>&6
-echo "configure:25272: checking for seekdir" >&5
-if eval "test \"`echo '$''{'ac_cv_func_seekdir'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 25277 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char seekdir(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char seekdir();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_seekdir) || defined (__stub___seekdir)
-choke me
-#else
-seekdir();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:25303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_seekdir=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_seekdir=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'seekdir`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SEEKDIR 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for telldir""... $ac_c" 1>&6
-echo "configure:25328: checking for telldir" >&5
-if eval "test \"`echo '$''{'ac_cv_func_telldir'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 25333 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char telldir(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char telldir();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_telldir) || defined (__stub___telldir)
-choke me
-#else
-telldir();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:25359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_telldir=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_telldir=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'telldir`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_TELLDIR 1
-EOF
-
-fi
-
-
-
-
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
- if test "$ace_has_svr4_dynamic_linking" = yes; then
-  
-  echo $ac_n "checking if dlopen takes a char *""... $ac_c" 1>&6
-echo "configure:25405: checking if dlopen takes a char *" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_charptr_dl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-          cat > conftest.$ac_ext <<EOF
-#line 25411 "configure"
-#include "confdefs.h"
-
-#include <dlfcn.h>
-      
-int main() {
-
-       const char *filename = 0;
-       int flag = 0;
-       void *ptr = dlopen(filename, flag);
-      
-; return 0; }
-EOF
-if { (eval echo configure:25424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_charptr_dl=no
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-              cat > conftest.$ac_ext <<EOF
-#line 25435 "configure"
-#include "confdefs.h"
-
-#include <dlfcn.h>
-        
-int main() {
-
-         char *filename = 0;
-         int flag = 0;
-         void *ptr = dlopen(filename, flag);
-        
-; return 0; }
-EOF
-if { (eval echo configure:25448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_charptr_dl=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_charptr_dl=no
-        
-fi
-rm -f conftest*
-      
-fi
-rm -f conftest*   
-    
-fi
-
-  echo "$ac_t""$ace_cv_lib_charptr_dl" 1>&6
-  if test "$ace_cv_lib_charptr_dl" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_CHARPTR_DL 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
- fi 
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
- if test "$ac_cv_func_gethostbyaddr" = yes; then
-  
-  echo $ac_n "checking \"getby\" functions take a non-const char *""... $ac_c" 1>&6
-echo "configure:25504: checking \"getby\" functions take a non-const char *" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_nonconst_getby'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 25510 "configure"
-#include "confdefs.h"
-
-#include <sys/socket.h>
-      
-int main() {
-
-       char *addr = 0;
-       int len = 0;
-       int type = 0;
-       struct hostent *mystruct = 0;
-
-       mystruct = gethostbyaddr(name, len, type);
-      
-; return 0; }
-EOF
-if { (eval echo configure:25526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_nonconst_getby=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_nonconst_getby=no
-      
-fi
-rm -f conftest*   
-    
-fi
-
-  echo "$ac_t""$ace_cv_lib_nonconst_getby" 1>&6
-  if test "$ace_cv_lib_nonconst_getby" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_NONCONST_GETBY 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
- fi 
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-if test "$ace_user_enable_exceptions" = yes; then
-  
-  echo $ac_n "checking if new throws bad_alloc exception on failure""... $ac_c" 1>&6
-echo "configure:25562: checking if new throws bad_alloc exception on failure" >&5
-  if eval "test \"`echo '$''{'ace_cv_new_throws_bad_alloc_exception'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     if test "$cross_compiling" = yes; then
-  
-        ace_cv_new_throws_bad_alloc_exception=no
-       
-else
-  cat > conftest.$ac_ext <<EOF
-#line 25573 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-#if defined (ACE_HAS_NEW_NO_H)
-# include <new>
-#elif defined (ACE_HAS_NEW_H)
-# include <new.h>
-#endif
-
-#if defined (ACE_HAS_STDEXCEPT_NO_H)
-# include <stdexcept>
-#elif defined (ACE_HAS_EXCEPTION_H)
-# include <exception.h>
-#endif
-
-        int main() {
-          while (1) {
-            try {
-              char *a = new char[1024*1024];
-              if (a == 0) {
-                return 1; /* new() does NOT throw exceptions */
-              }
-            }
-
-            catch (bad_alloc)
-            { 
-             return 0; /* new() does throw exceptions */
-            }
-         };
-
-         return 1;  /* ERROR: We shouldn't get this far! */
-        } 
-       
-EOF
-if { (eval echo configure:25610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  
-        ace_cv_new_throws_bad_alloc_exception=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  
-        ace_cv_new_throws_bad_alloc_exception=no
-       
-fi
-rm -fr conftest*
-fi
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_new_throws_bad_alloc_exception" 1>&6
-  if test "$ace_cv_new_throws_bad_alloc_exception" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_NEW_THROWS_EXCEPTIONS 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-  if test "$ace_cv_new_throws_bad_alloc_exception" != yes; then
-   
-  echo $ac_n "checking if new throws xalloc exception on failure""... $ac_c" 1>&6
-echo "configure:25645: checking if new throws xalloc exception on failure" >&5
-  if eval "test \"`echo '$''{'ace_cv_new_throws_xalloc_exception'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     if test "$cross_compiling" = yes; then
-  
-        ace_cv_new_throws_xalloc_exception=no
-       
-else
-  cat > conftest.$ac_ext <<EOF
-#line 25656 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-#if defined (ACE_HAS_NEW_NO_H)
-# include <new>
-#elif defined (ACE_HAS_NEW_H)
-# include <new.h>
-#endif
-
-#if defined (ACE_HAS_STDEXCEPT_NO_H)
-# include <stdexcept>
-#elif defined (ACE_HAS_EXCEPTION_H)
-# include <exception.h>
-#endif
-
-        int main() {
-          while (1) {
-            try {
-              char *a = new char[1024*1024];
-              if (a == 0) {
-                return 1; /* new() does NOT throw exceptions */
-              }
-            }
-
-            catch (xalloc)
-            { 
-             return 0; /* new() does throw exceptions */
-            }
-          };
-
-         return 1;  /* ERROR: We shouldn't get this far! */
-        } 
-       
-EOF
-if { (eval echo configure:25693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  
-        ace_cv_new_throws_xalloc_exception=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  
-        ace_cv_new_throws_xalloc_exception=no
-       
-fi
-rm -fr conftest*
-fi
-
-     
-fi
-
-  echo "$ac_t""$ace_cv_new_throws_xalloc_exception" 1>&6
-  if test "$ace_cv_new_throws_xalloc_exception" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_NEW_THROWS_EXCEPTIONS 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-  fi fi 
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
- if test "$ac_cv_func_getmsg" = yes ||
-    test "$ac_cv_header_stropts_h" = yes; then
-  
-  echo $ac_n "checking if putmsg takes a const struct strbuf*""... $ac_c" 1>&6
-echo "configure:25746: checking if putmsg takes a const struct strbuf*" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_const_strbufptr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-          cat > conftest.$ac_ext <<EOF
-#line 25752 "configure"
-#include "confdefs.h"
-
-#include <stropts.h>
-      
-int main() {
-
-       int result = 0;
-       int fd = 0;
-       const struct strbuf * ace_str = 0;
-       int flags = 0;
-
-       result = putmsg(fd, ace_str, ace_str, flags);
-      
-; return 0; }
-EOF
-if { (eval echo configure:25768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_const_strbufptr=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_const_strbufptr=no
-      
-fi
-rm -f conftest*   
-    
-fi
-
-  echo "$ac_t""$ace_cv_lib_const_strbufptr" 1>&6
-  if test "$ace_cv_lib_const_strbufptr" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_CONST_STRBUF_PTR 1
-EOF
-
-
-  fi
-
- fi 
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
- 
-  echo $ac_n "checking if select takes int instead of fd_set""... $ac_c" 1>&6
-echo "configure:25821: checking if select takes int instead of fd_set" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_select_takes_int'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 25827 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/time.h>
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef ACE_HAS_SELECT_H
-# include <sys/select.h>
-#endif
-     
-int main() {
-
-      int n = 0;
-      fd_set* readfds = 0;
-      fd_set* writefds = 0;
-      fd_set* exceptfds = 0;
-      timeval* timeout = 0;
-      int result = 0;
-
-      result = select(n, readfds, writefds, exceptfds, timeout);
-     
-; return 0; }
-EOF
-if { (eval echo configure:25854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-      ace_cv_lib_select_takes_int=no
-     
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-      cat > conftest.$ac_ext <<EOF
-#line 25865 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/time.h>
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef ACE_HAS_SELECT_H
-# include <sys/select.h>
-#endif
-        
-int main() {
-
-         int n = 0;
-         int* readfds = 0;
-         int* writefds = 0;
-         int* exceptfds = 0;
-         timeval* timeout = 0;
-         int result = 0;
-
-         result = select(n, readfds, writefds, exceptfds, timeout);
-        
-; return 0; }
-EOF
-if { (eval echo configure:25892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_select_takes_int=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_select_takes_int=no
-                 
-fi
-rm -f conftest*
-     
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_select_takes_int" 1>&6
-  if test "$ace_cv_lib_select_takes_int" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_SELECT_USES_INT 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-echo $ac_n "checking if setrlimit() takes an enum as 1st argument (a)""... $ac_c" 1>&6
-echo "configure:25930: checking if setrlimit() takes an enum as 1st argument (a)" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_posix_setrlimit_enum_1_a'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ace_cv_lib_posix_setrlimit_enum_1_a=no
-    cat > conftest.$ac_ext <<EOF
-#line 25937 "configure"
-#include "confdefs.h"
-#include <sys/resource.h>
-int main() {
-enum __rlimit_resource rsrc;
-       const struct rlimit* rlp;
-       setrlimit(rsrc, rlp);
-; return 0; }
-EOF
-if { (eval echo configure:25946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_lib_posix_setrlimit_enum_1_a=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_posix_setrlimit_enum_1_a" 1>&6
-
-echo $ac_n "checking if setrlimit() takes an enum as 1st argument (b)""... $ac_c" 1>&6
-echo "configure:25960: checking if setrlimit() takes an enum as 1st argument (b)" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_posix_setrlimit_enum_1_b'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ace_cv_lib_posix_setrlimit_enum_1_b=no
-    cat > conftest.$ac_ext <<EOF
-#line 25967 "configure"
-#include "confdefs.h"
-#include <sys/resource.h>
-int main() {
-enum __rlimit_resource rsrc;
-       struct rlimit* rlp;
-       setrlimit(rsrc, rlp);
-; return 0; }
-EOF
-if { (eval echo configure:25976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_lib_posix_setrlimit_enum_1_b=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_posix_setrlimit_enum_1_b" 1>&6
-
-if test "$ace_cv_lib_posix_setrlimit_enum_1_a" = yes ||
-   test "$ace_cv_lib_posix_setrlimit_enum_1_b" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_RLIMIT_RESOURCE_ENUM enum __rlimit_resource
-EOF
-
-fi
-
-
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-echo $ac_n "checking if setrlimit() takes a const pointer as 2nd argument (a)""... $ac_c" 1>&6
-echo "configure:26016: checking if setrlimit() takes a const pointer as 2nd argument (a)" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_posix_setrlimit_const_2_a'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 26022 "configure"
-#include "confdefs.h"
-
-#include <sys/resource.h>
-      
-int main() {
-
-       int rsrc;
-       const struct rlimit* rlp;
-       setrlimit(rsrc, rlp);
-      
-; return 0; }
-EOF
-if { (eval echo configure:26035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_setrlimit_const_2_a=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_setrlimit_const_2_a=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_posix_setrlimit_const_2_a" 1>&6
-
-echo $ac_n "checking if setrlimit() takes a const pointer as 2nd argument (b)""... $ac_c" 1>&6
-echo "configure:26055: checking if setrlimit() takes a const pointer as 2nd argument (b)" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_posix_setrlimit_const_2_b'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ace_cv_lib_posix_setrlimit_const_2_b=no
-    cat > conftest.$ac_ext <<EOF
-#line 26062 "configure"
-#include "confdefs.h"
-#include <sys/resource.h>
-int main() {
-enum __rlimit_resource rsrc;
-       const struct rlimit* rlp;
-       setrlimit(rsrc, rlp);
-; return 0; }
-EOF
-if { (eval echo configure:26071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_lib_posix_setrlimit_const_2_b=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_posix_setrlimit_const_2_b" 1>&6
-
-if test "$ace_cv_lib_posix_setrlimit_const_2_a" != yes &&
-   test "$ace_cv_lib_posix_setrlimit_const_2_b" != yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_SETRLIMIT 1
-EOF
-
-fi
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-if test "$ac_cv_func_getrusage" = yes; then
-  
-  echo $ac_n "checking if getrusage() takes an enum as 1st argument""... $ac_c" 1>&6
-echo "configure:26098: checking if getrusage() takes an enum as 1st argument" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_getrusage_enum_1'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 26104 "configure"
-#include "confdefs.h"
-
-#include <sys/resource.h>
-        
-int main() {
-
-         enum __rusage_who who;
-         struct rusage* rup;
-         getrusage(who, rup);
-        
-; return 0; }
-EOF
-if { (eval echo configure:26117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_getrusage_enum_1=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_getrusage_enum_1=no
-        
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_getrusage_enum_1" 1>&6
-  if test "$ace_cv_lib_posix_getrusage_enum_1" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_RUSAGE_WHO_ENUM enum __rusage_who
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-fi
-
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-
-  echo $ac_n "checking if select takes a const fifth argument""... $ac_c" 1>&6
-echo "configure:26167: checking if select takes a const fifth argument" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_select_const_5'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 26173 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/time.h>
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef ACE_HAS_SELECT_H
-# include <sys/select.h>
-#endif
-      
-int main() {
-
-       int n = 0;
-       fd_set *readfds;
-       fd_set *writefds;
-       fd_set *exceptfds;
-       const struct timeval* timeout = 0;
-       select(n, readfds, writefds, exceptfds, timeout);
-      
-; return 0; }
-EOF
-if { (eval echo configure:26198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_select_const_5=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_select_const_5=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_select_const_5" 1>&6
-  if test "$ace_cv_lib_posix_select_const_5" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
-EOF
-
-
-  fi
-
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-if test "$ace_cv_struct_msghdr" = yes &&
-   test "$ac_cv_func_sendmsg" = yes; then
- 
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-   
- 
-  echo $ac_n "checking if sendmsg omits the const from the second argument""... $ac_c" 1>&6
-echo "configure:26253: checking if sendmsg omits the const from the second argument" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_broken_sendmsg'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 26259 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-      
-int main() {
-
-       int s = 0;
-       const struct msghdr *msg = 0;
-       unsigned int flags = 0;
-
-       int result = 0;
-
-       result = (int) sendmsg(s, msg, flags);
-      
-; return 0; }
-EOF
-if { (eval echo configure:26279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_broken_sendmsg=no
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_broken_sendmsg=yes
-      
-fi
-rm -f conftest*
-   
-fi
-
-  echo "$ac_t""$ace_cv_lib_broken_sendmsg" 1>&6
-  if test "$ace_cv_lib_broken_sendmsg" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_SENDMSG 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
- 
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- fi 
-if test "$ac_cv_header_sys_uio_h" = yes &&
-   test "$ac_cv_func_writev" = yes; then
- 
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-   
- 
-  echo $ac_n "checking if writev omits the const from the iovec argument""... $ac_c" 1>&6
-echo "configure:26333: checking if writev omits the const from the iovec argument" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_broken_writev'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 26339 "configure"
-#include "confdefs.h"
-
-#ifdef ACE_HAS_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include <sys/uio.h>
-      
-int main() {
-
-       int filedes = 0;
-       const struct iovec *vector = 0; 
-       size_t count = 0;
-
-       int result = 0;
-
-       result = (int) writev(filedes, vector, count);
-      
-; return 0; }
-EOF
-if { (eval echo configure:26360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_broken_writev=no
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_broken_writev=yes
-      
-fi
-rm -f conftest*
-   
-fi
-
-  echo "$ac_t""$ace_cv_lib_broken_writev" 1>&6
-  if test "$ace_cv_lib_broken_writev" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_WRITEV 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
- 
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- fi 
-
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-
-  echo $ac_n "checking if socket size is denoted by size_t""... $ac_c" 1>&6
-echo "configure:26413: checking if socket size is denoted by size_t" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_socket_len_size_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 26419 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-     
-int main() {
-
-      int s;
-      struct sockaddr* addr;
-      int* addrlen;
-      accept(s, addr, addrlen);
-     
-; return 0; }
-EOF
-if { (eval echo configure:26436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-      ace_cv_lib_posix_socket_len_size_t=no
-     
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-      cat > conftest.$ac_ext <<EOF
-#line 26447 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-        
-int main() {
-
-         int s;
-         struct sockaddr* addr;
-         size_t* addrlen;
-         accept(s, addr, addrlen);
-        
-; return 0; }
-EOF
-if { (eval echo configure:26464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_socket_len_size_t=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_socket_len_size_t=no
-        
-fi
-rm -f conftest*
-     
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_socket_len_size_t" 1>&6
-  if test "$ace_cv_lib_posix_socket_len_size_t" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_SIZET_SOCKET_LEN 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-
-  echo $ac_n "checking for (struct sockaddr *) msg_name field""... $ac_c" 1>&6
-echo "configure:26519: checking for (struct sockaddr *) msg_name field" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_sockaddr_msg_name'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 26525 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-      
-int main() {
-
-       msghdr ace_msghdr;
-       sockaddr name;
-
-       ace_msghdr.msg_name = (struct sockaddr *)name;
-      
-; return 0; }
-EOF
-if { (eval echo configure:26542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_sockaddr_msg_name=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_sockaddr_msg_name=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_sockaddr_msg_name" 1>&6
-  if test "$ace_cv_lib_sockaddr_msg_name" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_SOCKADDR_MSG_NAME 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-
-  echo $ac_n "checking if setsockopt() takes a char* fourth argument""... $ac_c" 1>&6
-echo "configure:26595: checking if setsockopt() takes a char* fourth argument" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_setsockopt_charp_4'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 26601 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-      
-int main() {
-
-       int s;
-       int level;
-       int optname;
-       char* optval;
-#if defined(ACE_HAS_SIZET_SOCKET_LEN)
-       size_t* optlen;
-#else
-       int* optlen;
-#endif
-       setsockopt(s, level, optname, optval, optlen);
-      
-; return 0; }
-EOF
-if { (eval echo configure:26624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_setsockopt_charp_4=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_setsockopt_charp_4=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_setsockopt_charp_4" 1>&6
-  if test "$ace_cv_lib_posix_setsockopt_charp_4" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_CHARPTR_SOCKOPT 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-
-  echo $ac_n "checking if setsockopt() takes a void* fourth argument""... $ac_c" 1>&6
-echo "configure:26676: checking if setsockopt() takes a void* fourth argument" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_setsockopt_voidp_4'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 26682 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-      
-int main() {
-
-       int s;
-       int level;
-       int optname;
-       void* optval;
-#if defined(ACE_HAS_SIZET_SOCKET_LEN)
-       size_t* optlen;
-#else
-       int* optlen;
-#endif
-       setsockopt(s, level, optname, optval, optlen);
-      
-; return 0; }
-EOF
-if { (eval echo configure:26705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_setsockopt_voidp_4=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_setsockopt_voidp_4=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_setsockopt_voidp_4" 1>&6
-  if test "$ace_cv_lib_posix_setsockopt_voidp_4" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_VOIDPTR_SOCKOPT 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-
-  echo $ac_n "checking if mmap() takes a void* first argument""... $ac_c" 1>&6
-echo "configure:26757: checking if mmap() takes a void* first argument" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_voidptr_mmap'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 26763 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-#include <sys/mman.h>
-      
-int main() {
-
-       void *start;
-       size_t length;
-       int prot;
-       int flags;
-       int fd;
-       off_t offset;
-
-       void *result = 0;
-
-       result = (void *)mmap(start, length, prot, flags, fd, offset);
-      
-; return 0; }
-EOF
-if { (eval echo configure:26789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_voidptr_mmap=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_voidptr_mmap=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_voidptr_mmap" 1>&6
-  if test "$ace_cv_lib_posix_voidptr_mmap" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_VOIDPTR_MMAP 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-if test "$ac_cv_func_msync" = yes; then
-
-  echo $ac_n "checking if msync accepts a third "sync" argument""... $ac_c" 1>&6
-echo "configure:26825: checking if msync accepts a third "sync" argument" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_broken_msync'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 26831 "configure"
-#include "confdefs.h"
-
-#include <sys/mman.h>
-
-#if defined (ACE_HAS_VOIDPTR_MMAP)
-      /* Needed for some odd OS's (e.g., SGI). */
-      typedef void *ACE_MMAP_TYPE;
-#else
-      typedef char *ACE_MMAP_TYPE;
-#endif /* ACE_HAS_VOIDPTR_MMAP */
-     
-int main() {
-
-      ACE_MMAP_TYPE start = 0;
-      size_t length = 0;
-      int flags = MS_SYNC;
-
-      int result;
-
-      result = msync(start, length, flags);
-     
-; return 0; }
-EOF
-if { (eval echo configure:26855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-      ace_cv_lib_broken_msync=no
-     
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-            cat > conftest.$ac_ext <<EOF
-#line 26866 "configure"
-#include "confdefs.h"
-
-#include <sys/mman.h>
-
-#if defined (ACE_HAS_VOIDPTR_MMAP)
-         /* Needed for some odd OS's (e.g., SGI). */
-         typedef void *ACE_MMAP_TYPE;
-#else
-         typedef char *ACE_MMAP_TYPE;
-#endif /* ACE_HAS_VOIDPTR_MMAP */
-        
-int main() {
-
-         ACE_MMAP_TYPE start = 0;
-         size_t length = 0;
-
-         int result;
-
-         result = msync(start, length);
-        
-; return 0; }
-EOF
-if { (eval echo configure:26889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_broken_msync=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                           ace_cv_lib_broken_msync=no
-        
-fi
-rm -f conftest*
-     
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_broken_msync" 1>&6
-  if test "$ace_cv_lib_broken_msync" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_NETBSD_MSYNC 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-fi  
-
-  echo $ac_n "checking for iostream method ipfx()""... $ac_c" 1>&6
-echo "configure:26924: checking for iostream method ipfx()" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_has_iostream_ipfx'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 26930 "configure"
-#include "confdefs.h"
-
-#include <iostream.h>
-      
-int main() {
-
-       cin.ipfx();
-      
-; return 0; }
-EOF
-if { (eval echo configure:26941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_feature_has_iostream_ipfx=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_feature_has_iostream_ipfx=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_has_iostream_ipfx" 1>&6
-  if test "$ace_cv_feature_has_iostream_ipfx" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_IOSTREAM_FX 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for line-buffered streambufs""... $ac_c" 1>&6
-echo "configure:26974: checking for line-buffered streambufs" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_has_linebuffered_streambuf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 26980 "configure"
-#include "confdefs.h"
-
-#include <iostream.h>
-      
-int main() {
-
-       cin.rdbuf()->linebuffered(1);
-      
-; return 0; }
-EOF
-if { (eval echo configure:26991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_feature_has_linebuffered_streambuf=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_feature_has_linebuffered_streambuf=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_has_linebuffered_streambuf" 1>&6
-  if test "$ace_cv_feature_has_linebuffered_streambuf" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for unbuffered streambufs""... $ac_c" 1>&6
-echo "configure:27024: checking for unbuffered streambufs" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_has_unbuffered_streambuf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27030 "configure"
-#include "confdefs.h"
-
-#include <iostream.h>
-      
-int main() {
-
-       cin.rdbuf()->unbuffered(1);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_feature_has_unbuffered_streambuf=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_feature_has_unbuffered_streambuf=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_has_unbuffered_streambuf" 1>&6
-  if test "$ace_cv_feature_has_unbuffered_streambuf" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_UNBUFFERED_STREAMBUF 1
-EOF
-
-
-  fi
-
-
-echo $ac_n "checking if signal takes a void (*)(int) as second argument""... $ac_c" 1>&6
-echo "configure:27073: checking if signal takes a void (*)(int) as second argument" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_signal_vi1_2'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27079 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       typedef void (*SA)(int);
-       void handler(int)
-       {
-       }
-      
-int main() {
-
-       SA nn = handler;
-       signal(SIGINT, nn);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vi1_2=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vi1_2=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_signal_vi1_2" 1>&6
-
-echo $ac_n "checking if signal takes a void (*)(void) as second argument""... $ac_c" 1>&6
-echo "configure:27115: checking if signal takes a void (*)(void) as second argument" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_signal_vv1_2'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27121 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       typedef void (*SA)(void);
-       void handler(int) { }
-      
-int main() {
-
-       SA nn = handler;
-       signal(SIGINT, nn);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vv1_2=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vv1_2=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_signal_vv1_2" 1>&6
-
-echo $ac_n "checking if signal takes a void (*)(int, ...) as second argument""... $ac_c" 1>&6
-echo "configure:27155: checking if signal takes a void (*)(int, ...) as second argument" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_signal_vi1a2_2'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27161 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       typedef void (*SA)(int, ...);
-       void handler(int, ...) { }
-      
-int main() {
-
-       SA nn = handler;
-       signal(SIGINT, nn);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vi1a2_2=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vi1a2_2=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_signal_vi1a2_2" 1>&6
-
-echo $ac_n "checking if signal takes a void (*)(...) as second argument""... $ac_c" 1>&6
-echo "configure:27195: checking if signal takes a void (*)(...) as second argument" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_signal_va1_2'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27201 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       typedef void (*SA)(...);
-       void handler(...) { }
-      
-int main() {
-
-       SA nn = handler;
-       signal(SIGINT, nn);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_va1_2=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_va1_2=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_signal_va1_2" 1>&6
-
-echo $ac_n "checking if signal returns a void (*)(int)""... $ac_c" 1>&6
-echo "configure:27235: checking if signal returns a void (*)(int)" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_signal_vi1_ret'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27241 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       typedef void (*SA)(int);
-       void foo(SA nn) { }
-      
-int main() {
-
-       SA nn = SIG_DFL;
-       nn = signal(SIGINT, 0);
-       foo(nn);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vi1_ret=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vi1_ret=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_signal_vi1_ret" 1>&6
-
-echo $ac_n "checking if signal returns a void (*)(void)""... $ac_c" 1>&6
-echo "configure:27276: checking if signal returns a void (*)(void)" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_signal_vv1_ret'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27282 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       typedef void (*SA)(void);
-       void foo(SA nn) { }
-      
-int main() {
-
-       SA nn = SIG_DFL;
-       nn = signal(SIGINT, 0);
-       foo(nn);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vv1_ret=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vv1_ret=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_signal_vv1_ret" 1>&6
-
-echo $ac_n "checking if signal returns a void (*)(int, ...)""... $ac_c" 1>&6
-echo "configure:27317: checking if signal returns a void (*)(int, ...)" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_signal_vi1a2_ret'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27323 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       typedef void (*SA)(int, ...);
-      
-int main() {
-
-       SA oo = signal(SIGINT, 0);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vi1a2_ret=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_vi1a2_ret=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_signal_vi1a2_ret" 1>&6
-
-echo $ac_n "checking if signal returns a void (*)(...)""... $ac_c" 1>&6
-echo "configure:27355: checking if signal returns a void (*)(...)" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_signal_va1_ret'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27361 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-       typedef void (*SA)(...);
-      
-int main() {
-
-       SA oo = signal(SIGINT, 0);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_lib_signal_va1_ret=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_signal_va1_ret=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_signal_va1_ret" 1>&6
-
-if test "$ace_cv_struct_sigaction" = yes; then
-  echo $ac_n "checking if struct sigaction takes a void (*)(int) handler""... $ac_c" 1>&6
-echo "configure:27394: checking if struct sigaction takes a void (*)(int) handler" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_struct_sigaction_vi1_handler'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 27400 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-         typedef void (*SA)(int);
-         void foo(struct sigaction* sa, SA nn) { }
-        
-int main() {
-
-         struct sigaction sa;
-         SA nn = SIG_DFL;
-         sa.sa_handler = nn;
-         foo(&sa, nn);
-        
-; return 0; }
-EOF
-if { (eval echo configure:27416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_struct_sigaction_vi1_handler=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_struct_sigaction_vi1_handler=no
-        
-fi
-rm -f conftest*
-    
-fi
-
-echo "$ac_t""$ace_cv_lib_struct_sigaction_vi1_handler" 1>&6
-
-  echo $ac_n "checking if struct sigaction takes a void (*)(void) handler""... $ac_c" 1>&6
-echo "configure:27436: checking if struct sigaction takes a void (*)(void) handler" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_struct_sigaction_vv1_handler'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 27442 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-         typedef void (*SA)(void);
-         void foo(struct sigaction* sa, SA nn) { }
-        
-int main() {
-
-         struct sigaction sa;
-         SA nn = SIG_DFL;
-         sa.sa_handler = nn;
-         foo(&sa, nn);
-        
-; return 0; }
-EOF
-if { (eval echo configure:27458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_struct_sigaction_vv1_handler=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_struct_sigaction_vv1_handler=no
-        
-fi
-rm -f conftest*
-    
-fi
-
-echo "$ac_t""$ace_cv_lib_struct_sigaction_vv1_handler" 1>&6
-
-  echo $ac_n "checking if struct sigaction takes a void (*)(int, ...) handler""... $ac_c" 1>&6
-echo "configure:27478: checking if struct sigaction takes a void (*)(int, ...) handler" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_struct_sigaction_vi1a2_handler'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 27484 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-         typedef void (*SA)(int, ...);
-         void foo(struct sigaction* sa, SA nn) { }
-        
-int main() {
-
-         struct sigaction sa;
-         SA nn = SIG_DFL;
-         sa.sa_handler = nn;
-         foo(&sa, nn);
-        
-; return 0; }
-EOF
-if { (eval echo configure:27500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_struct_sigaction_vi1a2_handler=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_struct_sigaction_vi1a2_handler=no
-        
-fi
-rm -f conftest*
-    
-fi
-
-echo "$ac_t""$ace_cv_lib_struct_sigaction_vi1a2_handler" 1>&6
-
-  echo $ac_n "checking if struct sigaction takes a void (*)(...) handler""... $ac_c" 1>&6
-echo "configure:27520: checking if struct sigaction takes a void (*)(...) handler" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_struct_sigaction_va1_handler'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 27526 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-         typedef void (*SA)(...);
-         void foo(struct sigaction* sa, SA nn) { }
-        
-int main() {
-
-         struct sigaction sa;
-         SA nn = SIG_DFL;
-         sa.sa_handler = nn;
-         foo(&sa, nn);
-        
-; return 0; }
-EOF
-if { (eval echo configure:27542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_struct_sigaction_va1_handler=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_struct_sigaction_va1_handler=no
-        
-fi
-rm -f conftest*
-    
-fi
-
-echo "$ac_t""$ace_cv_lib_struct_sigaction_va1_handler" 1>&6
-fi 
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-
-  echo $ac_n "checking if msgsnd() takes a struct msgbuf* second argument""... $ac_c" 1>&6
-echo "configure:27580: checking if msgsnd() takes a struct msgbuf* second argument" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_msgsnd_msgbufp_2'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27586 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-# include <sys/ipc.h>
-#ifndef ACE_LACKS_SYSV_MSG_H
-# include <sys/msg.h>
-#endif
-      
-int main() {
-
-       int msqid;
-       struct msgbuf* msgp = 0;
-       int msgsz;
-       int msgflg;
-       msgsnd(msqid, msgp, msgsz, msgflg);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_msgsnd_msgbufp_2=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_msgsnd_msgbufp_2=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_msgsnd_msgbufp_2" 1>&6
-  if test "$ace_cv_lib_posix_msgsnd_msgbufp_2" != no; then
-    ace_just_a_place_holder=fixme
-
-     
-  else
-    ace_just_a_place_holder=fixme
-
-      
-  echo $ac_n "checking if msgsnd() takes a const void* second argument""... $ac_c" 1>&6
-echo "configure:27634: checking if msgsnd() takes a const void* second argument" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_msgsnd_cvoidp_2'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-       cat > conftest.$ac_ext <<EOF
-#line 27640 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-# include <sys/ipc.h>
-#ifndef ACE_LACKS_SYSV_MSG_H
-# include <sys/msg.h>
-#endif
-         
-int main() {
-
-          int msqid;
-          const void* msgp = 0;
-          int msgsz;
-          int msgflg;
-          msgsnd(msqid, msgp, msgsz, msgflg);
-         
-; return 0; }
-EOF
-if { (eval echo configure:27661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-          ace_cv_lib_posix_msgsnd_cvoidp_2=yes
-         
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-          ace_cv_lib_posix_msgsnd_cvoidp_2=no
-         
-fi
-rm -f conftest*
-     
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_msgsnd_cvoidp_2" 1>&6
-  if test "$ace_cv_lib_posix_msgsnd_cvoidp_2" != no; then
-    ace_just_a_place_holder=fixme
-
-           
-  else
-    ace_just_a_place_holder=fixme
-
-            cat >> confdefs.h <<\EOF
-#define ACE_HAS_NONCONST_MSGSND 1
-EOF
-
-     
-
-  fi
-
-  
-
-  fi
-
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-echo $ac_n "checking if msgrcv() takes a void* second argument""... $ac_c" 1>&6
-echo "configure:27720: checking if msgrcv() takes a void* second argument" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_posix_msgrcv_voidp_2'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27726 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-# include <sys/ipc.h>
-#ifndef ACE_LACKS_SYSV_MSG_H
-# include <sys/msg.h>
-#endif
-      
-int main() {
-
-       int msqid;
-       void* msgp;
-       int msgsz;
-       long msgtyp;
-       int msgflg;
-       msgrcv(msqid, msgp, msgsz, msgtyp, msgflg);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_msgrcv_voidp_2=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_msgrcv_voidp_2=no    
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_posix_msgrcv_voidp_2" 1>&6
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-echo $ac_n "checking if shmat() takes a void* second argument""... $ac_c" 1>&6
-echo "configure:27788: checking if shmat() takes a void* second argument" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_posix_shmat_voidp_2'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27794 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-# include <sys/ipc.h>
-# include <sys/shm.h>
-      
-int main() {
-int shmid;
-       void* shmaddr;
-       int shmflg;
-       shmat(shmid, shmaddr, shmflg);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_shmat_voidp_2=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_shmat_voidp_2=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_posix_shmat_voidp_2" 1>&6
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-echo $ac_n "checking if sigaction() takes a const* second argument""... $ac_c" 1>&6
-echo "configure:27851: checking if sigaction() takes a const* second argument" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_posix_sigaction_constp_2'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27857 "configure"
-#include "confdefs.h"
-
-#include <signal.h>
-      
-int main() {
-
-       int signum;
-       const struct sigaction* act = 0;
-       struct sigaction* oldact;
-       sigaction(signum, act, oldact);
-      
-; return 0; }
-EOF
-if { (eval echo configure:27871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_sigaction_constp_2=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_lib_posix_sigaction_constp_2=no
-      
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$ace_cv_lib_posix_sigaction_constp_2" 1>&6
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-  echo $ac_n "checking if wait() takes a (union wait *) rather than int *""... $ac_c" 1>&6
-echo "configure:27895: checking if wait() takes a (union wait *) rather than int *" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_wait_takes_union_wait_ptr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 27901 "configure"
-#include "confdefs.h"
-
-#include <sys/wait.h>
-       
-int main() {
-
-        int* status;
-        int result;
-        result=wait(status);
-       
-; return 0; }
-EOF
-if { (eval echo configure:27914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_lib_wait_takes_union_wait_ptr=no
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 27925 "configure"
-#include "confdefs.h"
-
-#include <sys/wait.h>
-          
-int main() {
-
-           union wait* status;
-           int result;
-           result=wait(status);
-          
-; return 0; }
-EOF
-if { (eval echo configure:27938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           ace_cv_lib_wait_takes_union_wait_ptr=yes
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           ace_cv_lib_wait_takes_union_wait_ptr=no
-           echo "configure: warning: wait() doesn't seem to take either int* or union wait*" 1>&2
-           echo "configure: warning: as an argument.  Going to assume that int* will work." 1>&2
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_wait_takes_union_wait_ptr" 1>&6
-  if test "$ace_cv_lib_wait_takes_union_wait_ptr" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_UNION_WAIT 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-echo $ac_n "checking if gettimeofday() takes a void * second argument""... $ac_c" 1>&6
-echo "configure:27991: checking if gettimeofday() takes a void * second argument" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_voidptr_gettimeofday'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 27997 "configure"
-#include "confdefs.h"
-
-#include <sys/time.h>
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-       
-int main() {
-
-        struct timeval *tv = 0;
-        void *tzp = 0;
-
-        gettimeofday(tv, tzp);
-       
-; return 0; }
-EOF
-if { (eval echo configure:28014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_lib_voidptr_gettimeofday=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_lib_voidptr_gettimeofday=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-echo "$ac_t""$ace_cv_lib_voidptr_gettimeofday" 1>&6
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-if test "$ace_cv_lib_voidptr_gettimeofday" = no; then
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-  echo $ac_n "checking if gettimeofday() takes a timzeone * second argument""... $ac_c" 1>&6
-echo "configure:28055: checking if gettimeofday() takes a timzeone * second argument" >&5
-if eval "test \"`echo '$''{'ace_cv_lib_timezone_gettimeofday'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 28061 "configure"
-#include "confdefs.h"
-
-#include <sys/time.h>
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-       
-int main() {
-
-        struct timeval *tv = 0;
-        struct timezone *tzp = 0;
-
-        gettimeofday(tv, tzp);
-       
-; return 0; }
-EOF
-if { (eval echo configure:28078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_lib_timezone_gettimeofday=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_lib_timezone_gettimeofday=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-echo "$ac_t""$ace_cv_lib_timezone_gettimeofday" 1>&6
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- fi 
-if test "$ace_cv_lib_voidptr_gettimeofday" = yes ||
-   test "$ace_cv_lib_timezone_gettimeofday" = yes; then
-  
-  echo $ac_n "checking for gettimeofday() protoype""... $ac_c" 1>&6
-echo "configure:28104: checking for gettimeofday() protoype" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_has_gettimeofday_prototype'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 28110 "configure"
-#include "confdefs.h"
-
-#include <time.h>
-
-#ifdef ACE_LACKS_SYSTIME_H
-# include <sys/time.h>
-#endif
-       
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "gettimeofday" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-        ace_cv_lib_has_gettimeofday_prototype=yes
-       
-else
-  rm -rf conftest*
-  
-        ace_cv_lib_has_gettimeofday_prototype=no
-       
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_lib_has_gettimeofday_prototype" 1>&6
-  if test "$ace_cv_lib_has_gettimeofday_prototype" != no; then
-    ace_just_a_place_holder=fixme
-
-     if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then
-       cat >> confdefs.h <<\EOF
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY 1
-EOF
-
-     else
-       cat >> confdefs.h <<\EOF
-#define ACE_HAS_TIMEZONE_GETTIMEOFDAY 1
-EOF
-
-     fi
-    
-  else
-    ace_just_a_place_holder=fixme
-
-     if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then
-       cat >> confdefs.h <<\EOF
-#define ACE_HAS_SVR4_GETTIMEOFDAY 1
-EOF
-
-     else
-       cat >> confdefs.h <<\EOF
-#define ACE_HAS_OSF1_GETTIMEOFDAY 1
-EOF
-
-     fi
-    
-
-  fi
-
-fi 
-
-if test "$ac_cv_func_ctime_r" = yes; then
-  
-  echo $ac_n "checking if ctime_r() takes two arguments""... $ac_c" 1>&6
-echo "configure:28176: checking if ctime_r() takes two arguments" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_ctime_r_2_params'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     cat > conftest.$ac_ext <<EOF
-#line 28182 "configure"
-#include "confdefs.h"
-
-#ifndef _REENTRANT
-# define _REENTRANT
-#endif
-
-#include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
-       
-int main() {
-
-        const time_t *t ;
-        char *buf;
-        ctime_r(t, buf);
-       
-; return 0; }
-EOF
-if { (eval echo configure:28203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_lib_posix_ctime_r_2_params=yes
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        ace_cv_lib_posix_ctime_r_2_params=no
-       
-fi
-rm -f conftest*
-    
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_ctime_r_2_params" 1>&6
-  if test "$ace_cv_lib_posix_ctime_r_2_params" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-fi 
-
-
-if test "$ace_cv_struct_msghdr" = yes; then
-
-  
-  echo $ac_n "checking if struct msghdr has a msg_accrights member""... $ac_c" 1>&6
-echo "configure:28239: checking if struct msghdr has a msg_accrights member" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_struct_msghdr_has_msg_accrights'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 28245 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-        
-int main() {
-
-         msghdr mh;
-         mh.msg_accrights = 0;
-        
-; return 0; }
-EOF
-if { (eval echo configure:28260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_struct_msghdr_has_msg_accrights=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_struct_msghdr_has_msg_accrights=no
-        
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_struct_msghdr_has_msg_accrights" 1>&6
-  if test "$ace_cv_lib_posix_struct_msghdr_has_msg_accrights" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-  
-  echo $ac_n "checking if struct msghdr has a msg_accrights_len member""... $ac_c" 1>&6
-echo "configure:28289: checking if struct msghdr has a msg_accrights_len member" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_posix_struct_msghdr_has_msg_accrights_len'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 28295 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-        
-int main() {
-
-         msghdr mh;
-         mh.msg_accrightslen = 0;
-        
-; return 0; }
-EOF
-if { (eval echo configure:28310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_struct_msghdr_has_msg_accrights_len=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-         ace_cv_lib_posix_struct_msghdr_has_msg_accrights_len=no
-        
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_posix_struct_msghdr_has_msg_accrights_len" 1>&6
-  if test "$ace_cv_lib_posix_struct_msghdr_has_msg_accrights_len" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-  if test "$ace_cv_lib_posix_struct_msghdr_has_msg_accrights" = no &&
-     test "$ace_cv_lib_posix_struct_msghdr_has_msg_accrights_len" = no; then
-    cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MSG_ACCRIGHTS 1
-EOF
-
-    
-  echo $ac_n "checking for 4.4 BSD style struct msghdr""... $ac_c" 1>&6
-echo "configure:28345: checking for 4.4 BSD style struct msghdr" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_4_4bsd_msghdr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 28351 "configure"
-#include "confdefs.h"
-#include <sys/socket.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "msg_control" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-         ace_cv_lib_4_4bsd_msghdr=yes
-        
-else
-  rm -rf conftest*
-  
-         ace_cv_lib_4_4bsd_msghdr=no
-        
-fi
-rm -f conftest*
-
-    
-fi
-
-  echo "$ac_t""$ace_cv_lib_4_4bsd_msghdr" 1>&6
-  if test "$ace_cv_lib_4_4bsd_msghdr" != no; then
-    ace_just_a_place_holder=fixme
-
-     cat >> confdefs.h <<\EOF
-#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG 1
-EOF
-
-    
-  else
-    ace_just_a_place_holder=fixme
-
-     echo "configure: warning: No supported msghdr structure was found.  ACE may not compile or function properly." 1>&2
-    
-
-  fi
-
-  fi
-
-  if test "$ace_cv_lib_4_4bsd_msghdr" = yes; then
-    
-  echo $ac_n "checking if CMSG_DATA is defined""... $ac_c" 1>&6
-echo "configure:28394: checking if CMSG_DATA is defined" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_cmsg_data'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-       cat > conftest.$ac_ext <<EOF
-#line 28400 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#if defined (CMSG_DATA)
-             ACE_CMSG_DATA_DEFINED
-#endif
-         
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_CMSG_DATA_DEFINED" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-          ace_cv_lib_cmsg_data=yes
-         
-else
-  rm -rf conftest*
-  
-          ace_cv_lib_cmsg_data=no
-          cat > conftest.$ac_ext <<EOF
-#line 28425 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-#include <sys/un.h>
-            
-int main() {
-
-             /* This is sloppy.  Oh well. :) */
-             unsigned char ace_cmsg_data[0];
-             
-             cmsghdr ace_cmsg;
-             ace_cmsg.cmsg_data = ace_cmsg_data;
-            
-; return 0; }
-EOF
-if { (eval echo configure:28444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                         
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-             cat > conftest.$ac_ext <<EOF
-#line 28454 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-#include <sys/un.h>
-               
-int main() {
-
-                /* This is sloppy.  Oh well. :) */
-                unsigned char ace_cmsg_data[0];
-             
-                cmsghdr ace_cmsg;
-                ace_cmsg.__cmsg_data = ace_cmsg_data;
-               
-; return 0; }
-EOF
-if { (eval echo configure:28473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                { echo "configure: error: cmsgmdr member '__cmsg_data0' not supported by ACE's CMSG_DATA macro" 1>&2; exit 1; }
-               
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                cat > conftest.$ac_ext <<EOF
-#line 28484 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-#include <sys/un.h>
-                  
-int main() {
-
-                   cmsghdr ace_cmsg;
-                  
-; return 0; }
-EOF
-if { (eval echo configure:28499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                   if eval "test \"`echo '$''{'ace_cv_lib_cmsg_data_member'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ace_cv_lib_cmsg_data_member=no
-fi
-
-                  
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                   { echo "configure: error: No supported cmsghdr structure exists.  ACE cannot be built without one." 1>&2; exit 1; }
-                  
-fi
-rm -f conftest*
-               
-fi
-rm -f conftest*
-            
-fi
-rm -f conftest*
-         
-fi
-rm -f conftest*
-
-      
-fi
-
-  echo "$ac_t""$ace_cv_lib_cmsg_data" 1>&6
-  if test "$ace_cv_lib_cmsg_data" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-
-       cat >> confdefs.h <<\EOF
-#define ACE_LACKS_CMSG_DATA_MACRO 1
-EOF
-
-       if test "$ace_cv_lib_cmsg_data_member"=no; then
-         cat >> confdefs.h <<\EOF
-#define ACE_LACKS_CMSG_DATA_MEMBER 1
-EOF
-
-       fi
-       
-      
-
-  fi
-
-  fi 
-fi 
-
-if test "$cross_compiling" != yes; then
-  echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6
-echo "configure:28558: checking for restartable system calls" >&5
-if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 28566 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-/* Exit 0 (true) if wait returns something other than -1,
-   i.e. the pid of the child, which means that wait was restarted
-   after getting the signal.  */
-#include <sys/types.h>
-#include <signal.h>
-ucatch (isig) { }
-main () {
-  int i = fork (), status;
-  if (i == 0) { sleep (3); kill (getppid (), SIGINT); sleep (3); exit (0); }
-  signal (SIGINT, ucatch);
-  status = wait(&i);
-  if (status == -1) wait(&i);
-  exit (status == -1);
-}
-
-EOF
-if { (eval echo configure:28587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sys_restartable_syscalls=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sys_restartable_syscalls=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_sys_restartable_syscalls" 1>&6
-if test $ac_cv_sys_restartable_syscalls = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_RESTARTABLE_SYSCALLS 1
-EOF
-
-fi
-
-  if test "$ac_cv_sys_restartable_syscalls" = yes; then
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_SIGNAL_SAFE_OS_CALLS 1
-EOF
-
-  fi
-fi
-
-
-  echo $ac_n "checking for ctime() macro""... $ac_c" 1>&6
-echo "configure:28619: checking for ctime() macro" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_have_ctime_macro'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 28625 "configure"
-#include "confdefs.h"
-
-#include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
-
-#if defined (ctime)
-        ACE_CTIME_MACRO
-#endif
-     
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_CTIME_MACRO" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-      ace_cv_feature_have_ctime_macro=yes
-     
-else
-  rm -rf conftest*
-  
-      ace_cv_feature_have_ctime_macro=no
-     
-fi
-rm -f conftest*
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_have_ctime_macro" 1>&6
-  if test "$ace_cv_feature_have_ctime_macro" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_CTIME 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for reentrant function macros""... $ac_c" 1>&6
-echo "configure:28671: checking for reentrant function macros" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_has_broken_r_routines'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 28677 "configure"
-#include "confdefs.h"
-
-#ifndef _REENTRANT
-# define _REENTRANT
-#endif
-
-#include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
-
-#if defined (HAVE_PWD_H)
-# include <pwd.h>
-#endif
-
-#if defined (ctime_r) || \
-    defined (asctime_r) || \
-    defined (rand_r) || \
-    defined (getpwnam_r)
-        ACE_R_MACROS
-#endif
-     
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_R_MACROS" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-      ace_cv_feature_has_broken_r_routines=yes
-     
-else
-  rm -rf conftest*
-  
-      ace_cv_feature_has_broken_r_routines=no
-     
-fi
-rm -f conftest*
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_has_broken_r_routines" 1>&6
-  if test "$ace_cv_feature_has_broken_r_routines" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_R_ROUTINES 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for sig{empty fill add del}set macros""... $ac_c" 1>&6
-echo "configure:28734: checking for sig{empty fill add del}set macros" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_have_sig_macros'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 28740 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <signal.h>
-
-#if defined (sigemptyset) && \
-          defined (sigfillset) && \
-          defined (sigaddset) && \
-          defined (sigdelset) && \
-          defined (sigismember)
-        ACE_SIG_MACROS
-#endif
-     
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_SIG_MACROS" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-      ace_cv_feature_have_sig_macros=yes
-     
-else
-  rm -rf conftest*
-  
-      ace_cv_feature_have_sig_macros=no
-     
-fi
-rm -f conftest*
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_have_sig_macros" 1>&6
-  if test "$ace_cv_feature_have_sig_macros" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_SIG_MACROS 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for open() mode masks""... $ac_c" 1>&6
-echo "configure:28789: checking for open() mode masks" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_have_open_mode_masks'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 28795 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#include <fcntl.h>
-
-       /* These are ORed so that ACE will not redefine
-          any of them if any of them exist. */
-#if defined (S_IRWXU) || \
-           defined (S_IRUSR) || \
-           defined (S_IWUSR) || \
-           defined (S_IXUSR) || \
-           defined (S_IRWXG) || \
-           defined (S_IRGRP) || \
-           defined (S_IWGRP) || \
-           defined (S_IXGRP) || \
-           defined (S_IRWXO) || \
-           defined (S_IROTH) || \
-           defined (S_IWOTH) || \
-           defined (S_IXOTH)
-          ACE_OPEN_MODE_MASKS_EXIST
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_OPEN_MODE_MASKS_EXIST" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-       ace_cv_feature_have_open_mode_masks=yes
-      
-else
-  rm -rf conftest*
-  
-       ace_cv_feature_have_open_mode_masks=no
-      
-fi
-rm -f conftest*
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_have_open_mode_masks" 1>&6
-  if test "$ace_cv_feature_have_open_mode_masks" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_MODE_MASKS 1
-EOF
-
-
-  fi
-
-
-
-
-  echo $ac_n "checking for POSIX O_NONBLOCK semantics""... $ac_c" 1>&6
-echo "configure:28856: checking for POSIX O_NONBLOCK semantics" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_posix_o_nonblock'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 28862 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#if defined (O_NONBLOCK)
-          ACE_POSIX_O_NONBLOCK
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_POSIX_O_NONBLOCK" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-       ace_cv_feature_posix_o_nonblock=yes
-      
-else
-  rm -rf conftest*
-  
-       ace_cv_feature_posix_o_nonblock=no
-      
-fi
-rm -f conftest*
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_posix_o_nonblock" 1>&6
-  if test "$ace_cv_feature_posix_o_nonblock" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_POSIX_NONBLOCK 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for MAP_FAILED constant""... $ac_c" 1>&6
-echo "configure:28908: checking for MAP_FAILED constant" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_have_map_failed'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-                cat > conftest.$ac_ext <<EOF
-#line 28914 "configure"
-#include "confdefs.h"
-
-#include <sys/mman.h>
-       ACEMAPFAILED MAP_FAILED
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACEMAPFAILED.+[0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-       ace_cv_lib_have_map_failed=yes
-      
-else
-  rm -rf conftest*
-  
-       ace_cv_lib_have_map_failed=no
-      
-fi
-rm -f conftest*
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_have_map_failed" 1>&6
-  if test "$ace_cv_lib_have_map_failed" != no; then
-    ace_just_a_place_holder=fixme
-
-      
-  echo $ac_n "checking if MAP_FAILED is a long constant""... $ac_c" 1>&6
-echo "configure:28944: checking if MAP_FAILED is a long constant" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_long_map_failed'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-                            cat > conftest.$ac_ext <<EOF
-#line 28950 "configure"
-#include "confdefs.h"
-
-#include <sys/mman.h>
-          ACEMAPFAILED MAP_FAILED
-         
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACEMAPFAILED.+[0-9]L" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-          ace_cv_feature_long_map_failed=yes
-         
-else
-  rm -rf conftest*
-  
-          ace_cv_feature_long_map_failed=no
-         
-fi
-rm -f conftest*
-
-     
-fi
-
-  echo "$ac_t""$ace_cv_feature_long_map_failed" 1>&6
-  if test "$ace_cv_feature_long_map_failed" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_LONG_MAP_FAILED 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-            
-  echo $ac_n "checking if MAP_FAILED is not cast to void *""... $ac_c" 1>&6
-echo "configure:28986: checking if MAP_FAILED is not cast to void *" >&5
-  if eval "test \"`echo '$''{'ace_cv_have_broken_map_failed'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-          cat > conftest.$ac_ext <<EOF
-#line 28992 "configure"
-#include "confdefs.h"
-
-#include <sys/mman.h>
-            
-int main() {
-
-             void * foo = MAP_FAILED;
-            
-; return 0; }
-EOF
-if { (eval echo configure:29003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-             ace_cv_have_broken_map_failed=no
-            
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-             cat > conftest.$ac_ext <<EOF
-#line 29014 "configure"
-#include "confdefs.h"
-
-#include <sys/mman.h>
-               
-int main() {
-
-                void * foo = (void *) MAP_FAILED;
-               
-; return 0; }
-EOF
-if { (eval echo configure:29025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                ace_cv_have_broken_map_failed=yes
-               
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                                ace_cv_have_broken_map_failed=no
-               
-fi
-rm -f conftest*
-            
-fi
-rm -f conftest*
-        
-fi
-
-  echo "$ac_t""$ace_cv_have_broken_map_failed" 1>&6
-  if test "$ace_cv_have_broken_map_failed" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_MAP_FAILED 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-     
-
-  fi
-
-  
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for TCP_NODELAY support""... $ac_c" 1>&6
-echo "configure:29070: checking for TCP_NODELAY support" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_tcp_nodelay'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 29076 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <netinet/tcp.h>
-
-#if defined (TCP_NODELAY)
-       ACE_TCPNODELAY
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_TCPNODELAY" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-       ace_cv_feature_tcp_nodelay=yes
-      
-else
-  rm -rf conftest*
-  
-       ace_cv_feature_tcp_nodelay=no
-      
-fi
-rm -f conftest*
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_tcp_nodelay" 1>&6
-  if test "$ace_cv_feature_tcp_nodelay" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_TCP_NODELAY 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for SO_SNDBUF/SO_RCVBUF socket options""... $ac_c" 1>&6
-echo "configure:29122: checking for SO_SNDBUF/SO_RCVBUF socket options" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_so_sndbuf_rcvbuf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 29128 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/socket.h>
-
-#if defined (SO_SNDBUF) && \
-    defined (SO_RCVBUF)
-       ACE_SO_BUF
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_SO_BUF" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-       ace_cv_feature_so_sndbuf_rcvbuf=yes
-      
-else
-  rm -rf conftest*
-  
-       ace_cv_feature_so_sndbuf_rcvbuf=no
-      
-fi
-rm -f conftest*
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_so_sndbuf_rcvbuf" 1>&6
-  if test "$ace_cv_feature_so_sndbuf_rcvbuf" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SOCKET_BUFSIZ 1
-EOF
-
-
-  fi
-
-
-if test "$ac_cv_header_dlfcn_h" = yes &&
-   test "$ace_has_svr4_dynamic_linking" = yes; then
- 
-  echo $ac_n "checking for automatic init/fini calls""... $ac_c" 1>&6
-echo "configure:29177: checking for automatic init/fini calls" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_auto_init_fini'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ace_cv_feature_auto_init_fini=yes
-    # TODO: We know how to check for this, but we need to:
-    #
-    #   1. Compile one file.
-    #   2. Compile and link another file.
-    #   3. Run file in point (2); it returns what we need.
-    #
-    # How do we do all that?
-   
-fi
-
-  echo "$ac_t""$ace_cv_feature_auto_init_fini" 1>&6
-  if test "$ace_cv_feature_auto_init_fini" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_AUTOMATIC_INIT_FINI 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-fi    
-if test "$ace_user_enable_threads" = yes; then
-  
-  echo $ac_n "checking for recursive thread exit semantics""... $ac_c" 1>&6
-echo "configure:29209: checking for recursive thread exit semantics" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_recursive_thr_exit'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      ace_cv_feature_recursive_thr_exit=yes
-      # TODO: How do we check for recursive thread exit semantics
-    
-fi
-
-  echo "$ac_t""$ace_cv_feature_recursive_thr_exit" 1>&6
-  if test "$ace_cv_feature_recursive_thr_exit" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-fi
-
-
-  echo $ac_n "checking for UNIX domain sockets""... $ac_c" 1>&6
-echo "configure:29235: checking for UNIX domain sockets" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_unix_sockets'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 29241 "configure"
-#include "confdefs.h"
-
-#include <sys/un.h>
-      
-int main() {
-
-       sockaddr_un su;
-      
-; return 0; }
-EOF
-if { (eval echo configure:29252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_feature_unix_sockets=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       ace_cv_feature_unix_sockets=no
-      
-fi
-rm -f conftest*
-   
-fi
-
-  echo "$ac_t""$ace_cv_feature_unix_sockets" 1>&6
-  if test "$ace_cv_feature_unix_sockets" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_UNIX_DOMAIN_SOCKETS 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking for ACE_Handle_Set optimized for select()""... $ac_c" 1>&6
-echo "configure:29285: checking for ACE_Handle_Set optimized for select()" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_handle_set_optimized_for_select'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    ace_cv_feature_handle_set_optimized_for_select=yes
-    # TODO: We know how to check this. We need to:
-    #
-    #   1. Compile and link a file.
-    #   2. Run nm on that file.
-    #
-    # How do we do that?
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_handle_set_optimized_for_select" 1>&6
-  if test "$ace_cv_feature_handle_set_optimized_for_select" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for IP multicast support""... $ac_c" 1>&6
-echo "configure:29315: checking for IP multicast support" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_ip_multicast'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 29321 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <netinet/in.h>
-      
-int main() {
-
-       ip_mreq im;
-      
-; return 0; }
-EOF
-if { (eval echo configure:29335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-       ace_cv_feature_ip_multicast=yes
-      
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-       cat > conftest.$ac_ext <<EOF
-#line 29346 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <sys/netinet/in.h>
-         
-int main() {
-
-          ip_mreq im;
-         
-; return 0; }
-EOF
-if { (eval echo configure:29360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-          ace_cv_feature_ip_multicast=yes
-         
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-   
-          ace_cv_feature_ip_multicast=no
-         
-fi
-rm -f conftest*
-      
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_ip_multicast" 1>&6
-  if test "$ace_cv_feature_ip_multicast" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_IP_MULTICAST 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking if running on an Alpha""... $ac_c" 1>&6
-echo "configure:29395: checking if running on an Alpha" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_alpha'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    case "$target" in
-      alpha*)
-        ace_cv_feature_alpha=yes
-        ;;
-      *)
-        ace_cv_feature_alpha=no
-        ;;
-    esac
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_alpha" 1>&6
-  if test "$ace_cv_feature_alpha" != no; then
-    ace_just_a_place_holder=fixme
-
-   case "$target" in
-     *linux*)
-                     if test -n "$GXX"; then
-         cat >> confdefs.h <<\EOF
-#define ACE_HAS_ALPHA_TIMER 1
-EOF
-
-       fi
-       ;;
-   esac
-  
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking if running on a Power PC""... $ac_c" 1>&6
-echo "configure:29434: checking if running on a Power PC" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_powerpc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    case "$target" in
-      powerpc*)
-        ace_cv_feature_powerpc=yes
-        ;;
-      *)
-        ace_cv_feature_powerpc=no
-        ;;
-    esac
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_powerpc" 1>&6
-  if test "$ace_cv_feature_powerpc" != no; then
-    ace_just_a_place_holder=fixme
-
-   case "$target" in
-     *aix*)
-                     ;;
-     *)
-              if test -n "$GXX"; then
-         cat >> confdefs.h <<\EOF
-#define ACE_HAS_POWERPC_TIMER 1
-EOF
-
-       fi
-       ;;
-   esac
-  
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking if running on a Pentium(tm) processor""... $ac_c" 1>&6
-echo "configure:29475: checking if running on a Pentium(tm) processor" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_pentium'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-      
-    case "$target" in
-      i386-* | i486-* |i586-* | i686-*)
-        ace_cv_feature_pentium=yes
-        ;;
-      *)
-        ace_cv_feature_pentium=no
-        ;;
-    esac
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_pentium" 1>&6
-  if test "$ace_cv_feature_pentium" != no; then
-    ace_just_a_place_holder=fixme
-
-   cat >> confdefs.h <<\EOF
-#define ACE_HAS_PENTIUM 1
-EOF
-
-  
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-if test X$ace_cv_feature_pentium = Xyes; then
-  ACE_ON_PENTIUM_TRUE=
-  ACE_ON_PENTIUM_FALSE='#'
-else
-  ACE_ON_PENTIUM_TRUE='#'
-  ACE_ON_PENTIUM_FALSE=
-fi
-
-
-  ace_pre_warning_CXXFLAGS="$CXXFLAGS"
-
-  if test -n "$GXX"; then
-    CXXFLAGS="$CXXFLAGS -Werror"
-  else
-    case $target in
-    *solaris*)
-       if test "$CXX" = CC; then
-         CXXFLAGS="$CXXFLAGS -xwe"
-       fi
-       ;;
-    *) ;;
-    esac
-  fi
-
-  
-
-  echo $ac_n "checking if _GNU_SOURCE is needed""... $ac_c" 1>&6
-echo "configure:29534: checking if _GNU_SOURCE is needed" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_gnu_source'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 29540 "configure"
-#include "confdefs.h"
-
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-       
-int main() {
-
-        int id = getpgid(0);
-       
-; return 0; }
-EOF
-if { (eval echo configure:29553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        ace_cv_feature_gnu_source=no
-       
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 29564 "configure"
-#include "confdefs.h"
-
-#define _GNU_SOURCE
-/* #define _GNU_SOURCE_EXTENDED */
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-          
-int main() {
-
-           int id = getpgid(0);
-          
-; return 0; }
-EOF
-if { (eval echo configure:29579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-           ace_cv_feature_gnu_source=yes
-          
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-           ace_cv_feature_gnu_source=no
-          
-fi
-rm -f conftest*
-       
-fi
-rm -f conftest*
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_gnu_source" 1>&6
-  if test "$ace_cv_feature_gnu_source" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define _GNU_SOURCE 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  CXXFLAGS="$ace_pre_warning_CXXFLAGS"
- 
-
-
-
-if test "$ace_user_enable_reentrant_funcs" = yes &&
-   test "$ac_cv_func_rand_r" = yes &&
-   test "$ac_cv_func_strtok_r" = yes &&
-   test "$ac_cv_func_ctime_r" = yes &&
-   test "$ac_cv_func_localtime_r" = yes &&
-   test "$ac_cv_func_gmtime_r" = yes &&
-   test "$ac_cv_func_asctime_r" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_REENTRANT_FUNCTIONS 1
-EOF
-
-fi
-
-if test "$ace_user_enable_reentrant_funcs" = no ||
-   test "$ac_cv_func_getprotobyname_r" = no ||
-   test "$ac_cv_func_getprotobynumber_r" = no ||
-   test "$ac_cv_func_gethostbyaddr_r" = no ||
-   test "$ac_cv_func_gethostbyname_r" = no ||
-   test "$ac_cv_func_getservbyname_r" = no; then
-  cat >> confdefs.h <<\EOF
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1
-EOF
-
-fi
-
-case "$target" in
-  *linux*) cat >> confdefs.h <<\EOF
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1
-EOF
-;;
-  *) ;;
-esac
-
-
-
-if test "$ace_cv_lib_posix_msgsnd_msgbufp_2" = yes ||
-   test "$ace_cv_lib_posix_msgrcv_voidp_2" != yes ||
-   test "$ace_cv_lib_posix_shmat_voidp_2" != yes ||
-   test "$ace_cv_lib_posix_sigaction_constp_2" != yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SOME_POSIX_PROTOTYPES 1
-EOF
-
-fi
-
-if test "$ac_cv_func_msgctl" = yes &&
-   test "$ac_cv_func_msgget" = yes &&
-   test "$ac_cv_func_msgrcv" = yes &&
-   test "$ac_cv_func_semctl" = yes &&
-   test "$ac_cv_func_semget" = yes &&
-   test "$ac_cv_func_semop" = yes &&
-   test "$ac_cv_func_shmat" = yes &&
-   test "$ac_cv_func_shmctl" = yes &&
-   test "$ac_cv_func_shmdt" = yes &&
-   test "$ac_cv_func_shmget" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_SYSV_IPC 1
-EOF
-
-fi
-
-if test "$ac_cv_func_shmat" != yes ||
-   test "$ac_cv_func_shmctl" != yes ||
-   test "$ac_cv_func_shmdt" != yes ||
-   test "$ac_cv_func_shmget" != yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_LACKS_SYSV_SHMEM 1
-EOF
-
-fi
-
-echo $ac_n "checking which POSIX thread library was found""... $ac_c" 1>&6
-echo "configure:29690: checking which POSIX thread library was found" >&5
-
-ace_has_pthreads=no
-
-if test "$ac_cv_func_pthread_mutexattr_create" = yes &&
-   test "$ac_cv_func_pthread_mutexattr_delete" = yes &&
-   test "$ac_cv_func_pthread_condattr_delete" = yes &&
-   test "$ac_cv_func_pthread_condattr_create" = yes &&
-   test "$ac_cv_func_pthread_setprio" = yes &&
-   test "$ac_cv_func_pthread_getprio" = yes &&
-   test "$ac_cv_func_pthread_setcancel" = yes &&
-   test "$ac_cv_func_pthread_setasynccancel" = yes &&
-   test "$ac_cv_func_pthread_kill" = yes; then
-  ace_has_pthreads=yes
-  echo "$ac_t""POSIX Threads Draft 4" 1>&6
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_PTHREADS_DRAFT4 1
-EOF
-
-elif test "$ac_cv_func_pthread_mutexattr_init" = yes &&
-   test "$ac_cv_func_pthread_mutexattr_destroy" = yes &&
-   test "$ac_cv_func_pthread_condattr_destroy" = yes &&
-   test "$ac_cv_func_pthread_condattr_init" = yes &&
-   test "$ac_cv_func_pthread_attr_setprio" = yes &&
-   test "$ac_cv_func_pthread_attr_getprio" = yes &&
-   test "$ac_cv_func_pthread_setintr" = yes &&
-   test "$ac_cv_func_pthread_setintrtype" = yes; then
-  ace_has_pthreads=yes
-  echo "$ac_t""POSIX Threads Draft 6" 1>&6
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_PTHREADS_DRAFT6 1
-EOF
-
-elif test "$ac_cv_func_pthread_mutexattr_init" = yes &&
-   test "$ac_cv_func_pthread_mutexattr_destroy" = yes &&
-   test "$ac_cv_func_pthread_condattr_destroy" = yes &&
-   test "$ac_cv_func_pthread_condattr_init" = yes &&
-   test "$ac_cv_func_pthread_setschedparam" = yes &&
-   test "$ac_cv_func_pthread_getschedparam" = yes &&
-   test "$ac_cv_func_pthread_setcancelstate" = yes &&
-   test "$ac_cv_func_pthread_setcanceltype" = yes &&
-   test "$ace_has_sched_yield" != yes; then
-  ace_has_pthreads=yes
-  echo "$ac_t""POSIX Threads Draft 7" 1>&6
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_PTHREADS_DRAFT7 1
-EOF
-
-elif test "$ac_cv_func_pthread_mutexattr_init" = yes &&
-   test "$ac_cv_func_pthread_mutexattr_destroy" = yes &&
-   test "$ac_cv_func_pthread_condattr_destroy" = yes &&
-   test "$ac_cv_func_pthread_condattr_init" = yes &&
-   test "$ac_cv_func_pthread_setschedparam" = yes &&
-   test "$ac_cv_func_pthread_getschedparam" = yes &&
-   test "$ac_cv_func_pthread_setcancelstate" = yes &&
-   test "$ac_cv_func_pthread_setcanceltype" = yes &&
-   test "$ace_has_sched_yield" = yes; then
-  ace_has_pthreads=yes
-  echo "$ac_t""POSIX Threads Draft Standard" 1>&6
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_PTHREADS_STD 1
-EOF
-
-else
-  ace_has_pthreads=no
-  echo "$ac_t""none" 1>&6
-fi 
-echo $ac_n "checking if a UNIX International thread library was found""... $ac_c" 1>&6
-echo "configure:29758: checking if a UNIX International thread library was found" >&5
-if test "$ace_has_sthreads" = yes; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test "$ace_user_enable_threads" != yes ||
-   test "$ace_has_pthreads" != yes &&
-   test "$ace_has_sthreads" != yes; then
-  ace_user_enable_threads=no
-  echo "configure: warning: It appears that you do NOT have any usable thread libraries" 1>&2
-  echo "configure: warning: or thread support was explicitly disabled." 1>&2
-  echo "configure: warning: Disabling thread support." 1>&2
-            if test "$ac_cv_func_readdir_r" = yes; then
-    echo "configure: warning: Disabling support for readdir_r() since thread support" 1>&2
-    echo "configure: warning: is being disabled." 1>&2
-    cat >> confdefs.h <<\EOF
-#define ACE_LACKS_READDIR_R 1
-EOF
-
-  fi fi 
-if test "$ace_user_enable_threads" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_THREADS 1
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define ACE_MT_SAFE 1
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define _REENTRANT 1
-EOF
-
-  if test "$ace_has_pthreads" = yes &&
-     test "$ace_has_sthreads" != yes; then
-   cat >> confdefs.h <<\EOF
-#define _POSIX_THREADS 1
-EOF
-
-   cat >> confdefs.h <<\EOF
-#define _POSIX_THREAD_SAFE_FUNCTIONS 1
-EOF
-
-   cat >> confdefs.h <<\EOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-EOF
-
-  fi 
-  if test "$ace_has_pthreads" = yes; then
-
-                    
-  echo $ac_n "checking for pthread_join null status pointer support""... $ac_c" 1>&6
-echo "configure:29812: checking for pthread_join null status pointer support" >&5
-  if eval "test \"`echo '$''{'ace_cv_have_null_status_pthread_join'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-        cat > conftest.$ac_ext <<EOF
-#line 29818 "configure"
-#include "confdefs.h"
-
-#if defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREADS_DRAFT4)
-/* This test is only valid for Pthreads Draft 4 */
-WE_HAVE_PTHREADS_D4
-#endif
-          
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "WE_HAVE_PTHREADS_D4" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-           if test "$cross_compiling" = yes; then
-  
-                                                        ace_cv_have_null_status_pthread_join=yes
-             
-else
-  cat > conftest.$ac_ext <<EOF
-#line 29837 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif 
-
-#ifndef _THREAD_SAFE
-#define _THREAD_SAFE
-#endif           
-
-#include <pthread.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C"
-#endif
-void *
-nothing (void *unused)
-{
-  return (void *) 34;
-};
-
-int
-main (int argc, char *argv[])
-{
-  pthread_attr_t attr;
-  pthread_t id;
-  void *status;
-  int retval = 0;
-
-  /* ----- */
-  /* We return 0 on error for these calls since we only want to
-     return an error status if pthread_join fails.  If these calls
-     fail then we've got other problems! */
-  if (pthread_attr_create (&attr) != 0) return 0 /*1*/;
-
-  if (pthread_create (&id, attr, &nothing, 0) != 0) return 0 /*2*/;
-
-  if (pthread_attr_delete (&attr) != 0) return /*3*/;
-  /* ----- */
-
-  /* With a second (status) arg of 0, LynxOS 3.0.0 pthread_join ()
-     will fail with errno 14 (address fault detected). */
-  if (pthread_join (id, 0) == -1) {
-    fprintf (stderr, "%s: %d; ", __FILE__, __LINE__);
-    perror ("pthread_join");
-    retval = 1;
-  }
-
-  if (pthread_join (id, &status) == -1) {
-    fprintf (stderr, "%s: %d; ", __FILE__, __LINE__);
-    perror ("pthread_join");
-    retval = 2;
-  }
-
-  return retval;
-}
-             
-EOF
-if { (eval echo configure:29900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  
-              ace_cv_have_null_status_pthread_join=yes
-             
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  
-              ace_cv_have_null_status_pthread_join=no
-             
-fi
-rm -fr conftest*
-fi
-
-          
-else
-  rm -rf conftest*
-  
-           ace_cv_have_null_status_pthread_join=yes
-          
-fi
-rm -f conftest*
-
-      
-fi
-
-  echo "$ac_t""$ace_cv_have_null_status_pthread_join" 1>&6
-  if test "$ace_cv_have_null_status_pthread_join" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_NULL_PTHREAD_STATUS 1
-EOF
-
-
-  fi
-
-
-                    
-  echo $ac_n "checking if SCHED_OTHER is only scheduling policy""... $ac_c" 1>&6
-echo "configure:29944: checking if SCHED_OTHER is only scheduling policy" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_only_have_sched_other'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-        cat > conftest.$ac_ext <<EOF
-#line 29950 "configure"
-#include "confdefs.h"
-
-#ifdef ACE_HAS_PTHREADS
-# include <pthread.h>
-#endif
-
-#if defined (ACE_NEEDS_SCHED_H)
-# include <sched.h>
-#endif
-
-       /* These are ORed so that ACE will not redefine
-          any of them if any of them exist. */
-#if !defined (SCHED_FIFO) && \
-    !defined (SCHED_RR) && \
-    defined (SCHED_OTHER)
-          WE_ONLY_HAVE_SCHED_OTHER
-#endif
-          
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "WE_ONLY_HAVE_SCHED_OTHER" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-           ace_cv_feature_only_have_sched_other=yes      
-          
-else
-  rm -rf conftest*
-  
-           if test "$cross_compiling" = yes; then
-  
-                                                                                                                ace_cv_feature_only_have_sched_other=no
-             
-else
-  cat > conftest.$ac_ext <<EOF
-#line 29985 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif 
-
-#ifndef _THREAD_SAFE
-#define _THREAD_SAFE
-#endif           
-
-#include <pthread.h>
-#include <stdio.h>
-#include <errno.h>
-
-int main ()
-{
-  pthread_attr_t ace_attr;
-
-#if defined (ACE_HAS_PTHREADS_DRAFT4)
-  if (pthread_attr_create (&ace_attr) != 0)
-#else
-  if (pthread_attr_init (&ace_attr) != 0)
-#endif
-    {
-     perror ("pthread_attr_init");
-     return 0; /* Return "successfully" since only the policy call
-                  will return with an error for this test. */
-    }
-
-#if defined (ACE_HAS_PTHREADS_DRAFT4)
-  if (pthread_attr_setsched (&ace_attr, SCHED_FIFO) != 0)
-#else
-  if (pthread_attr_setschedpolicy (&ace_attr, SCHED_FIFO) != 0)
-#endif
-    {   
-     perror ("pthread_attr_setschedpolicy");
-     return -1;
-    }
-
-#if defined (ACE_HAS_PTHREADS_DRAFT4)
-  if (pthread_attr_delete (&ace_attr) != 0)
-#else
-  if (pthread_attr_destroy (&ace_attr) != 0)
-#endif
-    {                                   
-     perror ("pthread_attr_destroy");
-     return 0; /* Return "successfully" since only the policy call
-                  will return with an error for this test. */    
-    }
-
-  return 0;
-}
-             
-EOF
-if { (eval echo configure:30043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  
-              ace_cv_feature_only_have_sched_other=no
-             
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  
-              ace_cv_feature_only_have_sched_other=yes
-             
-fi
-rm -fr conftest*
-fi
-
-          
-fi
-rm -f conftest*
-
-      
-fi
-
-  echo "$ac_t""$ace_cv_feature_only_have_sched_other" 1>&6
-  if test "$ace_cv_feature_only_have_sched_other" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_ONLY_SCHED_OTHER 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-  fi fi 
-
-if test "$ac_cv_header_libc_h" != yes ||
-   test "$ac_cv_header_osfcn_h" != yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_CPLUSPLUS_HEADERS 1
-EOF
-
-fi
-
-
-
-if test "$ace_cv_lib_signal_vi1_2" = yes &&
-   test "$ace_cv_lib_signal_vi1_ret" = yes &&
-   test "$ace_cv_lib_struct_sigaction_vi1_handler" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1
-EOF
-
-elif test "$ace_cv_lib_signal_vi1_2" != yes &&
-   test "$ace_cv_lib_signal_vv1_2" != yes &&
-   test "$ace_cv_lib_signal_vi1a2_2" != yes &&
-   test "$ace_cv_lib_signal_va1_2" = yes &&
-   test "$ace_cv_lib_signal_vi1_ret" != yes &&
-   test "$ace_cv_lib_signal_vv1_ret" != yes &&
-   test "$ace_cv_lib_signal_vi1a2_ret" != yes &&
-   test "$ace_cv_lib_signal_va1_ret" = yes &&
-   test "$ace_cv_lib_struct_sigaction_vi1_handler" != yes &&
-   test "$ace_cv_lib_struct_sigaction_vv1_handler" != yes &&
-   test "$ace_cv_lib_struct_sigaction_vi1a2_handler" != yes &&
-   test "$ace_cv_lib_struct_sigaction_va1_handler" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_LYNXOS_SIGNALS 1
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_TANDEM_SIGNALS 1
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_IRIX_53_SIGNALS 1
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_SUNOS4_SIGNAL_T 1
-EOF
-
-elif test "$ace_cv_lib_signal_vi1a2_2" = yes &&
-   test "$ace_cv_lib_signal_vi1a2_ret" = yes &&
-   test "$ace_cv_lib_struct_sigaction_vi1a2_handler" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_SPARCWORKS_401_SIGNALS 1
-EOF
-
-elif test "$ace_cv_lib_signal_vi1_2" = yes &&
-   test "$ace_cv_lib_signal_vi1_ret" = yes &&
-   test "$ace_cv_lib_struct_sigaction_vi1_handler" != yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_SVR4_SIGNAL_T 1
-EOF
-
-elif test "$ace_cv_lib_signal_vi1_2" = yes &&
-   test "$ace_cv_lib_signal_vv1_ret" = yes &&
-   test "$ace_cv_lib_struct_sigaction_vv1_handler" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_SVR4_SIGNAL_T 1
-EOF
-
-elif test "$ace_cv_lib_signal_vi1_2" = yes &&
-   test "$ace_cv_lib_signal_vi1_ret" != yes &&
-   test "$ace_cv_lib_signal_vv1_ret" != yes &&
-   test "$ace_cv_lib_signal_vi1a2_ret" != yes &&
-   test "$ace_cv_lib_signal_va1_ret" = yes &&
-   test "$ace_cv_lib_struct_sigaction_vi1_handler" != yes &&
-   test "$ace_cv_lib_struct_sigaction_vv1_handler" != yes &&
-   test "$ace_cv_lib_struct_sigaction_vi1a2_handler" != yes &&
-   test "$ace_cv_lib_struct_sigaction_va1_handler" = yes; then
-  cat >> confdefs.h <<\EOF
-#define ACE_HAS_UNIXWARE_SVR4_SIGNAL_T 1
-EOF
-
-fi 
-
-
-
-
-
-case "$target" in
-  *aix3*)
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-EOF
-
-    ;;
-  *aix4.1*)
-    cat >> confdefs.h <<\EOF
-#define AIX 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_AIX_BROKEN_SOCKET_HEADER 1
-EOF
-
-    ;;
-  *aix4.2*)
-    cat >> confdefs.h <<\EOF
-#define AIX 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_TLI_TCP_DEVICE "/dev/xti/tcp"
-EOF
-
-    ;;
-  *cray*)
-    ;;
-  *dgux4.11*)
-    cat >> confdefs.h <<\EOF
-#define ACE_DGUX 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define IP_ADD_MEMBERSHIP 0x13
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define IP_DROP_MEMBERSHIP 0x14
-EOF
-
-    ;;
-  *dgux4*)
-    cat >> confdefs.h <<\EOF
-#define ACE_DGUX 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define IP_ADD_MEMBERSHIP 0x13
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define IP_DROP_MEMBERSHIP 0x14
-EOF
-
-    ;;
-  *freebsd*)
-    ;;
-  *fsu*)
-    cat >> confdefs.h <<\EOF
-#define PTHREAD_STACK_MIN (1024*10)
-EOF
-
-    ;;
-  *hpux9*)
-    cat >> confdefs.h <<\EOF
-#define HPUX 1
-EOF
-
-    ;;
-  *hpux10*)
-    cat >> confdefs.h <<\EOF
-#define HPUX 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define HPUX_10 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_TLI_TCP_DEVICE "/dev/inet_cots"
-EOF
-
-    ;;
-  *hpux11*)
-    cat >> confdefs.h <<\EOF
-#define HPUX 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define HPUX_11 1
-EOF
-
-    cat > conftest.$ac_ext <<EOF
-#line 30272 "configure"
-#include "confdefs.h"
-
-#ifdef __LP64__
-          ACE_ON_64BIT_HP
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_ON_64BIT_HP" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-       cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000001100000000)
-EOF
-
-       cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_BASE_ADDRL ((char *) 0x0000001100000000)
-EOF
-
-      
-else
-  rm -rf conftest*
-  
-       cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-EOF
-
-      
-fi
-rm -f conftest*
-
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    ;;
-  *irix5.2*)
-    cat >> confdefs.h <<\EOF
-#define IRIX5 1
-EOF
-
-    ;;
-  *irix5.3*)
-    cat >> confdefs.h <<\EOF
-#define IRIX5 1
-EOF
-
-    ;;
-  *irix6*)
-    cat >> confdefs.h <<\EOF
-#define IRIX6 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_IRIX62_THREADS 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_BASE_ADDR ((char *) (1024U * 1024 * 1024))
-EOF
-
-    if test "$ace_user_enable_threads" = yes; then
-      cat >> confdefs.h <<\EOF
-#define ACE_HAS_IRIX62_THREADS 1
-EOF
-
-    fi
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    ;;
-  *linux*)
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65535
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_SELECT_REACTOR_SIZE 256
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_BIG_FD_SET 1
-EOF
-     cat >> confdefs.h <<\EOF
-#define ACE_UINT64_FORMAT_SPECIFIER "%Lu"
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    ;;
-  *lynxos*)
-    cat >> confdefs.h <<\EOF
-#define ACE_MALLOC_ALIGN 8
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_MAP_PRIVATE ACE_MAP_SHARED
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_USE_RCSID 0
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_LYNXOS_SIGNALS 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    ;;
-  *m88k*)
-    cat >> confdefs.h <<\EOF
-#define m88k 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define __m88k__ 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define IP_ADD_MEMBERSHIP 0x13
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define IP_DROP_MEMBERSHIP 0x14
-EOF
-
-    ;;
-  *mvs*)
-    ;;
-  *netbsd*)
-    cat >> confdefs.h <<\EOF
-#define ACE_NETBSD 1
-EOF
-
-    ;;
-  *osf3.2*)
-    cat > conftest.$ac_ext <<EOF
-#line 30420 "configure"
-#include "confdefs.h"
-
-#if defined(__DECCXX)
-          ACE_DEC_CXX
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_DEC_CXX" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-       cat >> confdefs.h <<\EOF
-#define DEC_CXX 1
-EOF
-
-      
-fi
-rm -f conftest*
-
-    ;;
-  *osf4.0*)
-    cat > conftest.$ac_ext <<EOF
-#line 30443 "configure"
-#include "confdefs.h"
-
-#if defined(__DECCXX)
-          ACE_DEC_CXX
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_DEC_CXX" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-       cat >> confdefs.h <<\EOF
-#define DEC_CXX 1
-EOF
-
-      
-fi
-rm -f conftest*
-
-    cat > conftest.$ac_ext <<EOF
-#line 30464 "configure"
-#include "confdefs.h"
-
-       /* Include unistd.h to define _POSIX_C_SOURCE. */
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-
-#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 199506L)
-          ACE_ON_DEC_WITH_POS_SRC
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_ON_DEC_WITH_POS_SRC" >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-       cat >> confdefs.h <<\EOF
-#define DIGITAL_UNIX 1
-EOF
-
-      
-fi
-rm -f conftest*
-
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_NEEDS_HUGE_THREAD_STACKSIZE (1024 * 1024)
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    ;;
-  *psos*)
-    cat >> confdefs.h <<\EOF
-#define ACE_PSOS 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_PSOSIM 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_PSOSTBD 1
-EOF
-
-        cat > conftest.$ac_ext <<EOF
-#line 30516 "configure"
-#include "confdefs.h"
-
-#if defined (ACE_HAS_TSS_EMULATION)
-         ACE_TSS_EMULATION
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_TSS_EMULATION" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_THREAD_KEYS 256
-EOF
-
-fi
-rm -f conftest*
-
-    cat >> confdefs.h <<\EOF
-#define ACE_MAIN extern "C" void root
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_MALLOC_ALIGN 8
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_USE_RCSID 0
-EOF
-
-    ;;
-  *sco4.2*)
-    cat >> confdefs.h <<\EOF
-#define SCO 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0
-EOF
-
-    ;;
-  *sco5*)
-    cat >> confdefs.h <<\EOF
-#define SCO 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_BIG_FD_SET 1
-EOF
-     ;;
-  *sunos4*)
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    ;;
-  *solaris2.4*)
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_NEEDS_LWP_PRIO_SET 1
-EOF
-
-    ;;
-  *solaris2.5*)
-    cat >> confdefs.h <<\EOF
-#define ACE_MALLOC_ALIGN 8
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_NEEDS_LWP_PRIO_SET 1
-EOF
-
-    ;;
-  *solaris2.6*)
-    cat >> confdefs.h <<\EOF
-#define ACE_MALLOC_ALIGN 8
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_NEEDS_LWP_PRIO_SET 1
-EOF
-
-    ;;
-  *solaris2.7*)
-    cat >> confdefs.h <<\EOF
-#define ACE_MALLOC_ALIGN 8
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_NEEDS_LWP_PRIO_SET 1
-EOF
-
-    ;;
-  *86*solaris*)
-    cat >> confdefs.h <<\EOF
-#define ACE_HAS_X86_STAT_MACROS 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_NEEDS_LWP_PRIO_SET 1
-EOF
-
-    ;;
-  *tandem*)
-    cat >> confdefs.h <<\EOF
-#define ACE_TIMER_SKEW (1000 * 10)
-EOF
-
-    ;;
-  *unixware2.0*)
-    cat >> confdefs.h <<\EOF
-#define UNIXWARE 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define UNIXWARE_2_0 1
-EOF
-
-    ;;
-  *unixware2.1*)
-    cat >> confdefs.h <<\EOF
-#define UNIXWARE 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define UNIXWARE_2_1 1
-EOF
-
-    ;;
-  *vxworks*)
-    cat >> confdefs.h <<\EOF
-#define VXWORKS 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_MAIN ace_main
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768
-EOF
-
-        cat > conftest.$ac_ext <<EOF
-#line 30682 "configure"
-#include "confdefs.h"
-
-#if defined (ACE_HAS_TSS_EMULATION)
-         ACE_TSS_EMULATION
-#endif
-      
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ACE_TSS_EMULATION" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define ACE_DEFAULT_THREAD_KEYS 16
-EOF
-
-fi
-rm -f conftest*
-
-    cat >> confdefs.h <<\EOF
-#define ACE_THR_PRI_FIFO_DEF 101
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_USE_RCSID 0
-EOF
-
-    ;;
-  *cygwin32*)
-    ;;
-  *win32*)
-    cat >> confdefs.h <<\EOF
-#define ACE_WIN32 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define ACE_UINT64_FORMAT_SPECIFIER "%I64u"
-EOF
-
-    if test "$ace_u_long_long_typedef_set" != yes; then
-      ACE_UINT64="unsigned __int64"
-      ace_u_long_long_typedef_set=yes
-    fi      ;;
-  *)
-    ;;
-esac
-
-
-
-if test "$ace_u_long_long_typedef_set" = yes; then
-  cat >> confdefs.h <<EOF
-#define ACE_UINT64_TYPEDEF $ACE_UINT64
-EOF
-
-fi
-
-
-if test -n "$GXX"; then
-  ACE_CXXFLAGS="$ACE_CXXFLAGS -Wall -Wpointer-arith"
-  if test "$ace_user_enable_repo" = no; then
-    ACE_CXXFLAGS="$ACE_CXXFLAGS -fno-implicit-templates"
-  fi
-fi
-
-if test -n "$GCC"; then
-  ACE_CFLAGS="$ACE_CFLAGS -Wall -Wpointer-arith"
-fi
-
-if test "$ace_user_enable_optimize"; then
-      CXXFLAGS="$CXXFLAGS $OCXXFLAGS" 
-  CFLAGS="$CFLAGS $OCFLAGS"
-fi
-CXXFLAGS="$ACE_CXXFLAGS $X_CFLAGS $CXXFLAGS"
-CFLAGS="$ACE_CFLAGS $X_CFLAGS $CFLAGS"
-CPPFLAGS="$ACE_CPPFLAGS $CPPFLAGS"
-LDFLAGS="$ACE_LDFLAGS $LDFLAGS"
-
-
-
-  echo $ac_n "checking for ACE iostream support""... $ac_c" 1>&6
-echo "configure:30761: checking for ACE iostream support" >&5
-  if eval "test \"`echo '$''{'ace_cv_feature_ace_iostream'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-         
- if test -f ${srcdir}/ace/config.h; then
-   mv ${srcdir}/ace/config.h ${srcdir}/ace/config.h.conf
- fi
-
- touch ${srcdir}/ace/config.h
-
- 
-            
- ace_pre_try_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
-
- ace_pre_try_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I. -I${srcdir}"
-
- cat > conftest.$ac_ext <<EOF
-#line 30782 "configure"
-#include "confdefs.h"
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
-#include "ace/IOStream.cpp"
-        
-int main() {
-int a=0; a += 1;
-        
-; return 0; }
-EOF
-if { (eval echo configure:30795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_feature_ace_iostream=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ace_cv_feature_ace_iostream=no
-        
-fi
-rm -f conftest*
-
-  CXXFLAGS="$ace_pre_try_CXXFLAGS"
- CFLAGS="$ace_pre_try_CFLAGS"
-
-
-     
-
- if test -f ${srcdir}/ace/config.h.conf; then
-   mv ${srcdir}/ace/config.h.conf ${srcdir}/ace/config.h
- else
-   rm ${srcdir}/ace/config.h
- fi
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_feature_ace_iostream" 1>&6
-  if test "$ace_cv_feature_ace_iostream" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_LACKS_ACE_IOSTREAM 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking if ACE needs minimum iostream header inclusion""... $ac_c" 1>&6
-echo "configure:30839: checking if ACE needs minimum iostream header inclusion" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_minimum_iostream'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-         
- if test -f ${srcdir}/ace/config.h; then
-   mv ${srcdir}/ace/config.h ${srcdir}/ace/config.h.conf
- fi
-
- touch ${srcdir}/ace/config.h
-
- 
-            
- ace_pre_try_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
-
- ace_pre_try_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I. -I${srcdir}"
-
- cat > conftest.$ac_ext <<EOF
-#line 30860 "configure"
-#include "confdefs.h"
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
-#include "ace/OS.cpp"
-        
-int main() {
-int a=0; a += 1;
-        
-; return 0; }
-EOF
-if { (eval echo configure:30873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_lib_minimum_iostream=no
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-                    
- ace_pre_try_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
-
- ace_pre_try_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I. -I${srcdir}"
-
- cat > conftest.$ac_ext <<EOF
-#line 30889 "configure"
-#include "confdefs.h"
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
-#define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
-#include "ace/OS.cpp"
-           
-int main() {
-int a=0; a += 1;
-           
-; return 0; }
-EOF
-if { (eval echo configure:30903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_lib_minimum_iostream=yes
-           
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-              ace_cv_lib_minimum_iostream=no
-           
-fi
-rm -f conftest*
-
-  CXXFLAGS="$ace_pre_try_CXXFLAGS"
- CFLAGS="$ace_pre_try_CFLAGS"
-
-
-        
-fi
-rm -f conftest*
-
-  CXXFLAGS="$ace_pre_try_CXXFLAGS"
- CFLAGS="$ace_pre_try_CFLAGS"
-
-
-     
-
- if test -f ${srcdir}/ace/config.h.conf; then
-   mv ${srcdir}/ace/config.h.conf ${srcdir}/ace/config.h
- else
-   rm ${srcdir}/ace/config.h
- fi
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_minimum_iostream" 1>&6
-  if test "$ace_cv_lib_minimum_iostream" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-  echo $ac_n "checking for ACE_addr::sap_any support""... $ac_c" 1>&6
-echo "configure:30954: checking for ACE_addr::sap_any support" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_sap_any_support'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-         
- if test -f ${srcdir}/ace/config.h; then
-   mv ${srcdir}/ace/config.h ${srcdir}/ace/config.h.conf
- fi
-
- touch ${srcdir}/ace/config.h
-
- 
-            
- ace_pre_try_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
-
- ace_pre_try_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I. -I${srcdir}"
-
- cat > conftest.$ac_ext <<EOF
-#line 30975 "configure"
-#include "confdefs.h"
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
-#include "ace/Addr.cpp"
-        
-int main() {
-int a=0; a += 1;
-        
-; return 0; }
-EOF
-if { (eval echo configure:30988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_lib_sap_any_support=yes
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-                    
- ace_pre_try_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
-
- ace_pre_try_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I. -I${srcdir}"
-
- cat > conftest.$ac_ext <<EOF
-#line 31004 "configure"
-#include "confdefs.h"
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
-#define ACE_HAS_BROKEN_SAP_ANY
-#include "ace/Addr.cpp"
-           
-int main() {
-int a=0; a += 1;
-           
-; return 0; }
-EOF
-if { (eval echo configure:31018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_lib_sap_any_support=no
-           
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-              ace_cv_lib_sap_any_support=yes
-          
-fi
-rm -f conftest*
-
-  CXXFLAGS="$ace_pre_try_CXXFLAGS"
- CFLAGS="$ace_pre_try_CFLAGS"
-
-
-        
-fi
-rm -f conftest*
-
-  CXXFLAGS="$ace_pre_try_CXXFLAGS"
- CFLAGS="$ace_pre_try_CFLAGS"
-
-
-     
-
- if test -f ${srcdir}/ace/config.h.conf; then
-   mv ${srcdir}/ace/config.h.conf ${srcdir}/ace/config.h
- else
-   rm ${srcdir}/ace/config.h
- fi
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_sap_any_support" 1>&6
-  if test "$ace_cv_lib_sap_any_support" != no; then
-    ace_just_a_place_holder=fixme
-:
-  else
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_HAS_BROKEN_SAP_ANY 1
-EOF
-
-
-  fi
-
-
-
-  echo $ac_n "checking if ACE needs conversion to pass ACE_TTY_IO to DEV_Connector""... $ac_c" 1>&6
-echo "configure:31070: checking if ACE needs conversion to pass ACE_TTY_IO to DEV_Connector" >&5
-  if eval "test \"`echo '$''{'ace_cv_lib_need_dev_io_conv'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-         
- if test -f ${srcdir}/ace/config.h; then
-   mv ${srcdir}/ace/config.h ${srcdir}/ace/config.h.conf
- fi
-
- touch ${srcdir}/ace/config.h
-
- 
-            
- ace_pre_try_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
-
- ace_pre_try_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I. -I${srcdir}"
-
- cat > conftest.$ac_ext <<EOF
-#line 31091 "configure"
-#include "confdefs.h"
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
-#include "ace/OS.cpp"
-        
-int main() {
-int a=0; a += 1;
-        
-; return 0; }
-EOF
-if { (eval echo configure:31104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_lib_need_dev_io_conv=no
-        
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-                    
- ace_pre_try_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
-
- ace_pre_try_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I. -I${srcdir}"
-
- cat > conftest.$ac_ext <<EOF
-#line 31120 "configure"
-#include "confdefs.h"
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
-#define ACE_NEEDS_DEV_IO_CONVERSION
-#include "ace/DEV_Connector.cpp"
-           
-int main() {
-int a=0; a += 1;
-           
-; return 0; }
-EOF
-if { (eval echo configure:31134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ace_cv_lib_need_dev_io_conv=yes
-           
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-              ace_cv_lib_need_dev_io_conv=no
-           
-fi
-rm -f conftest*
-
-  CXXFLAGS="$ace_pre_try_CXXFLAGS"
- CFLAGS="$ace_pre_try_CFLAGS"
-
-
-        
-fi
-rm -f conftest*
-
-  CXXFLAGS="$ace_pre_try_CXXFLAGS"
- CFLAGS="$ace_pre_try_CFLAGS"
-
-
-     
-
- if test -f ${srcdir}/ace/config.h.conf; then
-   mv ${srcdir}/ace/config.h.conf ${srcdir}/ace/config.h
- else
-   rm ${srcdir}/ace/config.h
- fi
-
-  
-fi
-
-  echo "$ac_t""$ace_cv_lib_need_dev_io_conv" 1>&6
-  if test "$ace_cv_lib_need_dev_io_conv" != no; then
-    ace_just_a_place_holder=fixme
-cat >> confdefs.h <<\EOF
-#define ACE_NEEDS_DEV_IO_CONVERSION 1
-EOF
-
-  else
-    ace_just_a_place_holder=fixme
-
-  fi
-
-
-
-
-
-LD="$PURELINK $PRELINK $LD"
-
-
-if test "$no_x" != yes; then
-  ACE_LIBDIR="${X_LIBS} -L\${libdir}"
-else
-  ACE_LIBDIR='-L${libdir}'
-fi
-ACE_LIBS="${X_PRE_LIBS} ${ACE_XLIBS} ${X_EXTRA_LIBS} ${LIBS}"
-ACE_INCLUDEDIR='-I${includedir}'
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "
-           Makefile
-           ace-config
-           ace-diff-config
-           ace/Makefile
-           apps/Makefile
-           apps/gperf/Makefile
-           apps/gperf/src/Makefile
-           man/Makefile
-           man/man3/Makefile
-           netsvcs/Makefile
-           netsvcs/clients/Makefile
-           netsvcs/clients/Logger/Makefile
-           netsvcs/clients/Naming/Makefile
-           netsvcs/clients/Naming/Client/Makefile
-           netsvcs/clients/Naming/Dump_Restore/Makefile
-           netsvcs/clients/Tokens/Makefile
-           netsvcs/clients/Tokens/collection/Makefile
-           netsvcs/clients/Tokens/deadlock/Makefile
-           netsvcs/clients/Tokens/invariant/Makefile
-           netsvcs/clients/Tokens/manual/Makefile
-           netsvcs/clients/Tokens/mutex/Makefile
-           netsvcs/clients/Tokens/rw_lock/Makefile
-           netsvcs/lib/Makefile
-           netsvcs/servers/Makefile
-           tests/Makefile
-           ace/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@CPP@%$CPP%g
-s%@CXX@%$CXX%g
-s%@CXXCPP@%$CXXCPP%g
-s%@ACE_CROSS_COMPILED_TRUE@%$ACE_CROSS_COMPILED_TRUE%g
-s%@ACE_CROSS_COMPILED_FALSE@%$ACE_CROSS_COMPILED_FALSE%g
-s%@AWK@%$AWK%g
-s%@ACE_CURRENT@%$ACE_CURRENT%g
-s%@ACE_AGE@%$ACE_AGE%g
-s%@ACE_REVISION@%$ACE_REVISION%g
-s%@LN_S@%$LN_S%g
-s%@LEX@%$LEX%g
-s%@LEXLIB@%$LEXLIB%g
-s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g
-s%@YACC@%$YACC%g
-s%@GPERF@%$GPERF%g
-s%@PROF@%$PROF%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@BUILD_OS_FILES_TRUE@%$BUILD_OS_FILES_TRUE%g
-s%@BUILD_OS_FILES_FALSE@%$BUILD_OS_FILES_FALSE%g
-s%@BUILD_UTILS_FILES_TRUE@%$BUILD_UTILS_FILES_TRUE%g
-s%@BUILD_UTILS_FILES_FALSE@%$BUILD_UTILS_FILES_FALSE%g
-s%@BUILD_LOGGING_FILES_TRUE@%$BUILD_LOGGING_FILES_TRUE%g
-s%@BUILD_LOGGING_FILES_FALSE@%$BUILD_LOGGING_FILES_FALSE%g
-s%@BUILD_THREADS_FILES_TRUE@%$BUILD_THREADS_FILES_TRUE%g
-s%@BUILD_THREADS_FILES_FALSE@%$BUILD_THREADS_FILES_FALSE%g
-s%@BUILD_DEMUX_FILES_TRUE@%$BUILD_DEMUX_FILES_TRUE%g
-s%@BUILD_DEMUX_FILES_FALSE@%$BUILD_DEMUX_FILES_FALSE%g
-s%@BUILD_CONNECTION_FILES_TRUE@%$BUILD_CONNECTION_FILES_TRUE%g
-s%@BUILD_CONNECTION_FILES_FALSE@%$BUILD_CONNECTION_FILES_FALSE%g
-s%@BUILD_SOCKETS_FILES_TRUE@%$BUILD_SOCKETS_FILES_TRUE%g
-s%@BUILD_SOCKETS_FILES_FALSE@%$BUILD_SOCKETS_FILES_FALSE%g
-s%@BUILD_IPC_FILES_TRUE@%$BUILD_IPC_FILES_TRUE%g
-s%@BUILD_IPC_FILES_FALSE@%$BUILD_IPC_FILES_FALSE%g
-s%@BUILD_SVCCONF_FILES_TRUE@%$BUILD_SVCCONF_FILES_TRUE%g
-s%@BUILD_SVCCONF_FILES_FALSE@%$BUILD_SVCCONF_FILES_FALSE%g
-s%@BUILD_STREAMS_FILES_TRUE@%$BUILD_STREAMS_FILES_TRUE%g
-s%@BUILD_STREAMS_FILES_FALSE@%$BUILD_STREAMS_FILES_FALSE%g
-s%@BUILD_MEMORY_FILES_TRUE@%$BUILD_MEMORY_FILES_TRUE%g
-s%@BUILD_MEMORY_FILES_FALSE@%$BUILD_MEMORY_FILES_FALSE%g
-s%@BUILD_TOKEN_FILES_TRUE@%$BUILD_TOKEN_FILES_TRUE%g
-s%@BUILD_TOKEN_FILES_FALSE@%$BUILD_TOKEN_FILES_FALSE%g
-s%@BUILD_OTHER_FILES_TRUE@%$BUILD_OTHER_FILES_TRUE%g
-s%@BUILD_OTHER_FILES_FALSE@%$BUILD_OTHER_FILES_FALSE%g
-s%@BUILD_FULL_LIBRARY_TRUE@%$BUILD_FULL_LIBRARY_TRUE%g
-s%@BUILD_FULL_LIBRARY_FALSE@%$BUILD_FULL_LIBRARY_FALSE%g
-s%@PURIFY@%$PURIFY%g
-s%@QUANTIFY@%$QUANTIFY%g
-s%@X_CFLAGS@%$X_CFLAGS%g
-s%@X_PRE_LIBS@%$X_PRE_LIBS%g
-s%@X_LIBS@%$X_LIBS%g
-s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-s%@COMPILE_GPERF_TRUE@%$COMPILE_GPERF_TRUE%g
-s%@COMPILE_GPERF_FALSE@%$COMPILE_GPERF_FALSE%g
-s%@XTREACTOR_TEST_XLIBS@%$XTREACTOR_TEST_XLIBS%g
-s%@COMPILE_XTREACTOR_TEST_TRUE@%$COMPILE_XTREACTOR_TEST_TRUE%g
-s%@COMPILE_XTREACTOR_TEST_FALSE@%$COMPILE_XTREACTOR_TEST_FALSE%g
-s%@RANLIB@%$RANLIB%g
-s%@LD@%$LD%g
-s%@NM@%$NM%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@ALLOCA@%$ALLOCA%g
-s%@ACE_ON_PENTIUM_TRUE@%$ACE_ON_PENTIUM_TRUE%g
-s%@ACE_ON_PENTIUM_FALSE@%$ACE_ON_PENTIUM_FALSE%g
-s%@ACE_XLIBS@%$ACE_XLIBS%g
-s%@ACE_LIBDIR@%$ACE_LIBDIR%g
-s%@ACE_LIBS@%$ACE_LIBS%g
-s%@ACE_INCLUDEDIR@%$ACE_INCLUDEDIR%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile
-           ace-config
-           ace-diff-config
-           ace/Makefile
-           apps/Makefile
-           apps/gperf/Makefile
-           apps/gperf/src/Makefile
-           man/Makefile
-           man/man3/Makefile
-           netsvcs/Makefile
-           netsvcs/clients/Makefile
-           netsvcs/clients/Logger/Makefile
-           netsvcs/clients/Naming/Makefile
-           netsvcs/clients/Naming/Client/Makefile
-           netsvcs/clients/Naming/Dump_Restore/Makefile
-           netsvcs/clients/Tokens/Makefile
-           netsvcs/clients/Tokens/collection/Makefile
-           netsvcs/clients/Tokens/deadlock/Makefile
-           netsvcs/clients/Tokens/invariant/Makefile
-           netsvcs/clients/Tokens/manual/Makefile
-           netsvcs/clients/Tokens/mutex/Makefile
-           netsvcs/clients/Tokens/rw_lock/Makefile
-           netsvcs/lib/Makefile
-           netsvcs/servers/Makefile
-           tests/Makefile
-          "}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="ace/config.h"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
-rm -f conftest.tail
-while :
-do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > ace/stamp-h
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-
-chmod 755 ace-diff-config
-
-echo ""
-echo "Configuration of ACE is now complete."
-echo ""
diff --git a/configure.in b/configure.in
index 405a4dd57e9..02b6b27f610 100644
--- a/configure.in
+++ b/configure.in
@@ -63,7 +63,7 @@ changequote(, )dnl
 ACE_VERSION=`head -1 ${srcdir}/VERSION | sed 's/.*version \([0-9.]*\).*/\1/'`
 changequote([, ])dnl
 
-AM_INIT_AUTOMAKE("$PACKAGE", "$ACE_VERSION", DUMMY)
+AM_INIT_AUTOMAKE("$PACKAGE", "$ACE_VERSION", )
 
 dnl Generate a header file with all settings.
 AM_CONFIG_HEADER(ace/config.h)
@@ -2511,28 +2511,13 @@ if test "$ac_cv_header_new" = yes &&
      AC_TRY_COMPILE(
        [
 #include <memory>
-
-        template <class T>
-        class Foo
-        {
-        public:
-          Foo (void);
-          ~Foo (void);
-
-          T* bar (void) const { return this->bar_; }
-        private:
-          T* bar_;
-        };
        ],
        [
-        Foo<int *> Baz = 0;
-
 #ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
-        std::auto_ptr<Foo<int *> > Foobar;
+        std::auto_ptr<int> Foo;
 #else
-        auto_ptr<Foo<int *> > Foobar;
+        auto_ptr<int> Foo;
 #endif
-        Foobar = Baz;
        ],
        [
         ace_cv_lib_auto_ptr_class=yes
@@ -2543,10 +2528,7 @@ if test "$ac_cv_header_new" = yes &&
     ],
     [
      AC_DEFINE(ACE_HAS_STANDARD_CPP_LIBRARY)
-    ],
-    [
-     AC_DEFINE(ACE_LACKS_AUTO_PTR)
-    ])
+    ],)
 fi
 
 dnl Check for ANSI C++ cast support
diff --git a/docs/ACE-development-process.html b/docs/ACE-development-process.html
deleted file mode 100644
index e6b0fc52503..00000000000
--- a/docs/ACE-development-process.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!-- $Id$ -->
-
-<html>
-  <head>
-    <title>ACE Development Process</title>
-    <link rev=made href="mailto:levine@cs.wustl.edu">
-  </head>
-
-<body text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#ffffff">
-
-<hr>
-<h3>The ACE Development Process</h3>
-
-<hr><p>
-  <font size=-1>
-    Last modified <!--#echo var="LAST_MODIFIED" -->.<p>
-  </font>
-
-In order to improve the quality of our software and minimize
-development effort, we'll try to follow a more structured development
-process.  It is described below.<p>
-
-An important concept to keep in mind is <em>risk</em>.  Before you
-commit <em>any</em> change to ACE+TAO, please consider the effects
-that it will have.  Could it possibly cause a build failure, on any
-platform?  Could it possibly cause different run-time behavior?  And
-so on.  If so, it is your responsibility to adequately build and test
-with the change, in order to verify that it has no unintended
-effects.<p>
-
-Please keep in mind the cost of committing a mistake.  It may take you
-only a few seconds to fix, but its cost to the group may be much
-larger.  With this large a group, workspace updates and builds are
-likely to happen at any time.  If one break, it can take hours to
-rebuild it.  And each developer that was waiting for a successful
-build would be blocked for the duration of the broken build, the fix,
-and the rebuild.<p>
-
-A good development process looks like:<p>
-<ol>
-  <li>Every change to ACE+TAO must have a bug report.  <em>Change</em>
-    includes fixes, enhancements, updates, and so on.<p>
-  <!-- The link to bugzilla is intentionally local. -->
-  <li><a href="http://ace/bugzilla">Create a bug report</a>.<p>
-  <li>Accept the bug report if you are going to implement the change.<p>
-  <li>Implement the change in your workspace(s).<p>
-  <li>Test the change sufficiently to demonstrate that it both does
-    what is intended, and doesn't break anything.  The test may be
-    as simple as building and running the ACE tests on one plaform.
-    Or as complicated as rebuilding and test all of ACE and TAO on
-    all platforms that we have.<p>
-  <li>Create an appropriate ChangeLog entry.<p>
-  <li>Commit the change using a ChangeLogTag commit message.<p>
-  <li>Respond to the requestor of the change, if any.  Please do this
-    <em>after</em> committing your change.<p>
-  <li>Make sure that the requestor is listed in the THANKS file.<p>
-  <li>Update the bug report to indicate resolution.<p>
-  <li>Monitor the next round of build/tests for problems with your change.<p>
-  <li>Respond immediately to reports of problems with your changes.<p>
-</ol>
-
-<p><hr>
-
-A bug should typically follow this life cycle:<p>
-<center><table cellpadding=5 border=0>
-<tr>
-  <td>Submitter:</td>
-  <td>Enters problem</td>
-<tr>
-  <td>Bugmaster:</td>
-  <td>Assigns</td>
-<tr>
-  <td>Owner:</td>
-  <td>Accepts</td>
-<tr>
-  <td>Owner:</td>
-  <td>Reproduces problem - if it needs a new test, write it and
-      put it in the regression tests.
-      If it can't be reproduced, set to Resolved/CANT_FIND.<br>
-      If it's a duplicate, set it to Resolved/DUPLICATE.
-      Fix code, commit changes, set to Resolved.</td>
-<tr>
-  <td>Submitter:</td>
-  <td>Tests it again; set to Verified (pass) or Reopened (fail)</td>
-<tr>
-  <td>Owner:</td>
-  <td>After next release is done, re-test; sets to Closed or Reopened.</td>
-</table></center>
-
-
-<p><hr>
-
-At all times, we'll have a build master.  (The role may be shared by
-multiple people.)  The build master is responsible for ensuring that
-the next kits are clean, <em>i.e.</em>, it builds and runs cleanly on
-all platforms.<p>
-
-The build master:<p>
-<ul>
-  <li>Reminds people to check build logs.  Developers are still
-    responsible for verifying that their changes are clean.<p>
-  <li>Freezes the CVS repository when it's decided to no more
-    non-critical changes will be accepted for the next kits.
-    The build master has the final say over when the freeze is
-    implemented.  The tendency to implement a freeze sooner than
-    later is intentional, desirable, beneficial, and the right thing
-    to do.<p>
-  <li>Verifies that the final round of builds/tests are clean.<p>
-  <li>Creates the kits.<p>
-  <li>Unfreezes the CVS repository.<p>
-  <li>Sends email to appropriate news groups announcing the new kits.<p>
-  <li>Passes the mantle on to the next build master.<p>
-</ul>
-
-If another developer interferes with the build master's duties,
-the build master has the unilateral authority to pass the mantle
-to the violater.  This is intentional, desirable, beneficial, and
-the right thing to do.<p>
-
-</body>
-</html>
diff --git a/docs/ACE-guidelines.html b/docs/ACE-guidelines.html
index 10ef969d160..1d3e1df3c5e 100644
--- a/docs/ACE-guidelines.html
+++ b/docs/ACE-guidelines.html
@@ -607,7 +607,7 @@ bgcolor="#ffffff">
   <li><strong>I/O</strong><p>
   <ul>
      <li>Use <strong><code>ACE_DEBUG</code></strong> for printouts,
-         and <strong><code>ACE_OS::fprintf ()</code></strong> for
+         and <strong><code>ACE_OS::scanf/fprintf ()</code></strong> for
          file I/O.  Avoid using iostreams because of implementation
          differences across platforms.<p>
      <li>After attempting to open an existing file, always check for success.
@@ -646,26 +646,6 @@ bgcolor="#ffffff">
         in most of their APIs.  On these platforms, ACE also uses
         UNICODE as its system string type.<p>
 
-        Notice that when spaning a string literal across several lines,
-        you must apply <code>ASYS_TEXT</code> to <strong>every</strong>
-        line.  For example, it is <font color=red>illegal</font> to do this:
-        <pre>
-        ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("%p\n"),
-                    ASYS_TEXT ("\nerror: x is a null pointer in "
-                               "ACE_RB_Tree&lt;EXT_ID, INT_ID&gt;::"
-                               "RB_rotate_left\n")));
-        </pre></p>
-
-        <p>Instead, this should be written like this:
-        <pre>
-        ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("%p\n"),
-                    ASYS_TEXT ("\nerror: x is a null pointer in ")
-                    ASYS_TEXT ("ACE_RB_Tree&lt;EXT_ID, INT_ID&gt;::")
-                    ASYS_TEXT ("RB_rotate_left\n")));
-        </pre></p>
-
     <li><strong><code>ACE_TRACE</code></strong> handles conversion
         between char strings and UNICODE strings automatically.<p>
 
@@ -762,8 +742,7 @@ bgcolor="#ffffff">
           ~exe_foo ()
             { cerr &lt;&lt; "destructor of exception called" &lt;&lt; endl; }
           exe_foo (const exe_foo& foo) : data_ (foo.data_)
-            { cerr &lt;&lt; "copy constructor of exception called"
-                   &lt;&lt; endl; }
+            { cerr &lt;&lt; "copy constructor of exception called" &lt;&lt; endl; }
           int data_;
         };
 
@@ -783,52 +762,44 @@ bgcolor="#ffffff">
 
         int main ()
         {
-          cout &lt;&lt; endl &lt;&lt; "First exception" &lt;&lt; endl
-               &lt;&lt; endl;
+          cout &lt;&lt; endl &lt;&lt; "First exception" &lt;&lt; endl &lt;&lt; endl;
           try
             {
               good (0);
             }
           catch (exe_foo &foo)
             {
-              cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_
-                   &lt;&lt; endl;
+              cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_ &lt;&lt; endl;
             }
 
-          cout &lt;&lt; endl &lt;&lt; "Second exception" &lt;&lt; endl
-               &lt;&lt; endl;
+          cout &lt;&lt; endl &lt;&lt; "Second exception" &lt;&lt; endl &lt;&lt; endl;
           try
             {
               good (0);
             }
           catch (exe_foo foo)
             {
-              cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_
-                   &lt;&lt; endl;
+              cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_ &lt;&lt; endl;
             }
 
-          cout &lt;&lt; endl &lt;&lt; "Third exception" &lt;&lt; endl
-               &lt;&lt; endl;
+          cout &lt;&lt; endl &lt;&lt; "Third exception" &lt;&lt; endl &lt;&lt; endl;
           try
             {
               bad (1);
             }
           catch (exe_foo &foo)
             {
-              cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_
-                   &lt;&lt; endl;
+              cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_ &lt;&lt; endl;
             }
 
-          cout &lt;&lt; endl &lt;&lt; "Fourth exception" &lt;&lt; endl
-               &lt;&lt; endl;
+          cout &lt;&lt; endl &lt;&lt; "Fourth exception" &lt;&lt; endl &lt;&lt; endl;
           try
             {
               bad (1);
             }
           catch (exe_foo foo)
             {
-              cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_
-                   &lt;&lt; endl;
+              cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_ &lt;&lt; endl;
             }
 
           return 0;
@@ -1006,7 +977,8 @@ bgcolor="#ffffff">
   <ol>
     <li>Test your change on at least one platform.  All changes
       <strong>must</strong> be tested with egcs before commiting.
-      That means you may need to test on at least two platforms.<p>
+      That means you may need to test on two platforms.<p>
+    <li>Commit your change with a meaningful message.<p>
     <li>An an entry to the appropriate ChangeLog.  TAO and some
       ACE subdirectories, such as <a href="../ASNMP">ASNMP</a>,
       <a href="../apps/JAWS">JAWS</a>, and
@@ -1014,11 +986,6 @@ bgcolor="#ffffff">
       own ChangeLogs.  If you don't use one of those, use the
       <a href="../ChangeLog">ChangeLog</a> in the top-level
       <a href="..">ACE_wrappers</a> directory.<p>
-    <li>Commit your change using a message of this form:<p>
-<code>
-ChangeLogTag: Thu Jul 22 09:55:10 1999  David L. Levine
- &lt;levine@cs.wustl.edu&gt;
-</code><p>
     <li>If the change is in response to a request by someone else:
     <ol>
       <li>Make sure that person is acknowledged in
@@ -1038,9 +1005,7 @@ ChangeLogTag: Thu Jul 22 09:55:10 1999  David L. Levine
   Usage Guidelines</h3>
 <ul>
   <li>Always make sure that a change builds and executes correctly
-    on at least one platform before checking it into the CVS repository.
-    All changes <strong>must</strong> be tested with egcs before commiting.
-    That means you may need to test on at least two platforms.<p>
+      on at least one platform before checking it into the CVS repository.<p>
 </ul>
 
 
@@ -1058,9 +1023,9 @@ ChangeLogTag: Thu Jul 22 09:55:10 1999  David L. Levine
     the following code at the top of the script to pick up
     perl from the users <code>PATH</code>:<br>
       <pre>
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
+eval '(exit $?0)' &&
+     eval 'exec perl -S $0 ${1+"$@"}' &
+     eval 'exec perl -S $0 $argv:q' if 0;
       </pre><p>
 
   <li>Never, never, never start the first line of a script
diff --git a/etc/purify.solaris2 b/etc/purify.solaris2
index dc2d1611257..a32273be0ea 100644
--- a/etc/purify.solaris2
+++ b/etc/purify.solaris2
@@ -36,7 +36,6 @@ suppress umr _lwp_in_syscall; _thrp_suspend
 ####
 suppress umr __sigprocmask; _thrp_exit; _t_cancel; _thr_exit_common
 suppress umr __sigprocmask; _thrp_exit; _thr_exit_common; _age; thr_yield
-suppress umr __sigprocmask; _thrp_exit; _thr_exit_common; _age; _lwp_start
 suppress umr __sigprocmask; _thrp_exit; _thr_exit_common; _age; _qswtch
 
 ####
diff --git a/examples/Connection/non_blocking/Makefile b/examples/Connection/non_blocking/Makefile
index a28a0771103..7ed9f058f47 100644
--- a/examples/Connection/non_blocking/Makefile
+++ b/examples/Connection/non_blocking/Makefile
@@ -1,57 +1,60 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Makefile for the Connection pattern tests
+#	Makefile for the Connection pattern tests
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-LIB     = libConn.a
-SHLIB   = libConn.$(SOEXT)
+LIB   	= libConn.a
+SHLIB 	= libConn.$(SOEXT)
 
-BIN     = test_sock_connector \
+BIN   	= test_sock_connector \
           test_sock_acceptor \
-          test_lsock_connector \
+	  test_lsock_connector \
           test_lsock_acceptor \
-          test_tli_connector \
-          test_tli_acceptor \
-          test_spipe_connector \
-          test_spipe_acceptor
+	  test_tli_connector \
+	  test_tli_acceptor \
+	  test_spipe_connector \
+	  test_spipe_acceptor
 
-PSRC    = $(addsuffix .cpp,$(BIN))
+PSRC   	= $(addsuffix .cpp,$(BIN))
 
-LSRC    = CPP-connector.cpp \
+LSRC  	= CPP-connector.cpp \
           CPP-acceptor.cpp
 
-LDLIBS  = -lConn
+LDLIBS 	= -lConn
+LIBS   += $(ACELIB)
+
+BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include		$(ACE_ROOT)/include/makeinclude/macros.GNU
+include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 # To build multiple executables in the same directory on AIX, it works
 # best to wipe out any previously-created tempinc directory.
 # The compiler/linker isn't too smart about instantiating templates...
 ifdef TEMPINCDIR
-  COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
+COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
 endif
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
diff --git a/examples/Connection/non_blocking/test_lsock_acceptor.cpp b/examples/Connection/non_blocking/test_lsock_acceptor.cpp
index 3f11ab907b5..0b94d117a3b 100644
--- a/examples/Connection/non_blocking/test_lsock_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_lsock_acceptor.cpp
@@ -3,20 +3,6 @@
 // ACE_LSOCK Server.
 
 #include "ace/LSOCK_Acceptor.h"
-
-#if defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-int
-main (int, char *argv[])
-{
-  ACE_ERROR_RETURN ((LM_INFO,
-                     ASYS_TEXT ("%s: not supported with ")
-                     ASYS_TEXT ("ACE_LACKS_UNIX_DOMAIN_SOCKETS\n"),
-                     argv[0]),
-                     -1);
-}
-
-#else  /* ! ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
 #include "ace/UNIX_Addr.h"
 #include "CPP-acceptor.h"
 
@@ -56,4 +42,3 @@ template class Svc_Handler<ACE_LSOCK_STREAM>;
 #pragma instantiate Svc_Handler<ACE_LSOCK_STREAM>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#endif /* ! ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/examples/Connection/non_blocking/test_lsock_connector.cpp b/examples/Connection/non_blocking/test_lsock_connector.cpp
index 5d7fc467251..085db2f5487 100644
--- a/examples/Connection/non_blocking/test_lsock_connector.cpp
+++ b/examples/Connection/non_blocking/test_lsock_connector.cpp
@@ -1,20 +1,6 @@
 // $Id$
 
 #include "ace/LSOCK_Connector.h"
-
-#if defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-int
-main (int, char *argv[])
-{
-  ACE_ERROR_RETURN ((LM_INFO,
-                     ASYS_TEXT ("%s: not supported with ")
-                     ASYS_TEXT ("ACE_LACKS_UNIX_DOMAIN_SOCKETS\n"),
-                     argv[0]),
-                     -1);
-}
-
-#else  /* ! ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
 #include "ace/UNIX_Addr.h"
 #include "CPP-connector.h"
 
@@ -65,5 +51,3 @@ template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SY
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ! ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp b/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp
index b55f437127e..8593b619860 100644
--- a/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp
@@ -1,16 +1,16 @@
 // $Id$
 
 #include "ace/LSOCK_Connector.h"
-#include "ace/UNIX_Addr.h"
-
+#include "ace/UNIX_Addr.h"                              
+                                                        
 ACE_RCSID(SOCK_SAP, FD_unclient, "$Id$")
 
-#if defined (ACE_HAS_MSG) && !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+#if defined (ACE_HAS_MSG) && !defined (ACE_HAS_UNIX_DOMAIN_SOCKETS)
 // ACE_LSOCK Client.
-
-int
-main (int argc, char *argv[])
-{
+                                                        
+int 
+main (int argc, char *argv[])                       
+{                                                       
   const char *file_name = argc > 1 ? argv[1] : "./local_data";
   const char *rendezvous = argc > 2 ? argv[2] : ACE_DEFAULT_RENDEZVOUS;
 
@@ -29,7 +29,7 @@ main (int argc, char *argv[])
     ACE_ERROR_RETURN ((LM_ERROR, "%p", "open"), -1);
 
   // Send handle to server (correctly handles incomplete writes).
-  if (cli_stream.send_handle (handle) == -1)
+  if (cli_stream.send_handle (handle) == -1) 
     ACE_ERROR_RETURN ((LM_ERROR, "%p", "send"), -1);
 
   char buf[BUFSIZ];
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
     ACE_ERROR_RETURN ((LM_ERROR, "%p", "recv"), -1);
   else if (n == 0)
     ACE_DEBUG ((LM_DEBUG, "server shutdown (bug in kernel?)\n"));
-  else
+  else    
     ACE_DEBUG ((LM_DEBUG, "server %*s shutdown\n", n, buf));
 
   // Explicitly close the connection.
-  if (cli_stream.close () == -1)
+  if (cli_stream.close () == -1) 
     ACE_ERROR_RETURN ((LM_ERROR, "%p", "close"), -1);
 
   return 0;
-}
+}                                                       
 #else
 int main (int, char *[])
 {
diff --git a/examples/Reactor/Misc/signal_tester.cpp b/examples/Reactor/Misc/signal_tester.cpp
deleted file mode 100644
index 37613f14f38..00000000000
--- a/examples/Reactor/Misc/signal_tester.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// Perform an extensive test of the ACE_Reactor's event dispatching
-// $Id$
-
-// mechanisms.  These mechanisms illustrate how signals, I/O, and
-// timeout events can all be handled within the same framework.  In
-// addition, this example illustrates how to use the ACE_Reactor for
-// devices that perform I/O via signals (such as SVR4 message queues).
-
-
-#include "ace/Service_Config.h"
-
-// Used to shut down the event loop.
-static sig_atomic_t done = 0;
-
-// This class illustrates how to handle signal-driven I/O using the
-// ACE_Reactor framework.  Note that signals may be caught and
-// processed without requiring the use of global signal handler
-// functions or global signal handler data.
-
-class Sig_Handler : public ACE_Event_Handler
-{
-public:
-  Sig_Handler (void);
-  virtual ACE_HANDLE get_handle (void) const;
-  virtual int handle_input (ACE_HANDLE);
-  virtual int shutdown (ACE_HANDLE, ACE_Reactor_Mask);
-  virtual int handle_signal (ACE_HANDLE signum, siginfo_t * = 0, 
-			     ucontext_t * = 0);
-
-private:
-  ACE_HANDLE handle_;
-};
-
-// A dummy_handle is required to reserve a slot in the ACE_Reactor's
-// descriptor table.
-
-Sig_Handler::Sig_Handler (void)
-{
-  // Assign the Sig_Handler a dummy I/O descriptor.  Note that even
-  // though we open this file "Write Only" we still need to use the
-  // ACE_Event_Handler::NULL_MASK when registering this with the
-  // ACE_Reactor (see below).
-  this->handle_ = ACE_OS::open (ACE_DEV_NULL, O_WRONLY);
-  ACE_ASSERT (this->handle_ != -1);
-
-  // Register signal handler object.  Note that NULL_MASK is used to
-  // keep the ACE_Reactor from calling us back on the "/dev/null"
-  // descriptor.
-  if (ACE_Service_Config::reactor ()->register_handler 
-      (this, ACE_Event_Handler::NULL_MASK) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
-
-  // Create a sigset_t corresponding to the signals we want to catch.
-  ACE_Sig_Set sig_set;
-
-  sig_set.sig_add (SIGINT);
-  sig_set.sig_add (SIGQUIT);
-  sig_set.sig_add (SIGALRM);  
-
-  // Register the signal handler object to catch the signals.
-  if (ACE_Service_Config::reactor ()->register_handler (sig_set, this) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
-}
-
-// Called by the ACE_Reactor to extract the fd.
-
-ACE_HANDLE
-Sig_Handler::get_handle (void) const
-{
-  return this->handle_;
-}
-
-// In a real application, this method would be where the read on the
-// signal-driven I/O device would occur asynchronously.  For now we'll
-// just print a greeting to let you know that everything is working
-// properly!
-
-int 
-Sig_Handler::handle_input (ACE_HANDLE)
-{
-  ACE_DEBUG ((LM_DEBUG, "handling asynchonrous input...\n"));
-  return 0;
-}
-
-// In a real application, this method would do any cleanup activities
-// required when shutting down the I/O device.
-
-int 
-Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, "closing down Sig_Handler...\n"));
-  return 0;
-}
-
-// This method handles all the signals that are being caught by this
-// object.  In our simple example, we are simply catching SIGALRM,
-// SIGINT, and SIGQUIT.  Anything else is logged and ignored.
-//
-// There are several advantages to using this approach.  First, 
-// the behavior triggered by the signal is handled in the main event
-// loop, rather than in the signal handler.  Second, the ACE_Reactor's 
-// signal handling mechanism eliminates the need to use global signal 
-// handler functions and data. 
-
-int
-Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "received signal %S\n", signum));
-
-  switch (signum)
-    {
-    case SIGALRM:
-      // Rearm the alarm.
-      ACE_OS::alarm (4);
-      break;
-    case SIGINT:
-      // Tell the ACE_Reactor to enable the ready bit for
-      // this->handle_.  The ACE_Reactor will subsequently call the
-      // Sig_Handler::handle_input method from within its event loop.
-      return ACE_Service_Config::reactor ()->ready_ops 
-	(this->handle_, ACE_Event_Handler::READ_MASK, ACE_Reactor::ADD_MASK);
-    case SIGQUIT:
-      ACE_DEBUG ((LM_DEBUG, "%S: shutting down signal tester\n", signum));
-      ACE_Service_Config::end_reactor_event_loop ();
-      break;
-    default: 
-      ACE_DEBUG ((LM_DEBUG, 
-		  "%S: not handled, returning to program\n", signum));
-      break;
-    }
-  return 0;
-}
-
-// This class illustrates that the ACE_Reactor can handle signals,
-// STDIO, and timeouts using the same mechanisms.
-
-class STDIN_Handler : public ACE_Event_Handler
-{
-public:
-  STDIN_Handler (void);
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_timeout (const ACE_Time_Value &, 
-			      const void *arg);
-};
-
-STDIN_Handler::STDIN_Handler (void)
-{
-  if (ACE::register_stdin_handler (this,
-				   ACE_Service_Config::reactor (),
-				   ACE_Service_Config::thr_mgr ()) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
-
-  // Register the STDIN_Handler to be dispatched once every second.
-  else if (ACE_Service_Config::reactor ()->schedule_timer
-	   (this, 0, ACE_Time_Value (1), ACE_Time_Value (1)) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "schedule_timer", 1));
-}
-
-int 
-STDIN_Handler::handle_timeout (const ACE_Time_Value &tv,
-			       const void *)
-{
-  ACE_DEBUG ((LM_DEBUG, "timeout occurred at %d sec, %d usec\n",
-	      tv.sec (), tv.usec ()));
-  return 0;
-}
-
-// Read from input descriptor and write to stdout descriptor.
-
-int 
-STDIN_Handler::handle_input (ACE_HANDLE handle)
-{
-  ssize_t n;
-  char buf[BUFSIZ];
-
-  switch (n = ACE_OS::read (handle, buf, sizeof buf))
-    {
-    case -1:
-      if (errno == EINTR)
-	return 0;
-        /* NOTREACHED */
-      else
-	ACE_ERROR ((LM_ERROR, "%p\n", "read"));
-      /* FALLTHROUGH */
-    case 0:
-      ACE_Service_Config::end_reactor_event_loop ();
-      break;
-    default:
-      {
-	ssize_t result = ACE::write_n (ACE_STDOUT, buf, n);
-
-	if (result != n)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "write"), 
-			    result == -1 && errno == EINTR ? 0 : -1);
-      }
-    }
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon (argv [0]);
-
-  // Signal handler.
-  Sig_Handler sh;
-
-  // Define an I/O handler object.
-  STDIN_Handler ioh;
-
-  // Optionally start the alarm.
-  if (argc > 1)
-    ACE_OS::alarm (4);
-
-  // Loop handling signals and I/O events until SIGQUIT occurs.
-
-  while (daemon.reactor_event_loop_done () == 0)
-    daemon.run_reactor_event_loop ();
-
-  return 0;
-}
diff --git a/examples/Reactor/Misc/test_signals.cpp b/examples/Reactor/Misc/test_signals.cpp
deleted file mode 100644
index 6493667de12..00000000000
--- a/examples/Reactor/Misc/test_signals.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-// Test the ability of the Reactor/Signal_Handler to register multiple
-// $Id$
-
-// handler per-signal.
-
-/* This test works as follows:
-	
-	1. To test the "original" semantics of ACE (i.e., only one
-	   ACE_Event_Handler can be registered per signal), you don't
-	   need to do anything special.  Existing programs work the
-	   same since giving the Reactor's constructor a 0 value
-	   (which is the default argument, BTW) instructs it to behave
-	   as before.  When a 0 is given, the ACE_Reactor's
-	   constructor/open method creates an instance of
-	   ACE_Sig_Handler and assigns this to an internal pointer.
-	   This pointer is then used to dispatch all signal-related
-	   methods within the Reactor.  The default ACE_Sig_Handler
-	   only allows *one* ACE_Event_Handler to be registered
-	   per-signal.
-
-	   To run this version of the test do the following:
-  
-	   % ./test-signal
-	   ./test_signals
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 0, 0) with count = 1
-	   waiting for SIGINT or SIGQUIT
-	   ^\
-	   signal Quit occurred in Sig_Handler_2 (fruity, 0, 0) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (fruity, 0, 0)
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 0, 0) with count = 3
-	   waiting for SIGINT or SIGQUIT
-	   ^\Quit (core dumped)
-
-           Note that in this test only one handler (the last one --
-	   "Sig_Handler_2 (fruity)") is actually registered.  BTW, the
-	   core dump is the expected behavior since the default
-	   disposition is restored when there are no more handlers
-	   (see the code below).
-
-	2. To test the "multiple handlers per-signal semantics", you
-	   need to pass the constructor/open method of the ACE_Reactor
-	   a pointer to a an instance of ACE_Sig_Handlers (note the
-	   plural "s").  ACE_Sig_Handlers is a class that derives from
-	   ACE_Sig_Handler.  The difference between these two classes
-	   is that (1) ACE_Sig_Handlers::register_signal allows
-	   multiple ACE_Event_Handlers to be registered per-signal and
-	   (2) it enables SA_RESTART by default.  This class also
-	   implements Detlef Becker's algorithm for integrating ACE
-	   signal handling with 3rd party libraries.
-
-	   To run this version of the test do the following:
-  
-	   % ./test_signals 1
-
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in external handler!
-	   signal Interrupt occurred in Sig_Handler_1 (howdy, 3, 1) with count = 1
-	   shutting down SIGINT in Sig_Handler_1 (howdy, 3, 1)
-	   signal Interrupt occurred in Sig_Handler_1 (doody, 5, 4) with count = 1
-	   shutting down SIGINT in Sig_Handler_1 (doody, 5, 4)
-	   signal Interrupt occurred in Sig_Handler_2 (tutty, 7, 6) with count = 1
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 9, 8) with count = 1
-	   waiting for SIGINT or SIGQUIT
-	   ^\
-	   signal Quit occurred in Sig_Handler_1 (howdy, 3, 1) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_1 (howdy, 3, 1)
-	   signal Quit occurred in Sig_Handler_1 (doody, 5, 4) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_1 (doody, 5, 4)
-	   signal Quit occurred in Sig_Handler_2 (tutty, 7, 6) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (tutty, 7, 6)
-	   signal Quit occurred in Sig_Handler_2 (fruity, 9, 8) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (fruity, 9, 8)
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in external handler!
-	   signal Interrupt occurred in Sig_Handler_2 (tutty, 7, 6) with count = 3
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 9, 8) with count = 3
-	   waiting for SIGINT or SIGQUIT
-	   ^\Quit (core dumped)
-
-           When this test begins all four handlers are registered and
-           dispatched when a SIGINT or SIGQUIT occurs.  After the
-           first SIGINT, the handle_signal method of the Sig_Handler_1
-           objects unregister themselves.  At that point there are 4
-           SIGQUIT handlers left, but only 2 of our SIGINT handlers
-           left (and the 1 external handler).  After the first
-           SIGQUIT, there are no SIGQUIT handlers left since they all
-           deregister themselves (which restores the "SIG_DFL"
-           disposition).  On the second SIGINT there are only 3
-           handlers left (2 of ours and 1 external).  Finally, on the
-           second SIGQUIT we exit and dump core since that's what
-           happens with the default disposition for SIGQUIT. */
-
-#include "ace/Log_Msg.h"
-#include "ace/Reactor.h"
-
-class Sig_Handler_1 : public ACE_Event_Handler
-{
-public:
-  Sig_Handler_1 (ACE_Reactor &reactor, char *msg)
-    : msg_ (msg),
-      count_ (0),
-      reactor_ (reactor)
-  {
-    // Register the signal handlers.
-    this->quit_sigkey_ = reactor.register_handler (SIGQUIT, this);
-    this->int_sigkey_ = reactor.register_handler (SIGINT, this);
-
-    if (this->quit_sigkey_ == -1 || this->int_sigkey_ == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
-  }
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *)
-  {
-    this->count_++;
-    ACE_DEBUG ((LM_DEBUG, 
-	       "\nsignal %S occurred in Sig_Handler_1 (%s, %d, %d) with count = %d",
-	       signum, this->msg_, this->int_sigkey_, this->quit_sigkey_, this->count_));
-    if (this->count_ != 1 && signum == SIGQUIT)
-      {
-	if (this->reactor_.remove_handler (SIGQUIT, 0, 0,
-					   this->quit_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGQUIT in Sig_Handler_1 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    else if (this->count_ != 2 && signum == SIGINT)
-      {
-	if (this->reactor_.remove_handler (SIGINT, 0, 0,
-					   this->int_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGINT in Sig_Handler_1 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    return 0;
-  }
-
-protected:
-  char *msg_;
-  int count_;
-  int int_sigkey_;
-  int quit_sigkey_;
-  ACE_Reactor &reactor_;
-};
-
-class Sig_Handler_2 : public Sig_Handler_1
-{
-public:
-  Sig_Handler_2 (ACE_Reactor &reactor, char *msg)
-    : Sig_Handler_1 (reactor, msg)
-  {
-  }
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *)
-  {
-    this->count_++;
-    ACE_DEBUG ((LM_DEBUG, 
-	       "\nsignal %S occurred in Sig_Handler_2 (%s, %d, %d) with count = %d",
-	       signum, this->msg_, this->int_sigkey_, this->quit_sigkey_, this->count_));
-    if (this->count_ != 0 && signum == SIGQUIT)
-      {
-	if (this->reactor_.remove_handler (SIGQUIT, 0, 0,
-					   this->quit_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGQUIT in Sig_Handler_2 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    else
-      return 0;
-  }
-};
-
-static void
-external_handler (int signum)
-{
-  ACE_DEBUG ((LM_DEBUG, "\nsignal %S occurred in external handler!", signum));
-}
-
-#if !defined (HPUX)
-int 
-main (int argc, char *argv)
-{
-  // If argc > 1 then allow multiple handlers per-signal, else just
-  // allow 1 handler per-signal.
-  ACE_Sig_Handlers multi_handlers;
-
-  ACE_Reactor reactor (argc > 1 ? &multi_handlers: 0);
-
-  if (argc > 1)
-    {
-      // Register an "external" signal handler so that the
-      // ACE_Sig_Handlers code will have something to incorporate!
-      ACE_SignalHandler eh = ACE_SignalHandler (external_handler);
-      ACE_Sig_Action sa (eh);
-
-      sa.register_action (SIGINT);
-    }
-
-  // Create a bevy of handlers.
-  Sig_Handler_1 h1 (reactor, "howdy"), h2 (reactor, "doody");
-  Sig_Handler_2 h3 (reactor, "tutty"), h4 (reactor, "fruity");
-
-  // Wait for user to type SIGINT and SIGQUIT.
-
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "\nwaiting for SIGINT or SIGQUIT\n"));
-      reactor.handle_events ();
-    }
-  return 0;
-}
-#else
-int
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "The HP C++ compiler is too lame to support this feature\n"), -1);
-}
-#endif /* HPUX */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp
index 913ee7bcad3..2aae0279cb2 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp
@@ -2,10 +2,32 @@
 
 #include "Handle_L_CODgram.h"
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 ACE_RCSID(server, Handle_L_CODgram, "$Id$")
 
+#if defined (SunOS4)
+extern "C" 
+{
+  int init (void);
+  int fini (void);
+  void __sti__Handle_L_CODgram_C_init_();
+  void __std__Handle_L_CODgram_C_init_();
+}
+
+int 
+init (void)
+{
+  __sti__Handle_L_CODgram_C_init_();
+  return 0;
+}
+
+int 
+fini (void)
+{
+  __std__Handle_L_CODgram_C_init_();
+  return 0;
+}
+#endif /* SunOS4 */
+
 const char *Handle_L_CODgram::DEFAULT_RENDEZVOUS = "/tmp/foo_codgram";
 
 #if !defined (__ACE_INLINE__)
@@ -14,5 +36,3 @@ const char *Handle_L_CODgram::DEFAULT_RENDEZVOUS = "/tmp/foo_codgram";
 
 Handle_L_CODgram local_codgram;
 ACE_Service_Object_Type lc (&local_codgram, "Local_CODgram");
-
-#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
index 8193f6f7adf..90452d0f981 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-// Handles UNIX datagram messages from local host.
+/* Handles UNIX datagram messages from local host. */
 
 #ifndef _HANDLE_L_CODGRAM_H
 #define _HANDLE_L_CODGRAM_H
@@ -16,8 +16,6 @@
 #include "ace/LSOCK_CODgram.h"
 #include "ace/UNIX_Addr.h"
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 class Handle_L_CODgram : public ACE_Service_Object, public ACE_LSOCK_CODgram
 {
 public:
@@ -45,5 +43,4 @@ extern ACE_Service_Object_Type lc;
 #define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif /* _HANDLE_L_CODGRAM_H */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
index dadf755a965..0cefbba6baf 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
@@ -32,7 +32,7 @@ private:
   virtual int handle_input (int fd);
   virtual int handle_close (int fd, ACE_Reactor_Mask);
 
-  char rendezvous[MAXPATHLEN + 1];
+  char              rendezvous[MAXPATHLEN + 1];
   static const char *DEFAULT_RENDEZVOUS;
 };
 
@@ -44,6 +44,5 @@ extern ACE_Service_Object_Type ld;
 #else
 #define ACE_INLINE
 #endif /* __ACE_INLINE__ */
-
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif /* _HANDLE_L_DGRAM_H */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
index ff8f42d3c70..b70e8002c32 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
@@ -56,9 +56,7 @@ Handle_L_FIFO::init (int argc, char *argv[])
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
   else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "registering service with ACE_Reactor\n"),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
   return 0;
 }
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
index cf38a20f28d..02c567897b4 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
@@ -4,53 +4,29 @@
 
 ACE_RCSID(server, Handle_L_Pipe, "$Id$")
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-// Uppercase N bytes of S.
-
-char *
-Handle_L_Pipe::upper_case (char s[], int n)
+#if defined (SunOS4)
+extern "C" 
 {
-  while (--n >= 0)
-    if (islower (s[n]))
-      s[n] = toupper (s[n]);
-
-  return s;
-} 
+  int init (void);
+  int fini (void);
+  void __sti__Handle_L_Pipe_C_recv_n_();
+  void __std__Handle_L_Pipe_C_recv_n_();
+}
 
-int
-Handle_L_Pipe::handle_input (ACE_HANDLE)
+int 
+init (void)
 {
-  ACE_LSOCK_Stream new_local_stream;
-  int n;
-  ACE_HANDLE fd1 = ACE_INVALID_HANDLE;
-  ACE_HANDLE fd2 = ACE_INVALID_HANDLE;
-  char buf[BUFSIZ];
-
-  if (this->accept (new_local_stream) == -1)
-    return -1;
-
-  if (new_local_stream.recv_handle (fd1) == -1 
-      || new_local_stream.recv_handle (fd2) == -1)
-    return -1;
-  else
-    ACE_DEBUG ((LM_INFO,
-                "received file descriptors %d and %d\n",
-                fd1,
-                fd2));
-
-  if ((n = ACE_OS::read (fd1, buf, sizeof buf)) == -1)
-    return -1;
-  else if (ACE_OS::write (fd2, this->upper_case (buf, n), n) == -1)
-    return -1;
-  if (ACE_OS::close (fd1) == -1 
-      || ACE_OS::close (fd2) == -1)
-    return -1;
-  if (new_local_stream.close () == -1)
-    return -1;
+  __sti__Handle_L_Pipe_C_recv_n_();
+  return 0;
+}
 
+int 
+fini (void)
+{
+  __std__Handle_L_Pipe_C_recv_n_();
   return 0;
 }
+#endif /* SunOS4 */
 
 const char *Handle_L_Pipe::DEFAULT_RENDEZVOUS = "/tmp/foo_pipe";
 
@@ -60,5 +36,3 @@ const char *Handle_L_Pipe::DEFAULT_RENDEZVOUS = "/tmp/foo_pipe";
 
 Handle_L_Pipe local_pipe;
 ACE_Service_Object_Type lp (&local_pipe, "Local_Pipe");
-
-#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
index 9b3143117dd..82d784e977a 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
@@ -1,8 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
-// Handle connections from local UNIX domain sockets that are sending
-// end-points from a pipe!
+/* Handle connections from local UNIX domain sockets that are sending
+   end-points from a pipe! */
 
 #ifndef _HANDLE_L_PIPE_H
 #define _HANDLE_L_PIPE_H
@@ -17,8 +17,6 @@
 #include "ace/UNIX_Addr.h"
 #include "ace/LSOCK_Acceptor.h"
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 class Handle_L_Pipe : public ACE_Service_Object, public ACE_LSOCK_Acceptor
 {
 public:
@@ -34,8 +32,6 @@ private:
   virtual int handle_input (ACE_HANDLE fd);
   virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask);
 
-  char *upper_case (char s[], int n);
-
   char rendezvous[MAXPATHLEN + 1];
   static const char *DEFAULT_RENDEZVOUS;
 };
@@ -49,6 +45,5 @@ extern ACE_Service_Object_Type lp;
 #define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif /* _HANDLE_L_PIPE_H */
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
index 84e648d4ecb..4d481fb4670 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
@@ -8,6 +8,18 @@ Handle_L_Pipe::~Handle_L_Pipe (void)
 {
 }
 
+/* Uppercase N bytes of S. */
+
+static char *
+upper_case (char s[], int n)
+{
+  while (--n >= 0)
+    if (islower (s[n]))
+      s[n] = toupper (s[n]);
+
+  return s;
+} 
+
 ACE_INLINE
 Handle_L_Pipe::Handle_L_Pipe (void)
 {
@@ -84,6 +96,37 @@ Handle_L_Pipe::get_handle (void) const
   return ACE_LSOCK_Acceptor::get_handle (); 
 }
 
+ACE_INLINE int 
+Handle_L_Pipe::handle_input (ACE_HANDLE)
+{
+  ACE_LSOCK_Stream   new_local_stream;
+  int n;
+  ACE_HANDLE fd1 = ACE_INVALID_HANDLE;
+  ACE_HANDLE fd2 = ACE_INVALID_HANDLE;
+  char buf[BUFSIZ];
+
+  if (this->accept (new_local_stream) == -1)
+    return -1;
+
+  if (new_local_stream.recv_handle (fd1) == -1 
+      || new_local_stream.recv_handle (fd2) == -1)
+    return -1;
+  else
+    ACE_DEBUG ((LM_INFO, "received file descriptors %d and %d\n", fd1, fd2));
+
+  if ((n = ACE_OS::read (fd1, buf, sizeof buf)) == -1)
+    return -1;
+  else if (ACE_OS::write (fd2, upper_case (buf, n), n) == -1)
+    return -1;
+  if (ACE_OS::close (fd1) == -1 
+      || ACE_OS::close (fd2) == -1)
+    return -1;
+  if (new_local_stream.close () == -1)
+    return -1;
+
+  return 0;
+}
+
 ACE_INLINE int
 Handle_L_Pipe::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
 {
diff --git a/examples/Shared_Malloc/Malloc.cpp b/examples/Shared_Malloc/Malloc.cpp
index 510fbe729a9..4e0bf8d224b 100644
--- a/examples/Shared_Malloc/Malloc.cpp
+++ b/examples/Shared_Malloc/Malloc.cpp
@@ -35,20 +35,20 @@ Malloc::instance (void)
   if (Malloc::instance_ == 0)
     {
       if (Options::instance ()->child ())
-        Malloc::instance_ = new ACE_Allocator_Adapter<M_ALLOCATOR>;
+	Malloc::instance_ = new ACE_Allocator_Adapter<M_ALLOCATOR>;
       else if (Options::instance ()->spawn_threads ())
-        {
-          if (Options::instance ()->use_sbrk ())
-            Malloc::instance_ = new ACE_Allocator_Adapter<SB_ALLOCATOR>;
-          else if (Options::instance ()->use_shmem ())
-            Malloc::instance_ = new ACE_Allocator_Adapter<ST_ALLOCATOR>;
-          else
-            Malloc::instance_ = new ACE_Allocator_Adapter<L_ALLOCATOR>;
-        }
+	{
+	  if (Options::instance ()->use_sbrk ())
+	    Malloc::instance_ = new ACE_Allocator_Adapter<SB_ALLOCATOR>;
+	  else if (Options::instance ()->use_shmem ())
+	    Malloc::instance_ = new ACE_Allocator_Adapter<ST_ALLOCATOR>;
+	  else
+	    Malloc::instance_ = new ACE_Allocator_Adapter<L_ALLOCATOR>;
+	}
       else if (Options::instance ()->use_mmap ())
-        Malloc::instance_ = new ACE_Allocator_Adapter<M_ALLOCATOR>;
+	Malloc::instance_ = new ACE_Allocator_Adapter<M_ALLOCATOR>;
       else // Use Shared_Memory_Pool.
-        Malloc::instance_ = new ACE_Allocator_Adapter<SP_ALLOCATOR>;
+	Malloc::instance_ = new ACE_Allocator_Adapter<SP_ALLOCATOR>;
     }
 
   return Malloc::instance_;
@@ -57,22 +57,15 @@ Malloc::instance (void)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Allocator_Adapter<L_ALLOCATOR>;
 template class ACE_Allocator_Adapter<M_ALLOCATOR>;
-#if !defined (ACE_LACKS_SBRK)
 template class ACE_Allocator_Adapter<SB_ALLOCATOR>;
-template class ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>;
-#endif /* ! ACE_LACKS_SBRK */
-#if !defined (ACE_LACKS_SYSV_SHMEM)
 template class ACE_Allocator_Adapter<SP_ALLOCATOR>;
-#endif /* ! ACE_LACKS_SYSV_SHMEM */
 template class ACE_Allocator_Adapter<ST_ALLOCATOR>;
 template class ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>;
 template class ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex>;
 template class ACE_Read_Guard<ACE_Process_Mutex>;
-template class ACE_Write_Guard<ACE_Process_Mutex>;
-#if !defined (ACE_HAS_THREADS)
 template class ACE_Read_Guard<ACE_SYNCH_MUTEX>;
+template class ACE_Write_Guard<ACE_Process_Mutex>;
 template class ACE_Write_Guard<ACE_SYNCH_MUTEX>;
-#endif /* ! ACE_HAS_THREADS */
 
 #if defined (ACE_LACKS_SYSV_SHMEM)
 template class ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>;
@@ -81,25 +74,23 @@ template class ACE_Malloc <ACE_SHARED_MEMORY_POOL, ACE_Process_Mutex>;
 template class ACE_Malloc <ACE_SHARED_MEMORY_POOL, ACE_SYNCH_MUTEX>;
 #endif /* ACE_LACKS_SYSV_SHMEM */
 
+#if defined (ACE_LACKS_SBRK)
+template class ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>;
+#else
+template class ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>;
+#endif /* ACE_LACKS_SBRK */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Allocator_Adapter<L_ALLOCATOR>
 #pragma instantiate ACE_Allocator_Adapter<M_ALLOCATOR>
-#if !defined (ACE_LACKS_SBRK)
 #pragma instantiate ACE_Allocator_Adapter<SB_ALLOCATOR>
-#pragma instantiate ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>
-#endif /* ! ACE_LACKS_SYSV_SHMEM */
-#if !defined (ACE_LACKS_SBRK)
 #pragma instantiate ACE_Allocator_Adapter<SP_ALLOCATOR>
-#endif /* ! ACE_LACKS_SYSV_SHMEM */
 #pragma instantiate ACE_Allocator_Adapter<ST_ALLOCATOR>
 #pragma instantiate ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex>
 #pragma instantiate ACE_Read_Guard<ACE_Process_Mutex>
-#pragma instantiate ACE_Write_Guard<ACE_Process_Mutex>
-#if !defined (ACE_HAS_THREADS)
 #pragma instantiate ACE_Read_Guard<ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Write_Guard<ACE_Process_Mutex>
 #pragma instantiate ACE_Write_Guard<ACE_SYNCH_MUTEX>
-#endif /* ! ACE_HAS_THREADS */
 
 #if defined (ACE_LACKS_SYSV_SHMEM)
 #pragma instantiate ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>
@@ -108,4 +99,10 @@ template class ACE_Malloc <ACE_SHARED_MEMORY_POOL, ACE_SYNCH_MUTEX>;
 #pragma instantiate ACE_Malloc <ACE_SHARED_MEMORY_POOL, ACE_SYNCH_MUTEX>
 #endif /* ACE_LACKS_SYSV_SHMEM */
 
+#if defined (ACE_LACKS_SBRK)
+#pragma instantiate ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>
+#else
+#pragma instantiate ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>
+#endif /* ACE_LACKS_SBRK */
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/examples/Shared_Malloc/Options.cpp b/examples/Shared_Malloc/Options.cpp
index 672a6871821..133df2a2ae5 100644
--- a/examples/Shared_Malloc/Options.cpp
+++ b/examples/Shared_Malloc/Options.cpp
@@ -103,7 +103,6 @@ Options::print_usage_and_die (void)
        "[-p] (use processes rather than threads)\n"
        "[-s] (use SysV shared memory rather than mmap)\n"
        "[-t number of threads or processes to spawn]\n"
-       "[-T] (enable tracking)\n"
        "[-n iteration_count]\n%a", -1));
   /* NOTREACHED */
 }
@@ -126,7 +125,7 @@ Options::Options (void)
 void
 Options::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "dehlL:mn:pst:T");
+  ACE_Get_Opt get_opt (argc, argv, "dehlL:mn:pst:");
 
   this->program_name_ = argv[0];
   ACE_LOG_MSG->open (this->program_name_);
@@ -138,9 +137,9 @@ Options::parse_args (int argc, char *argv[])
       this->use_mmap_ = 1;
     }
 
-  for (int c;
-       (c = get_opt ()) != -1;
-       )
+  int c;
+
+  while ((c = get_opt ()) != -1)
     {
       switch (c)
 	{
@@ -176,9 +175,6 @@ Options::parse_args (int argc, char *argv[])
 	case 't':
 	  this->spawn_count_ = ACE_OS::atoi (get_opt.optarg);
 	  break;
-	case 'T':
-          ACE_Trace::start_tracing ();
-	  break;
 	default:
 	  this->print_usage_and_die ();
 	  /* NOTREACHED */
diff --git a/examples/Shared_Malloc/test_persistence.cpp b/examples/Shared_Malloc/test_persistence.cpp
index 481427019ec..7757ae35ef0 100644
--- a/examples/Shared_Malloc/test_persistence.cpp
+++ b/examples/Shared_Malloc/test_persistence.cpp
@@ -12,7 +12,7 @@ typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC;
 typedef ACE_Malloc_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC_ITERATOR;
 
 // Shared memory manager.
-static MALLOC *shmem_allocator = 0;
+static MALLOC *shmem_manager = 0;
 
 // Backing store name.
 static const char *backing_store = ACE_DEFAULT_BACKING_STORE;
@@ -22,26 +22,23 @@ class Employee
 public:
   Employee (void): name_ (0), id_ (0) {}
 
-  Employee (const char *name, u_long id) : id_ (id)
+  Employee (char* name, u_long id) : id_ (id)
   {
-    size_t len = ACE_OS::strlen (name) + 1;
-    this->name_ = ACE_reinterpret_cast (char *,
-                                        shmem_allocator->malloc (len));
-    ACE_OS::strcpy (this->name_, name);
+    this->name_ = (char*) shmem_manager->malloc (ACE_OS::strlen (name) + 1);
+    ACE_OS::strcpy (this->name_, name );
   }
 
-  ~Employee (void) { shmem_allocator->free (this->name_); }
+  ~Employee (void) { shmem_manager->free (this->name_); }
 
-  const char *name (void) const { return this->name_; }
+  char *name (void) const    { return this->name_; }
 
-  void name (const char *name)
+  void name (char* name)
   {
     if (this->name_)
-      shmem_allocator->free (this->name_);
+      shmem_manager->free (this->name_);
+
+    this->name_ = (char *) shmem_manager->malloc (ACE_OS::strlen (name) + 1);
 
-    size_t len = ACE_OS::strlen (name) + 1;
-    this->name_ = ACE_reinterpret_cast (char *,
-                                        shmem_allocator->malloc (len));
     ACE_OS::strcpy (this->name_, name);
   }
 
@@ -51,10 +48,10 @@ public:
 
   void *operator new (size_t)
   {
-    return shmem_allocator->malloc (sizeof (Employee));
+    return shmem_manager->malloc (sizeof (Employee));
   }
 
-  void operator delete (void *pointer) { shmem_allocator->free (pointer); }
+  void operator delete (void *pointer) { shmem_manager->free (pointer); }
 
 private:
   char *name_;
@@ -71,8 +68,7 @@ public:
 
   ~GUI_Handler (void)
   {
-    MALLOC::MEMORY_POOL &pool =
-      shmem_allocator->memory_pool ();
+    MALLOC::MEMORY_POOL &pool = shmem_manager->memory_pool();
     pool.sync ();
   }
 
@@ -84,8 +80,7 @@ public:
 
     if (::scanf ("%s", option) <= 0)
       {
-        ACE_ERROR ((LM_ERROR,
-                    "try again\n"));
+        ACE_ERROR ((LM_ERROR, "try again\n"));
         return 0;
       }
 
@@ -96,8 +91,7 @@ public:
       case 'i' :
         if (::scanf ("%s %s", buf1, buf2) <= 0)
           break;
-        result = insert_employee (buf1,
-                                  ACE_OS::atoi (buf2));
+        result = insert_employee (buf1, ACE_OS::atoi (buf2));
         break;
       case 'F' :
       case 'f' :
@@ -149,109 +143,73 @@ public:
   }
 
 private:
-  int insert_employee (const char *name,
-                       u_long id);
-  int find_employee (const char *name);
-  int list_employees (void);
-  int delete_employee (const char *name);
-};
+  int insert_employee (char* name, u_long id)
+  {
+    if (find_employee (name) == 0)
+      ACE_ERROR_RETURN ((LM_ERROR, "Employee already exists\n"), -1);
 
-int 
-GUI_Handler::insert_employee (const char *name,
-                              u_long id)
-{
-  if (find_employee (name) == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Employee already exists\n"),
-                      -1);
-
-  Employee *new_employee = 0;
-
-  ACE_NEW_RETURN (new_employee,
-                  Employee (name, id),
-                  -1);
-
-  if (shmem_allocator->bind (name,
-                           new_employee) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "bind failed\n"),
-                      -1);
-  return 0;
-}
+    Employee* new_employee = new Employee (name, id);
+    shmem_manager->bind (name, new_employee);
+    return 0;
+  }
 
-int 
-GUI_Handler::find_employee (const char *name)
-{
-  void *temp;
-
-  if (shmem_allocator->find (name,
-                             temp) == 0)
-    {
-      Employee *employee = ACE_reinterpret_cast (Employee *,
-                                                 temp);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The following employee was found.......\n\n"));
-      ACE_DEBUG ((LM_DEBUG,
-                  "Employee name: %s\nEmployee id:   %d\n",
-                  employee->name (),
-                  employee->id ()));
-      return 0;
-    }
-
-  return -1;
-}
+  int find_employee (char* name)
+  {
+    void *temp;
+    if (shmem_manager->find (name, temp) == 0)
+      {
+        Employee *employee = (Employee *) temp;
 
-int 
-GUI_Handler::list_employees (void)
-{
-  MALLOC_ITERATOR iterator (*shmem_allocator);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "The following employees were found.......\n\n"));
-
-  for (void *temp = 0;
-       iterator.next (temp) != 0;
-       iterator.advance ())
-    {
-      Employee *employee = ACE_reinterpret_cast (Employee *,
-                                                 temp);
-      ACE_DEBUG ((LM_DEBUG,
-                  "Employee name: %s\nEmployee id:   %d\n",
-                  employee->name (),
-                  employee->id ()));
-    }
-  return 0;
-}
+        ACE_DEBUG ((LM_DEBUG, "The following employee was found.......\n\n"));
+        ACE_DEBUG ((LM_DEBUG, "Employee name: %s\nEmployee id:   %d\n",
+                    employee->name (), employee->id ()));
+        return 0;
+      }
 
-int 
-GUI_Handler::delete_employee (const char *name)
-{
-  void *temp;
-
-  if (shmem_allocator->unbind (name,
-                               temp) == 0)
-    {
-      Employee *employee = ACE_reinterpret_cast (Employee *,
-                                                 temp);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The following employee was found and deleted.......\n\n"));
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Employee name: %s\nEmployee id:   %d\n",
-                  employee->name (),
-                  employee->id ()));
-
-      delete employee;
-      return 0;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "There is no employee with name %s",
-              name));
-  return -1;
-}
+    return -1;
+  }
+
+  int list_employees (void)
+  {
+    MALLOC_ITERATOR iterator (*shmem_manager);
+
+    ACE_DEBUG ((LM_DEBUG, "The following employees were found.......\n\n"));
+
+    for (void* temp = 0;
+         iterator.next (temp) != 0;
+         iterator.advance ())
+      {
+        Employee *employee = (Employee *) temp;
+        ACE_DEBUG ((LM_DEBUG, "Employee name: %s\nEmployee id:   %d\n",
+                    employee->name (), employee->id ()));
+      }
+    return 0;
+  }
+
+  int delete_employee (char* name)
+  {
+    void *temp;
+
+    if (shmem_manager->unbind (name, temp) == 0)
+      {
+        Employee *employee = (Employee *) temp;
+
+        ACE_DEBUG ((LM_DEBUG,
+                    "The following employee was found and deleted.......\n\n"));
+
+        ACE_DEBUG ((LM_DEBUG, "Employee name: %s\nEmployee id:   %d\n",
+                    employee->name (), employee->id ()));
+
+        delete employee;
+        return 0;
+      }
+
+    ACE_DEBUG ((LM_DEBUG,
+                "There is no employee with name %s",
+                name));
+    return -1;
+  }
+};
 
 void
 parse_args (int argc, char *argv[])
@@ -265,9 +223,7 @@ main (int argc, char *argv[])
 {
   parse_args (argc, argv);
 
-  ACE_NEW_RETURN (shmem_allocator,
-                  MALLOC (backing_store),
-                  -1);
+  shmem_manager = new MALLOC (backing_store);
 
   GUI_Handler handler;
 
diff --git a/examples/Shared_Malloc/test_position_independent_malloc.cpp b/examples/Shared_Malloc/test_position_independent_malloc.cpp
index 843310da32e..1b62b6d184b 100644
--- a/examples/Shared_Malloc/test_position_independent_malloc.cpp
+++ b/examples/Shared_Malloc/test_position_independent_malloc.cpp
@@ -5,29 +5,26 @@
 
 #include "ace/Malloc.h"
 #include "ace/Based_Pointer_T.h"
-#include "ace/Get_Opt.h"
 #include "ace/Synch.h"
-#include "test_position_independent_malloc.h"
 
 ACE_RCSID(Shared_Malloc, test_multiple_mallocs, "$Id$")
 
-#if 0
-typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC;
+typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC; 
 
 // Default address for memory-mapped files.
 static void *base_addr = ACE_DEFAULT_BASE_ADDR;
 
-#if 0
-// Some dummy data
+// Some dummy data 
 struct Dummy_Data
 {
   int i1_;
   int i2_;
   int i3_;
-  // ACE_Based_Pointer<Dummy_Data> next_;
+  ACE_Based_Pointer<Dummy_Data> next_;
 };
 
-struct Long_Test
+#if 0
+struct Long_Test 
 {
   ACE_Based_Pointer<long> bpl_;
   long array_[10];
@@ -37,21 +34,17 @@ struct Long_Test
 static void
 print (Dummy_Data *data)
 {
-#if 0
   ACE_DEBUG ((LM_DEBUG,
               "<<<<\ni1_ = %d, i2_ = %d, i3_ = %d\n",
-              data->i1_,
+              data->i1_, 
               data->i2_,
               data->i3_));
 
   ACE_DEBUG ((LM_DEBUG,
               "i1_ = %d, i2_ = %d, i3_ = %d\n>>>>\n",
-              data->next_->i1_,
+              data->next_->i1_, 
               data->next_->i2_,
               data->next_->i3_));
-#else
-  ACE_UNUSED_ARG (data);
-#endif /* 0 */
 }
 
 static void *
@@ -63,21 +56,14 @@ initialize (MALLOC *allocator)
                         0);
   Dummy_Data *data1 = new (ptr) Dummy_Data;
 
-  data1->i1_ = 111;
-  data1->i2_ = 222;
-  data1->i3_ = 333;
-
   void *gap = 0;
   ACE_ALLOCATOR_RETURN (gap,
                         allocator->malloc (sizeof (256)),
                         0);
 
-  allocator->free (gap);
-
   ACE_ALLOCATOR_RETURN (ptr,
                         allocator->malloc (sizeof (Dummy_Data)),
                         0);
-#if 0
   Dummy_Data *data2 = new (ptr) Dummy_Data;
 
   data1->next_ = data2;
@@ -89,6 +75,7 @@ initialize (MALLOC *allocator)
   data2->next_->i2_ = -222;
   data2->next_->i3_ = -333;
 
+#if 0
   // Test in shared memory using long (array/pointer)
   ACE_ALLOCATOR_RETURN (ptr,
                         allocator->malloc (sizeof (Long_Test)),
@@ -122,35 +109,17 @@ initialize (MALLOC *allocator)
   long longCont_lcl4 = lt_lcl->bpl_[4];
 #endif /* 0 */
 
-  return data1;
-}
-
-static void
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "a:T");
+  allocator->free (gap);
 
-  for (int c;
-       (c = get_opt ()) != -1;
-       )
-    {
-      switch (c)
-        {
-        case 'a':
-          // Override the default base address.
-          base_addr = (void *) ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 'T':
-          ACE_Trace::start_tracing ();
-          break;
-        }
-    }
+  return data1;
 }
 
-int
+int 
 main (int argc, char *argv[])
 {
-  parse_args (argc, argv);
+  if (argc > 1)
+    // Override the default base address.
+    base_addr = (void *) ACE_OS::atoi (argv[1]);
 
   ACE_MMAP_Memory_Pool_Options options (base_addr);
 
@@ -161,17 +130,14 @@ main (int argc, char *argv[])
                           "dummy_lock",
                           &options),
                   1);
-  void *data = 0;
+  void *data = 0; 
 
   // This is the first time in, so we allocate the memory and bind it
   // to the name "foo".
   if (allocator->find ("foo",
                        data) == -1)
     {
-      // data = initialize (allocator);
-
-      data = allocator->malloc (sizeof (long));
-      *(long *) data = -36;
+      data = initialize (allocator);
 
       if (allocator->bind ("foo",
                            data) == -1)
@@ -188,10 +154,8 @@ main (int argc, char *argv[])
   else
     {
       // @@ Add a new print statement...
-      // print ((Dummy_Data *) data);
-      ACE_DEBUG ((LM_DEBUG,
-                  "data = %d\n",
-                  *(long *) data));
+      print ((Dummy_Data *) data);
+      
       allocator->free (data);
       allocator->remove ();
       ACE_DEBUG ((LM_DEBUG,
@@ -203,17 +167,6 @@ main (int argc, char *argv[])
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Based_Pointer<Dummy_Data>;
-template class ACE_Based_Pointer_Basic<Dummy_Data>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Based_Pointer<Dummy_Data>
-#pragma instantiate ACE_Based_Pointer_Basic<Dummy_Data>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#else
-int
-main (int, char *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     "sorry, example not finished yet\n"),
-                    1);
-}
-#endif /* 0 */
diff --git a/examples/Shared_Malloc/test_position_independent_malloc.h b/examples/Shared_Malloc/test_position_independent_malloc.h
deleted file mode 100644
index 2a1be383db0..00000000000
--- a/examples/Shared_Malloc/test_position_independent_malloc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-//
-// Define struct used in test_position_independent_malloc.cpp - needs to be in
-// a separate file for template generation on AIX IBM C++.
-
-#ifndef __TEST_POSITION_INDEPENDENT_MALLOC_H
-#define __TEST_POSITION_INDEPENDENT_MALLOC_H
-
-// Some dummy data 
-struct Dummy_Data
-{
-  int i1_;
-  int i2_;
-  int i3_;
-  ACE_Based_Pointer<Dummy_Data> next_;
-};
-
-#endif /* __TEST_POSITION_INDEPENDENT_MALLOC */
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp
deleted file mode 100644
index b7fe34725e7..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "Semaphore_Test.h"
-// $Id$
-
-#include "ace/SV_Shared_Memory.h"
-#include "ace/SV_Semaphore_Simple.h"
-
-int
-main (void)
-{
-  ACE_SV_Shared_Memory shm_client (SHM_KEY, 
-				   SHMSZ, 
-				   ACE_SV_Shared_Memory::ACE_OPEN);
-  ACE_SV_Semaphore_Simple sem (SEM_KEY_1, 
-			       ACE_SV_Semaphore_Simple::ACE_OPEN, 0, 2);
-
-  char *s = (char *) shm_client.get_segment_ptr ();
-
-  if (sem.acquire (0) < 0)
-    ACE_OS::perror ("client sem.acquire"), ACE_OS::exit (1);
-
-  while (*s != '\0')
-    putchar (*s++);
-
-  putchar ('\n');
-
-  if (sem.release (1) < 0)
-    ACE_OS::perror ("client sem.release"), ACE_OS::exit (1);
-
-  return 0;
-}
-
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp
deleted file mode 100644
index f9931705c26..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-
-#include "ace/SV_Shared_Memory.h"
-#include "ace/SV_Semaphore_Simple.h"
-#include "ace/Signal.h"
-#include "Semaphore_Test.h"
-
-static ACE_SV_Shared_Memory shm_server (SHM_KEY, SHMSZ, ACE_SV_Shared_Memory::ACE_CREATE);
-static ACE_SV_Semaphore_Simple sem (SEM_KEY_1, ACE_SV_Semaphore_Simple::ACE_CREATE, 0, 2);
-
-extern "C" void 
-cleanup (int)
-{
-  if (shm_server.remove () < 0 || sem.remove () < 0)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "remove", 1));
-  ACE_OS::exit (0);
-}
-
-int
-main (void)
-{
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) cleanup, SIGINT);
-
-  char *s = (char *) shm_server.get_segment_ptr ();
-
-  for (char c = 'a'; c <= 'z'; c++)
-    *s++ = c;
-
-  *s = '\0';
-
-  if (sem.release (0) < 0)
-    ESD ("server sem.release", done);
-
-  if (sem.acquire (1) < 0)
-    ESD ("server sem.acquire", done);
-
-done:
-  cleanup ();
-  return 0;
-}
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h b/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h
deleted file mode 100644
index 72aab815ff8..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "ace/Log_Msg.h"
-
-#define SHMSZ 27
-#define SEM_KEY_1 2345
-#define SEM_KEY_2 4321
-#define SHM_KEY 5678
-
-#define ESD(MSG,LABEL) do { ACE_ERROR ((LM_ERROR, MSG)); goto LABEL; } while (0)
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp
deleted file mode 100644
index b98c664883b..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// Illustrates the use of the Semaphore_Complex class.  Note that it
-// $Id$
-
-// doesn't matter whether the parent or the child creates the
-// semaphore since Semaphore_Complex will correctly serialize the
-// intialization of the mutex and synch objects.
-#include "ace/Malloc.h"
-#include "ace/SV_Semaphore_Complex.h"
-#include "Semaphore_Test.h"
-
-ACE_Malloc<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple> allocator;
-ACE_SV_Semaphore_Complex *mutex = 0; 
-ACE_SV_Semaphore_Complex *synch = 0; 
-
-/* Pointer to memory shared by both the client and server. */
-static char *shm;
-
-static int
-do_parent (void)
-{
-  char *s = shm;
-
-  mutex = new ACE_SV_Semaphore_Complex (SEM_KEY_1, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-  synch = new ACE_SV_Semaphore_Complex (SEM_KEY_2, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-
-  for (char c = 'a'; c <= 'z'; c++)
-    *s++ = c;
-
-  *s = '\0';
-
-  if (mutex->release () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "server mutex.release"), 1);
-
-  if (synch->acquire () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "server synch.acquire"), 1);
-  return 0;
-}
-
-static int
-do_child (void)
-{
-  mutex = new ACE_SV_Semaphore_Complex (SEM_KEY_1, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-  synch = new ACE_SV_Semaphore_Complex (SEM_KEY_2, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-
-  while (mutex->tryacquire () == -1)
-    if (errno == EAGAIN)
-      ACE_DEBUG ((LM_DEBUG, "spinning in client!\n"));
-    else
-      ACE_ERROR_RETURN ((LM_ERROR, "client mutex.tryacquire"), 1);
-
-  for (char *s = (char *) shm; *s != '\0'; s++)
-    putchar (*s);
-
-  putchar ('\n');
-
-  if (synch->release () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "client synch.release"), 1);
-  return 0;
-}
-
-int
-main (void)
-{
-  shm = (char *) allocator.malloc (27);
-
-  switch (ACE_OS::fork ())
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, "fork failed\n"), -1);
-      /* NOTREACHED */
-    case 0:
-      return do_child ();
-    default:
-      {
-	int result = do_parent ();
-
-	if (wait (0) == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "wait"), -1);
-
-	allocator.remove ();
-
-	if (mutex->remove () == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "mutex.remove"), -1);
-	else if (synch->remove () == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "synch.remove"), -1);
-	return result;
-      }
-    }
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Malloc<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
diff --git a/examples/Threads/task_five.cpp b/examples/Threads/task_five.cpp
index 3d302805d62..479be53deac 100644
--- a/examples/Threads/task_five.cpp
+++ b/examples/Threads/task_five.cpp
@@ -27,7 +27,7 @@ static const int DEFAULT_TASKS = 100;
 static const int DEFAULT_ITERATIONS = 10;
 
 // Default stack size
-static size_t default_stack_size =
+static size_t default_stack_size =      
 #if defined (ACE_WIN32)
     0;
 #else
@@ -97,7 +97,7 @@ Test_Task::synch (void)
   return thr_mgr_->wait_grp (grp_id_);
 }
 
-static void
+static void 
 work (ACE_Thread_Manager *thr_mgr,
       int n_tasks,
       size_t stack_size)
@@ -171,5 +171,5 @@ main (int argc, char *argv[])
           n_tasks,
           stack_size);
 
-  return 0;
+  ACE_NOTREACHED (return 0);
 }
diff --git a/examples/Threads/test_auto_event.cpp b/examples/Threads/test_auto_event.cpp
deleted file mode 100644
index 4f83d50db71..00000000000
--- a/examples/Threads/test_auto_event.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// $Id$
-
-// This test shows the use of an ACE_Auto_Event as a signaling
-// mechanism. Two threads are created (one a reader, the other a
-// writer). The reader waits till the writer has completed
-// calculations. Upon waking up the reader prints the data calculated
-// by the writer. The writer thread calculates the value and signals
-// the reader when the calculation completes.
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-#include "ace/Singleton.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-// Shared event between reader and writer.  The ACE_Thread_Mutex is
-// necessary to make sure that only one ACE_Auto_Event is created.
-// The default constructor for ACE_Auto_Event sets it initially into
-// the non-signaled state.
-
-typedef ACE_Singleton <ACE_Auto_Event, ACE_Thread_Mutex> EVENT;
-
-// work time for writer
-static int work_time;
-
-// Reader thread.
-static void *
-reader (void *arg)
-{
-  // Shared data via a reference.
-  int& data = *(int *) arg;
-
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  
-  // Wait for writer to complete.
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) reader: waiting...... \n"));
-
-  if (EVENT::instance ()->wait () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "thread wait failed"));
-      ACE_OS::exit (0);  
-    }
-
-  // Read shared data.
-  ACE_DEBUG ((LM_DEBUG, "(%t) reader: value of data is: %d \n", data));
-
-  return 0;
-}
-
-// Writer thread.
-static void *
-writer (void *arg)
-{
-  int& data = *(int *) arg;
-
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  
-  // Calculate (work).
-  ACE_DEBUG ((LM_DEBUG, "(%t) writer: working for %d secs\n", work_time));
-  ACE_OS::sleep (work_time);
-
-  // Write shared data.
-  data = 42;
-
-  // Wake up reader.
-  ACE_DEBUG ((LM_DEBUG, "(%t) writer: calculation complete, waking reader\n"));
-
-  if (EVENT::instance ()->signal () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "thread wait failed"));
-      ACE_OS::exit (0);  
-    }
-  
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  // Shared data: set by writer, read by reader.
-  int data;
-
-  // Work time for writer.
-  work_time = argc == 2 ? atoi (argv[1]) : 5;
-
-  // threads manager
-  ACE_Thread_Manager& tm = *ACE_Service_Config::thr_mgr ();
-
-  // Create reader thread.
-  if (tm.spawn (reader, (void *) &data) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread create for reader failed"), -1);
-  
-  // Create writer thread.
-  if (tm.spawn (writer, (void *) &data) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread create for writer failed"), -1);
-  
-  // Wait for both.
-  if (tm.wait () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread wait failed"), -1);
-  else 
-    ACE_DEBUG ((LM_ERROR, "graceful exit\n"));
-
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_barrier1.cpp b/examples/Threads/test_barrier1.cpp
deleted file mode 100644
index 6b213819ca0..00000000000
--- a/examples/Threads/test_barrier1.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// This test program illustrates how the ACE barrier synchronization
-// $Id$
-
-// mechanisms work.
-
-
-#include "ace/Synch.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Service_Config.h"
-
-#if defined (ACE_HAS_THREADS)
-
-struct Tester_Args
-  // = TITLE
-  //     These arguments are passed into each test thread.
-{
-  Tester_Args (ACE_Barrier &tb, int i)
-    : tester_barrier_ (tb), 
-      n_iterations_ (i) {}
-
-  ACE_Barrier &tester_barrier_;
-  // Reference to the tester barrier.  This controls each miteration of
-  // the tester function running in every thread.
-
-  int n_iterations_;
-  // Number of iterations to run.
-};
-
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-static void *
-tester (Tester_Args *args)
-{
-  // Keeps track of thread exit.
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-
-  for (int iterations = 1; 
-       iterations <= args->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations));
-
-      // Block until all other threads have waited, then continue.
-      args->tester_barrier_.wait ();
-    }
-
-  return 0;
-}
-
-// Default number of threads to spawn.
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon (argv[0]);
-
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  ACE_Barrier tester_barrier (n_threads);
-  
-  Tester_Args args (tester_barrier, n_iterations);
-
-  if (ACE_Service_Config::thr_mgr ()->spawn_n 
-      (n_threads, ACE_THR_FUNC (tester), 
-       (void *) &args, THR_NEW_LWP | THR_DETACHED) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1);
-
-  // Wait for all the threads to reach their exit point.
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_barrier2.cpp b/examples/Threads/test_barrier2.cpp
deleted file mode 100644
index 30190ace443..00000000000
--- a/examples/Threads/test_barrier2.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-// $Id$
-
-// generic_worker_task.cpp
-//
-// This test program illustrates how the ACE task workers/barrier
-// synchronization mechanisms work in conjunction with the ACE_Task
-// and the ACE_Thread_Manager.  The manual flag not set simulates
-// user input, if set input comes from stdin until RETURN only is
-// entered which stops all workers via a message block of length
-// 0. This is an alernative shutdown of workers compared to queue
-// deactivate.  The delay_put flag simulates a delay between the
-// shutdown puts. All should work with this flag disabled!  The
-// BARRIER_TYPE is supposed to enable/disable barrier sync on each svc
-// a worker has done.
-
-#include <iostream.h>
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-#if defined (ACE_HAS_THREADS)
-
-#define BARRIER_TYPE ACE_Null_Barrier
-//#define BARRIER_TYPE ACE_Barrier
-//#ifdef delay_put
-//#define manual
-
-template <class BARRIER>
-class Worker_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-
-  Worker_Task (ACE_Thread_Manager *thr_mgr, 
-	       int n_threads, 
-	       int inp_serialize = 1);
-  
-  virtual int Producer (void);
-  // produce input for workers
-
-  virtual int input (ACE_Message_Block *mb);
-  // Fill one message block via a certain input strategy.
-
-  virtual int output (ACE_Message_Block *mb);
-  // Forward one message block via a certain output strategy to the
-  // next task if any.
-
-  virtual int service (ACE_Message_Block *mb, int iter);
-  // Perform one message block dependant service.
-
-private:
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv=0);
-
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) {ACE_DEBUG ((LM_DEBUG,"(%t) in close of worker\n")); return 0; }
-  
-  int nt_;
-  // Number of worker threads to run.
-  int inp_serialize_;
-
-  BARRIER barrier_;
-};
-
-template <class BARRIER>
-Worker_Task<BARRIER>::Worker_Task (ACE_Thread_Manager *thr_mgr, 
-				   int n_threads, 
-				   int inp_serialize) 
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr), 
-    barrier_ (n_threads)
-{
-  nt_ = n_threads;
-  // Create worker threads.
-  inp_serialize_ = inp_serialize;
-
-  // Use the task's message queue for serialization (default) or run
-  // service in the context of the caller thread.
-
-  if (nt_ > 0 && inp_serialize == 1)
-    if (this->activate (THR_NEW_LWP, n_threads) == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-
-// Simply enqueue the Message_Block into the end of the queue.
-
-template <class BARRIER> int
-Worker_Task<BARRIER>::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
-{ 
-  int result;
-  if (this->inp_serialize_)
-    result = this->putq (mb, tv); 
-  else
-    {
-      static int iter = 0;
-      result = this->service (mb, iter++);
-
-      if (this->output (mb) < 0)
-	ACE_DEBUG ((LM_DEBUG, "(%t) output not connected!\n"));
-
-      delete mb;
-    }
-  return result;
-}
-
-template <class BARRIER> int 
-Worker_Task<BARRIER>::service (ACE_Message_Block *mb, int iter) 
-{
-  int length = mb->length ();
-
-  if (length > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,"(%t) in iteration %d len=%d text got:\n",iter,length));
-      ACE_OS::write (ACE_STDOUT, mb->rd_ptr (), length);
-      ACE_DEBUG ((LM_DEBUG,"\n"));
-    }
-  return 0;
-}
-
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-template <class BARRIER> int 
-Worker_Task<BARRIER>::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run () method automatically adds us
-  // to the Thread_Manager when the thread begins.
-
-  // Keep looping, reading a message out of the queue, until we get a
-  // message with a length == 0, which signals us to quit.
-
-  for (int iter = 1; ;iter++)
-    {       
-      ACE_Message_Block *mb = 0;
-
-      int result = this->getq (mb);
-
-      if (result == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) in iteration %d\n", "error waiting for message in iteration", iter));
-	  break;
-	}
-
-      int length = mb->length ();
-      this->service (mb,iter);
-
-      if (length == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d got quit, exit!\n", iter));
-	  delete mb;
-	  break;
-	}
-
-      this->barrier_.wait ();
-      this->output (mb);
-
-      delete mb;
-    }
-
-  // Note that the ACE_Task::svc_run () method automatically removes
-  // us from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-template <class BARRIER> int
-Worker_Task<BARRIER>::Producer (void)
-{
-  // Keep reading stdin, until we reach EOF.
-
-  for (;;)
-    {
-      // Allocate a new message.
-      ACE_Message_Block *mb = new ACE_Message_Block (BUFSIZ);
-
-      if (this->input (mb) == -1)
-	return -1;
-    }
-
-  return 0; 
-}
-
-template <class BARRIER>int
-Worker_Task<BARRIER>::output (ACE_Message_Block *mb)
-{
-  return this->put_next (mb);
-}
-
-template <class BARRIER>int
-Worker_Task<BARRIER>::input (ACE_Message_Block *mb)
-{
-  ACE_Message_Block *mb1;
-
-#ifndef manual
-  static int l= 0;
-  char str[]="kalle";
-  strcpy (mb->rd_ptr (),str);
-  int n=strlen (str);
-  if (l==1000)
-    n=1;
-  l++;
-  if (l==0 || (l%100 == 0)) ACE_OS::sleep (5);
-  if (n <= 1)
-#else
-    ACE_DEBUG ((LM_DEBUG,"(%t) press chars and enter to put a new message into task queue ...\n"));
-  if ((n = read (0, mb->rd_ptr (), mb->size ())) <= 1) 
-#endif // manual
-    {
-      // Send a shutdown message to the waiting threads and exit.
-      // cout << "\nvor loop, dump of task msg queue:\n" << endl;
-      // this->msg_queue ()->dump ();
-      for (int i=0;i<nt_;i++)
-	{
-	  ACE_DEBUG ((LM_DEBUG,"(%t) eof, sending block for thread=%d\n",i+1));
-	  mb1 = new ACE_Message_Block (2);
-	  mb1->length (0);
-	  if (this->put (mb1) == -1)
-	    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "put"));
-#ifdef delay_put
-	  ACE_OS::sleep (1); // this sleep helps to shutdown correctly -> was an error!
-#endif /* delay_put */
-	}
-      //          cout << "\nnach loop, dump of task msg queue:\n" << endl;
-      //          this->msg_queue ()->dump ();
-      return (-1);
-    }
-  else
-    {
-      // Send a normal message to the waiting threads and continue producing.
-      mb->wr_ptr (n);
-      if (this->put (mb) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "put"));
-    }
-  return 0; 
-}
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  
-  ACE_DEBUG ((LM_DEBUG,"(%t) worker threads running=%d\n",n_threads));
-
-  
-  Worker_Task<BARRIER_TYPE> *worker_task = 
-    new Worker_Task<BARRIER_TYPE> (ACE_Service_Config::thr_mgr (), 
-				   /*n_threads*/ 0,0); 
-  
-  worker_task->Producer ();
-
-  // Wait for all the threads to reach their exit point.
-  ACE_DEBUG ((LM_DEBUG,"(%t) waiting with thread manager ...\n"));
-  ACE_Service_Config::thr_mgr ()->wait ();
-  ACE_DEBUG ((LM_DEBUG,"(%t) delete worker task ...\n"));
-
-  delete worker_task;
-  ACE_DEBUG ((LM_DEBUG,"(%t) done correct!\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_cancel.cpp b/examples/Threads/test_cancel.cpp
deleted file mode 100644
index a9d12bea579..00000000000
--- a/examples/Threads/test_cancel.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// Test out the cooperative thread cancellation mechanisms provided by
-// $Id$
-
-// the ACE_Thread_Manager.
-
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-
-static void *
-worker (int iterations)
-{
-  for (int i = 0; i < iterations; i++)
-    {
-      if ((i % 10) == 0 
-	  && (ACE_Service_Config::thr_mgr ()->testcancel (ACE_Thread::self ()) != 0))
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%t) has been cancelled before iteration!\n", i));
-	  break;
-	}
-    }
-
-  return 0;
-}
-
-static const int DEFAULT_THREADS = ACE_DEFAULT_THREADS;
-static const int DEFAULT_ITERATIONS = 100000;
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon;
-
-  daemon.open (argv[0]);
-
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
-
-  int grp_id = thr_mgr->spawn_n (n_threads, ACE_THR_FUNC (worker),
-				 (void *) n_iterations,
-				 THR_NEW_LWP | THR_DETACHED);
-
-  // Wait for 2 seconds and then suspend every thread in the group.
-  ACE_OS::sleep (2);
-  thr_mgr->suspend_grp (grp_id);
-
-  // Wait for 2 more seconds and then resume every thread in the
-  // group.
-  ACE_OS::sleep (ACE_Time_Value (2));
-  thr_mgr->resume_grp (grp_id);
-
-  // Wait for 2 more seconds and then send a SIGINT to every thread in
-  // the group.
-  ACE_OS::sleep (ACE_Time_Value (2));
-  thr_mgr->kill_grp (grp_id, SIGINT);
-
-  // Wait for 2 more seconds and then exit (which should kill all the
-  // threads)!
-  ACE_OS::sleep (ACE_Time_Value (2));
-
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_future1.cpp b/examples/Threads/test_future1.cpp
deleted file mode 100644
index 79cf0a42b36..00000000000
--- a/examples/Threads/test_future1.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Test_Future.cpp
-//
-// = DESCRIPTION
-//    This example tests the ACE Future.
-//
-// = AUTHOR
-//    Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt
-//    <schmidt@cs.wustl.edu> 
-// 
-// ============================================================================
-
-#include <math.h>
-#include "ace/Task.h"
-
-#include "ace/Synch.h"
-#include "ace/Message_Queue.h"
-#include "ace/Future.h"
-#include "ace/Method_Object.h"
-#include "ace/Activation_Queue.h"
-#include "ace/Auto_Ptr.h"
-
-#if defined (ACE_HAS_THREADS)
-
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT;
-
-// a counter for the tasks..
-static ATOMIC_INT task_count (0);
-
-// a counter for the futures..
-static ATOMIC_INT future_count (0);
-static ATOMIC_INT future_no (0);
-
-// a counter for the capsules..
-static ATOMIC_INT capsule_count (0);
-static ATOMIC_INT capsule_no (0);
-
-// a counter for the method objects...
-static ATOMIC_INT methodobject_count (0);
-static ATOMIC_INT methodobject_no (0);
-
-class Scheduler : public ACE_Task<ACE_MT_SYNCH>
-  // = TITLE
-  //     Active Object Scheduler.
-{
-  friend class Method_ObjectWork;
-public:
-  Scheduler (const char *, Scheduler * = 0);
-  ~Scheduler (void);
-
-  virtual int open (void *args = 0);
-  virtual int close (u_long flags = 0);
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
-
-  ACE_Future<float> work (float param, int count);
-  ACE_Future<const char*> name (void);
-  void end (void);
-
-  float work_i (float, int);
-  const char *name_i (void);
-
-private:
-  char *name_;
-  ACE_Activation_Queue activation_queue_;
-  Scheduler *scheduler_;
-
-};
-
-class Method_Object_work : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <work> method.
-{
-public:
-  Method_Object_work (Scheduler *, float, int, ACE_Future<float> &);
-  ~Method_Object_work (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  float param_;
-  int count_;
-  ACE_Future<float> future_result_;
-};
-
-Method_Object_work::Method_Object_work (Scheduler* new_Scheduler,
-				        float new_param, 
-				        int new_count, 
-					ACE_Future<float> &new_result)
-  :   scheduler_ (new_Scheduler),
-      param_ (new_param),
-      count_ (new_count),
-      future_result_ (new_result)
-{ 
-  ACE_DEBUG ((LM_DEBUG,
-	      "(%t) Method_Object_work created\n"));
-}
-
-Method_Object_work::~Method_Object_work (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Method_Object_work will be deleted.\n"));
-}
-
-
-int
-Method_Object_work::call (void)
-{
-  return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_));
-}
-
-class Method_Object_name : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <name> method.
-{
-public:
-  Method_Object_name (Scheduler *, ACE_Future<const char*> &);
-  ~Method_Object_name (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  ACE_Future<const char*> future_result_;
-};
-
-Method_Object_name::Method_Object_name (Scheduler *new_scheduler,
-					ACE_Future<const char*> &new_result)
-  : scheduler_ (new_scheduler),
-    future_result_ (new_result)
-{
-  ACE_DEBUG ((LM_DEBUG,
-	      "(%t) Method_Object_name created\n"));
-};
-
-Method_Object_name::~Method_Object_name (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) Method_Object_name will be deleted.\n"));
-}
-
-int
-Method_Object_name::call (void)
-{
-  return future_result_.set (scheduler_->name_i ());
-}
-
-class Method_Object_end : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <end> method.
-{
-public:
-  Method_Object_end (Scheduler *new_Scheduler): scheduler_ (new_Scheduler) {}
-  ~Method_Object_end (void) {}
-  virtual int call (void) { this->scheduler_->close (); return -1; }
-
-private:
-  Scheduler *scheduler_;
-};
-
-// constructor
-Scheduler::Scheduler (const char *newname, Scheduler *new_Scheduler)
-{
-  ACE_NEW (this->name_, char[ACE_OS::strlen (newname) + 1]);
-  ACE_OS::strcpy ((char *) this->name_, newname);
-  this->scheduler_ = new_Scheduler;
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s created\n", this->name_));
-}
-
-// Destructor
-Scheduler::~Scheduler (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s will be destroyed\n", this->name_));
-}
-
-// open
-int 
-Scheduler::open (void *)
-{
-  task_count++;
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s open\n", this->name_));
-  return this->activate (THR_BOUND);
-}
-
-// close
-int 
-Scheduler::close (u_long)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s close\n", this->name_));
-  task_count--;
-  return 0;
-}
-
-// put... ??
-int 
-Scheduler::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  return 0;
-}
-
-// service..
-int 
-Scheduler::svc (void)
-{
-  for (;;) 
-    {
-      // Dequeue the next method object (we use an auto pointer in
-      // case an exception is thrown in the <call>).
-      ACE_Auto_Ptr<ACE_Method_Object> mo (this->activation_queue_.dequeue ());
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) calling method object\n"));
-      // Call it.
-      if (mo->call () == -1)
-	break;
-      // Destructor automatically deletes it.
-    }
-
-  /* NOTREACHED */
-  return 0;
-}
-
-void 
-Scheduler::end (void)
-{
-  this->activation_queue_.enqueue (new Method_Object_end (this));
-}
-
-
-// Here's where the Work takes place.
-float 
-Scheduler::work_i (float param, 
-		   int count)
-{
-  float x = 0, y = 0;
-  
-  // @@ We should probably do something fun here, like compute the
-  // Fibonacci sequence or something.
-
-  for (int j = 0; j < count; j++) 
-    {
-      x = x + param;
-      y = y + ::sin (x);
-    }
-
-  return y;
-}
-
-const char *
-Scheduler::name_i (void)
-{
-  char *the_name;
-
-  the_name = new char[ACE_OS::strlen (this->name_) + 1];
-  ACE_OS::strcpy (the_name, this->name_);
-
-  return the_name;
-}
-
-ACE_Future<const char *> 
-Scheduler::name (void)
-{
-  if (this->scheduler_) 
-    // Delegate to the Scheduler.
-    return this->scheduler_->name ();
-  else 
-    {
-      ACE_Future<const char*> new_future;
-
-      // @@ What happens if new fails here?
-      this->activation_queue_.enqueue 
-	(new Method_Object_name (this, new_future));
-
-      return new_future;
-    }
-}
-
-ACE_Future<float> 
-Scheduler::work (float newparam, int newcount)
-{
-  if (this->scheduler_) {
-    return this->scheduler_->work (newparam, newcount);
-  }
-  else {
-    ACE_Future<float> new_future;
-
-    this->activation_queue_.enqueue
-      (new Method_Object_work (this, newparam, newcount, new_future));
-    return new_future;
-  }
-}
-
-// @@ These values should be set by the command line options!
-
-// Total number of iterations to <work>
-static int n_iterations = 50000;
-
-// Total number of loops.
-static int n_loops = 100;
-
-int
-main (int, char *[]) 
-{
-  Scheduler *andres, *peter, *helmut, *matias;
-
-  // Create active objects..  
-  // @@ Should "open" be subsumed within the constructor of
-  // Scheduler()?
-  andres = new Scheduler ("andres");
-  andres->open ();
-  peter = new Scheduler ("peter");
-  peter->open ();
-  helmut = new Scheduler ("helmut");
-  helmut->open ();
-
-  // Matias passes all asynchronous method calls on to Andres...
-  matias = new Scheduler ("matias", andres);
-  matias->open ();
-
-  for (int i = 0; i < n_loops; i++) 
-    {
-      {
-	ACE_Future<float> fresulta, fresultb, fresultc, fresultd, fresulte;
-	ACE_Future<const char*> fname;
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) going to do a non-blocking call\n"));
-
-	fresulta = andres->work (0.01, 100 + (n_iterations * (i % 2)));
-	fresultb = peter->work (0.01, 100 + (n_iterations * (i % 2)));
-	fresultc = helmut->work (0.01, 100 + (n_iterations * (i % 2)));
-	fresultd = matias->work (0.02, 100 + (n_iterations * (i % 2)));
-	fname = andres->name ();
-
-	// see if the result is available...
-	if (fresulta.ready ())
-	  ACE_DEBUG ((LM_DEBUG, "(%t) wow.. work is ready.....\n"));
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) non-blocking call done... now blocking...\n"));
-
-	// Save the result of fresulta.
-
-	fresulte = fresulta;
-
-	if (i % 3 == 0) 
-	  {
-	    // Every 3rd time... disconnect the futures...
-	    // but "fresulte" should still contain the result...
-	    fresulta.cancel (10.0);
-	    fresultb.cancel (20.0);
-	    fresultc.cancel (30.0);
-	    fresultd.cancel (40.0);
-	  }
-
-	float resulta = 0, resultb = 0, resultc = 0, resultd = 0, resulte = 0;
-
-	fresulta.get (resulta);
-	fresultb.get (resultb);
-	fresultc.get (resultc);
-	fresultd.get (resultd);
-	fresulte.get (resulte);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) result a %f\n", resulte));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result b %f\n", resulta));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result c %f\n", resultb));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result d %f\n", resultc));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result e %f\n", resultd));
-
-	const char *name;
-
-	fname.get (name);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) name %s\n", name));
-
-      }
-
-      ACE_DEBUG ((LM_DEBUG,
-		  "(%t) task_count %d future_count %d capsule_count %d methodobject_count %d\n",
-		  (u_long) task_count,
-		  (u_long) future_count,
-		  (u_long) capsule_count,
-		  (u_long) methodobject_count));
-    }
-
-  // Close things down.
-  andres->end ();
-  peter->end ();
-  helmut->end ();
-  matias->end ();
-
-  ACE_OS::sleep (2);
-  
-  ACE_DEBUG ((LM_DEBUG,
-	      "(%t) task_count %d future_count %d capsule_count %d methodobject_count %d\n",
-	      (u_long) task_count,
-	      (u_long) future_count,
-	      (u_long) capsule_count,
-	      (u_long) methodobject_count));
-
-  ACE_DEBUG ((LM_DEBUG,"(%t) th' that's all folks!\n"));
-
-  ACE_OS::sleep (5);
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_future2.cpp b/examples/Threads/test_future2.cpp
deleted file mode 100644
index 19431072202..00000000000
--- a/examples/Threads/test_future2.cpp
+++ /dev/null
@@ -1,524 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Test_Future.cpp
-//
-// = DESCRIPTION
-//    This example tests the ACE Future.
-//
-// = AUTHOR
-//    Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt
-//    <schmidt@cs.wustl.edu> 
-//
-// Modification History
-// Aug. 96; A.Kruse; dev.
-// Aug. 96; D.Schmidt; complete workover
-// 08/27/96; A.Kruse; - the friends of Scheduler are "Method_Object_name"
-//                      and "Method_Object_work".
-//                    - make the methods "work_i" and "name_i" private
-// 09/2/96; D.Schmidt; Integrate with new ACE_Future API and rearrange
-//                     the tests so they are more modular.
-// ============================================================================
-
-#include <math.h>
-#include "ace/Task.h"
-
-#include "ace/Synch.h"
-#include "ace/Message_Queue.h"
-#include "ace/Future.h"
-#include "ace/Method_Object.h"
-#include "ace/Activation_Queue.h"
-#include "ace/Auto_Ptr.h"
-
-#if defined (ACE_HAS_THREADS)
-
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT;
-
-// a counter for the tasks..
-static ATOMIC_INT scheduler_open_count (0);
-
-// forward declarations
-class Method_Object_work;
-class Method_Object_name;
-
-class Scheduler : public ACE_Task<ACE_MT_SYNCH>
-  // = TITLE
-  //     Active Object Scheduler.
-{
-  // Every method object has to be able to access the private methods.
-
-  friend class Method_Object_work; 
-  friend class Method_Object_name;
-  friend class Method_Object_end;
-public:
-
-  Scheduler (const char *, Scheduler * = 0);
-  ~Scheduler (void);
-
-  virtual int open (void *args = 0);
-  // The method that is used to start the active object.
-
-  // = Here are the methods exported by the class. They return an
-  // <ACE_Future>.
-  ACE_Future<float> work (float param, int count);
-  ACE_Future<char*> name (void);
-  void end (void);
-
-private:
-  virtual int close (u_long flags = 0);
-  // Should not be accessible from outside...  (use end () instead).
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0)
-    { return 0; };
-  // Doesn't have any use for this example.
-
-  virtual int svc (void);
-  // Here the actual servicing of all requests is happening..
-
-  // = Implementation methods.
-  float work_i (float, int);
-  char *name_i (void);
-
-  char *name_;
-  ACE_Activation_Queue activation_queue_;
-  Scheduler *scheduler_;
-};
-
-class Method_Object_work : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <work> method.
-{
-public:
-  Method_Object_work (Scheduler *, float, int, ACE_Future<float> &);
-  ~Method_Object_work (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  float param_;
-  int count_;
-  ACE_Future<float> future_result_;
-};
-
-Method_Object_work::Method_Object_work (Scheduler* new_Scheduler,
-				        float new_param, 
-				        int new_count, 
-					ACE_Future<float> &new_result)
-  : scheduler_ (new_Scheduler),
-    param_ (new_param),
-    count_ (new_count),
-    future_result_ (new_result)
-{ 
-}
-
-Method_Object_work::~Method_Object_work (void)
-{
-}
-
-int
-Method_Object_work::call (void)
-{
-  return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_));
-}
-
-class Method_Object_name : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <name> method.
-{
-public:
-  Method_Object_name (Scheduler *, ACE_Future<char*> &);
-  ~Method_Object_name (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  ACE_Future<char*> future_result_;
-};
-
-
-Method_Object_name::Method_Object_name (Scheduler *new_scheduler,
-					ACE_Future<char*> &new_result)
-  : scheduler_ (new_scheduler),
-    future_result_ (new_result)
-{
-  ACE_DEBUG ((LM_DEBUG,
-	      " (%t) Method_Object_name created\n"));
-};
-
-Method_Object_name::~Method_Object_name (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      " (%t) Method_Object_name will be deleted.\n"));
-}
-
-int
-Method_Object_name::call (void)
-{
-  return future_result_.set (scheduler_->name_i ());
-}
-
-class Method_Object_end : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <end> method.
-{
-public:
-  Method_Object_end (Scheduler *new_Scheduler): scheduler_ (new_Scheduler) {}
-  ~Method_Object_end (void) {}
-  virtual int call (void) { this->scheduler_->close (); return -1; }
-
-private:
-  Scheduler *scheduler_;
-};
-
-// constructor
-Scheduler::Scheduler (const char *newname, Scheduler *new_Scheduler)
-{
-  ACE_NEW (this->name_, char[ACE_OS::strlen (newname) + 1]);
-  ACE_OS::strcpy ((char *) this->name_, newname);
-  this->scheduler_ = new_Scheduler;
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s created\n", this->name_));
-}
-
-// Destructor
-Scheduler::~Scheduler (void)
-{
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s will be destroyed\n", this->name_));
-}
-
-int 
-Scheduler::open (void *)
-{
-  scheduler_open_count++;
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s open\n", this->name_));
-  return this->activate (THR_BOUND);
-}
-
-int 
-Scheduler::close (u_long)
-{
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s close\n", this->name_));
-  scheduler_open_count--;
-  return 0;
-}
-
-int 
-Scheduler::svc (void)
-{
-  // Main event loop for this active object.
-  for (;;) 
-    {
-      // Dequeue the next method object (we use an auto pointer in
-      // case an exception is thrown in the <call>).
-      ACE_Auto_Ptr<ACE_Method_Object> mo (this->activation_queue_.dequeue ());
-
-      ACE_DEBUG ((LM_DEBUG, " (%t) calling method object\n"));
-      // Call it.
-      if (mo->call () == -1)
-	break;
-      // Smart pointer destructor automatically deletes mo.
-    }
-
-  /* NOTREACHED */
-  return 0;
-}
-
-void 
-Scheduler::end (void)
-{
-  this->activation_queue_.enqueue (new Method_Object_end (this));
-}
-
-// Here's where the Work takes place.
-float 
-Scheduler::work_i (float param, 
-		   int count)
-{
-  float x = 0, y = 0;
-  
-  for (int j = 0; j < count; j++) 
-    {
-      x = x + param;
-      y = y + ::sin (x);
-    }
-
-  return y;
-}
-
-char *
-Scheduler::name_i (void)
-{
-  char *the_name;
-
-  the_name = new char[ACE_OS::strlen (this->name_) + 1];
-  ACE_OS::strcpy (the_name, this->name_);
-
-  return the_name;
-}
-
-ACE_Future<char *> 
-Scheduler::name (void)
-{
-  if (this->scheduler_) 
-    // Delegate to the other scheduler
-    return this->scheduler_->name ();
-  else 
-    {
-      ACE_Future<char*> new_future;
-
-      if (this->thr_count () == 0) 
-	{
-	  // This scheduler is inactive... so we execute the user
-	  // request right away...
-	
-	  ACE_Auto_Ptr<ACE_Method_Object> mo (new Method_Object_name (this, new_future));
-
-	  mo->call ();
-	  // Smart pointer destructor automatically deletes mo.
-	}
-      else
-	// @@ What happens if new fails here?
-	this->activation_queue_.enqueue
-	  (new Method_Object_name (this, new_future));
-	
-      return new_future;
-    }
-}
-
-ACE_Future<float> 
-Scheduler::work (float newparam, int newcount)
-{
-  if (this->scheduler_) 
-    return this->scheduler_->work (newparam, newcount);
-  else 
-    {
-      ACE_Future<float> new_future;
-
-      if (this->thr_count () == 0) 
-	{
-	  ACE_Auto_Ptr<ACE_Method_Object> mo 
-	    (new Method_Object_work (this, newparam, newcount, new_future));
-	  mo->call ();
-	  // Smart pointer destructor automatically deletes it.
-	}
-      else
-	this->activation_queue_.enqueue
-	  (new Method_Object_work (this, newparam, newcount, new_future));
-
-      return new_future;
-    }
-}
-
-static int 
-determine_iterations (void)
-{
-  int n_iterations;
-
-  ACE_DEBUG ((LM_DEBUG," (%t) determining the number of iterations...\n"));
-  Scheduler *worker_a = new Scheduler ("worker A");
-
-  ACE_Time_Value tstart (ACE_OS::gettimeofday ());
-  ACE_Time_Value tend (ACE_OS::gettimeofday ());
-
-  // Determine the number of iterations... we want so many that the
-  // work () takes about 1 second...
-
-  for (n_iterations = 1;
-       (tend.sec () - tstart.sec ()) < 1;
-       n_iterations *= 2)
-    {
-      tstart = ACE_OS::gettimeofday ();
-
-      worker_a->work (0.1, n_iterations);
-
-      tend = ACE_OS::gettimeofday ();
-    }
-
-  ACE_DEBUG ((LM_DEBUG," (%t) n_iterations %d\n", 
-	      (u_long) n_iterations));
-
-  worker_a->end ();
-  // @@ Can we safely delete worker_a here?
-  return n_iterations;
-}
-
-static void
-test_active_object (int n_iterations)
-{
-  ACE_DEBUG ((LM_DEBUG," (%t) testing active object pattern...\n"));
-  // A simple example for the use of the active object pattern and
-  // futures to return values from an active object.
-
-  Scheduler *worker_a = new Scheduler ("worker A");
-  Scheduler *worker_b = new Scheduler ("worker B");
-
-  // Have worker_c delegate his work to worker_a.
-  Scheduler *worker_c = new Scheduler ("worker C", worker_a);
-
-  // loop 0:
-  // test the Schedulers when they are not active.
-  // now the method objects will be created but since
-  // there is no active thread they will also be
-  // immediately executed, in the "main" thread.
-  // loop 1:
-  // do the same test but with the schedulers
-  // activated
-  for (int i = 0; i < 2; i++)
-    {
-      if (i == 1) 
-	{
-	  worker_a->open ();
-	  worker_b->open ();
-	  worker_c->open ();
-	}
-
-      ACE_Future<float> fresulta = worker_a->work (0.01, n_iterations);
-      ACE_Future<float> fresultb = worker_b->work (0.02, n_iterations);
-      ACE_Future<float> fresultc = worker_c->work (0.03, n_iterations);
-
-      if (i == 0) 
-	{
-	  if (!fresulta.ready ())
-	    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker A is should be ready!!!\n"));
-	  if (!fresultb.ready ())
-	    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker B is should be ready!!!\n"));
-	  if (!fresultc.ready ())
-	    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker C is should be ready!!!\n"));
-	}
-
-      // When the workers are active we will block here until the
-      // results are available.
-
-      float resulta = fresulta;
-      float resultb = fresultb;
-      float resultc = fresultc;
-
-      ACE_Future<char *> fnamea = worker_a->name ();
-      ACE_Future<char *> fnameb = worker_b->name ();
-      ACE_Future<char *> fnamec = worker_c->name ();
-
-      char *namea = fnamea;
-      char *nameb = fnameb;
-      char *namec = fnamec;
-
-      ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n",
-		  namea, resulta));
-      ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n",
-		  nameb, resultb));
-      ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n",
-		  namec, resultc));
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d before end ()\n",
-	      (u_long) scheduler_open_count));
-
-  worker_a->end ();
-  worker_b->end ();
-  worker_c->end ();
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d immediately after end ()\n",
-	      (u_long) scheduler_open_count));
-
-  ACE_OS::sleep (2);
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d after waiting\n",
-	      (u_long) scheduler_open_count));
-  // @@ Can we safely delete worker_a, worker_b, and worker_c?
-}
-
-static void
-test_cancellation (int n_iterations)
-{
-  ACE_DEBUG ((LM_DEBUG," (%t) testing cancellation of a future...\n"));
-
-  // Now test the cancelling a future.
-
-  Scheduler *worker_a = new Scheduler ("worker A");
-  worker_a->open ();
-
-  ACE_Future<float> fresulta = worker_a->work (0.01, n_iterations);
-
-  // save the result by copying the future
-  ACE_Future<float> fresultb = fresulta;
-
-  // now we cancel the first future.. but the
-  // calculation will still go on...
-  fresulta.cancel (10.0);
-
-  if (!fresulta.ready ())
-    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: future A is should be ready!!!\n"));
-
-  float resulta = fresulta;
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) cancelled result %f\n", resulta));
-
-  if (resulta != 10.0)
-    ACE_DEBUG ((LM_DEBUG, " (%t) cancelled result should be 10.0!!\n", resulta));
-
-  resulta = fresultb;
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) true result %f\n", resulta));
-
-  worker_a->end ();
-  // @@ Can we safely delete worker_a here?
-}
-
-static void
-test_timeout (int n_iterations)
-{
-  ACE_DEBUG ((LM_DEBUG," (%t) testing timeout on waiting for the result...\n"));
-  Scheduler *worker_a = new Scheduler ("worker A");
-  worker_a->open ();
-
-  ACE_Future<float> fresulta = worker_a->work (0.01, 2 * n_iterations);
-
-  // Should immediately return... and we should see an error...
-  ACE_Time_Value *delay = new ACE_Time_Value (1);
-
-  float resulta;
-  fresulta.get (resulta, delay);
-
-  if (fresulta.ready ())
-    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: future A is should not be ready!!!\n"));
-  else
-    ACE_DEBUG ((LM_DEBUG," (%t) timed out on future A\n"));
-
-  // now we wait until we are done...
-  fresulta.get (resulta);
-  ACE_DEBUG ((LM_DEBUG, " (%t) result %f\n", resulta));
-
-  worker_a->end ();
-  // @@ Can we safely delete worker_a here?
-}
-
-int
-main (int, char *[]) 
-{
-  int n_iterations = determine_iterations ();
-
-  test_active_object (n_iterations);
-  test_cancellation (n_iterations);
-  test_timeout (n_iterations);
-
-  ACE_DEBUG ((LM_DEBUG," (%t) that's all folks!\n"));
-
-  ACE_OS::sleep (5);
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_manual_event.cpp b/examples/Threads/test_manual_event.cpp
deleted file mode 100644
index 26d477fabc0..00000000000
--- a/examples/Threads/test_manual_event.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// The test shows the use of an ACE_Manual_Event to create a
-// $Id$
-
-// Pseudo_Barrier. Multiple threads are created which do the
-// following:
-//
-//	1. work 
-//	2. synch with other threads
-//	3. more work
-// 
-// ACE_Manual_Event is use to synch with other
-// threads. ACE_Manual_Event::signal() is used for broadcasting.
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-static ACE_Atomic_Op <ACE_Thread_Mutex, u_long> amount_of_work = (u_long) 0;
-
-class Pseudo_Barrier
-  // = TITLE
-  //    A barrier class using ACE manual-reset events.
-  //
-  // = DESCRIPTION
-  //    This is *not* a real barrier. 
-  //    Pseudo_Barrier is more like a ``one shot'' barrier.
-  //    All waiters after the Nth waiter are allowed to go. 
-  //    The barrier does not reset after the Nth waiter.
-  //    For an example of a real barrier, please see class ACE_Barrier.
-{
-public:
-  Pseudo_Barrier (u_long count);
-
-  int wait (void);
-
-private: 
-  ACE_Atomic_Op <ACE_Thread_Mutex, u_long> counter_; 
-  ACE_Manual_Event event_;
-};
-
-Pseudo_Barrier::Pseudo_Barrier (u_long count)
-  : counter_ (count)
-{
-}
-
-int 
-Pseudo_Barrier::wait (void)
-{
-  if (--this->counter_ == 0)
-    return this->event_.signal ();
-  else 
-    return this->event_.wait ();
-}
-
-static void *
-worker (void *arg)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  Pseudo_Barrier &barrier = *(Pseudo_Barrier *) arg;
-  
-  // work
-  ACE_DEBUG ((LM_DEBUG, "(%t) working (%d secs)\n", ++::amount_of_work));
-  ACE_OS::sleep (::amount_of_work);
-
-  // synch with everybody else
-  ACE_DEBUG ((LM_DEBUG, "(%t) waiting to synch with others \n"));
-  barrier.wait ();
-
-  // more work
-  ACE_DEBUG ((LM_DEBUG, "(%t) more work (%d secs)\n", ++::amount_of_work));
-  ACE_OS::sleep (amount_of_work);
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) dying \n"));
-
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  int n_threads = argc == 2 ? atoi (argv[1]) : 5;
-
-  ACE_Thread_Manager &tm = *ACE_Service_Config::thr_mgr ();
-  
-  // synch object shared by all threads
-  Pseudo_Barrier barrier (n_threads);
-
-  // create workers
-  if (tm.spawn_n (n_threads, worker, &barrier) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread creates for worker failed"), -1);
-
-  // wait for all workers to exit
-  if (tm.wait () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread wait failed"), -1);
-  else 
-    ACE_DEBUG ((LM_ERROR, "graceful exit\n"));
-
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_process_mutex.cpp b/examples/Threads/test_process_mutex.cpp
deleted file mode 100644
index fb23c8b73be..00000000000
--- a/examples/Threads/test_process_mutex.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Id$
-
-// This program tests ACE_Process_Mutexes.  To run it, open 3 or 4
-// windows and run this program in each window...
-
-#include "ace/Synch.h"
-#include "ace/Signal.h"
-
-#if defined (ACE_HAS_THREADS)
-
-static sig_atomic_t done;
-
-extern "C" void 
-handler (int)
-{
-  done = 1;
-}
-
-int
-main (int argc, char *argv[])
-{
-  char *name = argc > 1 ? argv[1] : "hello";
-  int iterations =  argc > 2 ? ACE_OS::atoi (argv[2]) : 100;
-
-  ACE_Process_Mutex pm (name);
-
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
-
-  for (int i = 0; i < iterations && !done; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquiring\n"));
-      if (pm.acquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "acquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquired\n"));
-
-      ACE_OS::sleep (3);
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-
-      if (pm.tryacquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "tryacquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = tryacquire\n"));
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-    }
-
-  if (argc > 2)
-    pm.remove ();
-  return 0;
-}
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support threads on this platform (yet)\n"),
-		    -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_process_semaphore.cpp b/examples/Threads/test_process_semaphore.cpp
deleted file mode 100644
index d7933897f8e..00000000000
--- a/examples/Threads/test_process_semaphore.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// $Id$
-
-// This program tests ACE_Process_Semaphore.  To run it, open 3 or 4
-// windows and run this program in each window...
-
-#include "ace/Synch.h"
-#include "ace/Signal.h"
-
-static sig_atomic_t done;
-
-extern "C" void
-handler (int)
-{
-  done = 1;
-}
-
-int
-main (int argc, char *argv[])
-{
-  char *name = argc == 1 ? "hello" : argv[1];
-
-  ACE_Process_Semaphore pm (1, name);
-
-  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
-
-  for (int i = 0; i < 100 && !done; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquiring\n"));
-      if (pm.acquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "acquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquired\n"));
-
-      ACE_OS::sleep (3);
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-
-      if (pm.tryacquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "tryacquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = tryacquire\n"));
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-    }
-
-  if (argc > 2)
-    pm.remove ();
-  return 0;
-}
-
diff --git a/examples/Threads/test_reader_writer.cpp b/examples/Threads/test_reader_writer.cpp
deleted file mode 100644
index ef888133d83..00000000000
--- a/examples/Threads/test_reader_writer.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-// This test program verifies the functionality of the ACE_OS
-// $Id$
-
-// implementation of readers/writer locks on Win32 and Posix pthreads.
-
-
-#include "ace/Synch.h"
-#include "ace/Thread.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Default number of iterations.
-static size_t n_iterations = 1000;
-
-// Default number of loops.
-static size_t n_loops = 100;
-
-// Default number of readers.
-static size_t n_readers = 6;
-
-// Default number of writers.
-static size_t n_writers = 2;
-
-// Thread id of last writer.
-volatile static int shared_data;  
-
-// Lock for shared_data.
-static ACE_RW_Mutex rw_mutex;     
-
-// Count of the number of readers and writers.
-ACE_Atomic_Op<ACE_Thread_Mutex, int> current_readers, current_writers;
-
-// Thread manager
-static ACE_Thread_Manager thr_mgr;
-
-// Explain usage and exit.
-static void 
-print_usage_and_die (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "usage: %n [-r n_readers] [-w n_writers] [-n iteration_count]\n"));
-  ACE_OS::exit (1);
-}
-
-// Parse the command-line arguments and set options.
-static void
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "r:w:n:l:");
-
-  int c; 
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-    {
-    case 'r':
-      n_readers = ACE_OS::atoi (get_opt.optarg);
-      break;
-    case 'w':
-      n_writers = ACE_OS::atoi (get_opt.optarg);
-      break;
-    case 'n':
-      n_iterations = ACE_OS::atoi (get_opt.optarg);
-      break;
-    case 'l':
-      n_loops = ACE_OS::atoi (get_opt.optarg);
-      break;
-    default:
-      print_usage_and_die ();
-      break;
-  }
-}
-
-// Iterate <n_iterations> each time checking that nobody modifies the data
-// while we have a read lock.
-
-static void *
-reader (void *)
-{
-  ACE_Thread_Control tc (&thr_mgr);
-  ACE_DEBUG ((LM_DEBUG, "(%t) reader starting\n"));
-  
-  for (int iterations = 1; iterations <= n_iterations; iterations++)
-    {
-      ACE_Read_Guard<ACE_RW_Mutex> g(rw_mutex);
-      int n = ++current_readers;
-      //ACE_DEBUG ((LM_DEBUG, "(%t) I'm reader number %d\n", n));
-
-      if (current_writers > 0)
-        ACE_DEBUG ((LM_DEBUG, "(%t) writers found!!!\n"));
-	
-      int data = shared_data;
-
-      for (int loop = 1; loop <= n_loops; loop++)
-        {
-	  ACE_Thread::yield();
-	  if (shared_data != data)
-            ACE_DEBUG ((LM_DEBUG, 
-			"(%t) somebody changed %d to %d\n", 
-			data, shared_data));
-        }
-
-      --current_readers;
-      //ACE_DEBUG ((LM_DEBUG, "(%t) done with reading guarded data\n"));
-
-      ACE_Thread::yield ();
-    }
-  return 0;
-}
-
-// Iterate <n_iterations> each time modifying the global data
-// and checking that nobody steps on it while we can write it.
-
-static void *
-writer (void *)
-{
-  ACE_Thread_Control tc (&thr_mgr);
-  ACE_DEBUG ((LM_DEBUG, "(%t) writer starting\n"));
-  
-  for (int iterations = 1; iterations <= n_iterations; iterations++)
-    {
-      ACE_Write_Guard<ACE_RW_Mutex> g(rw_mutex);
-
-      ++current_writers;
-      //ACE_DEBUG ((LM_DEBUG, "(%t) writing to guarded data\n"));
-
-      if (current_writers > 1)
-        ACE_DEBUG ((LM_DEBUG, "(%t) other writers found!!!\n"));
-
-      if (current_readers > 0)
-        ACE_DEBUG ((LM_DEBUG, "(%t) readers found!!!\n"));
-	
-      int self = (int) ACE_Thread::self ();
-      shared_data = self;
-
-      for (int loop = 1; loop <= n_loops; loop++)
-        {
-	  ACE_Thread::yield();
-	  if (shared_data != self)
-            ACE_DEBUG ((LM_DEBUG, "(%t) somebody wrote on my data %d\n", shared_data));
-        }
-
-      --current_writers;
-
-      //ACE_DEBUG ((LM_DEBUG, "(%t) done with guarded data\n"));
-      ACE_Thread::yield ();
-    }
-  return 0;
-}
-
-// Spawn off threads.
-
-int main (int argc, char *argv[])
-{
-  ACE_LOG_MSG->open (argv[0]);
-  parse_args (argc, argv);
-
-  current_readers = 0; // Possibly already done
-  current_writers = 0; // Possibly already done
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) main thread starting\n"));
-
-  if (thr_mgr.spawn_n (n_readers, reader, 0, THR_NEW_LWP) == -1 ||
-      thr_mgr.spawn_n (n_writers, writer, 0, THR_NEW_LWP) == -1)
-     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1);
-
-  thr_mgr.wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) exiting main thread\n"));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
-
diff --git a/examples/Threads/test_recursive_mutex.cpp b/examples/Threads/test_recursive_mutex.cpp
deleted file mode 100644
index 1cc2892b2a8..00000000000
--- a/examples/Threads/test_recursive_mutex.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// $Id$
-
-// This test program verifies the functionality of the ACE_OS
-// implementation of recursive mutexes on Win32 and Posix pthreads.
-
-#include "ace/Service_Config.h"
-#include "ace/Get_Opt.h"
-#include "ace/Synch.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Total number of iterations.
-static size_t n_iterations = 1000;
-static size_t n_threads = 4;
-
-// Explain usage and exit.
-static void 
-print_usage_and_die (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "usage: %n [-t n_threads] [-n iteration_count]\n"));
-  ACE_OS::exit (1);
-}
-
-// Parse the command-line arguments and set options.
-
-static void
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "n:t:");
-
-  int c; 
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'n':
-	n_iterations = ACE_OS::atoi (get_opt.optarg);
-	break;
-      case 't':
-	n_threads = ACE_OS::atoi (get_opt.optarg);
-	break;
-      default:
-	print_usage_and_die ();
-	break;
-      }
-}
-
-static void
-recursive_worker (size_t nesting_level, 
-		  ACE_Recursive_Thread_Mutex *rm)
-{
-  if (nesting_level < n_iterations)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%P|%t) = trying to acquire, nesting = %d, thread id = %u\n",
-		  rm->get_nesting_level (), rm->get_thread_id ()));
-      {
-	// This illustrates the use of the ACE_Guard<LOCK> with an
-	// ACE_Recursive_Thread_Mutex.
-	ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *rm);
-	ACE_DEBUG ((LM_DEBUG,
-		    "(%P|%t) = acquired, nesting = %d, thread id = %u\n",
-		    rm->get_nesting_level (), rm->get_thread_id ()));
-
-	recursive_worker (nesting_level + 1, rm);
-      }
-      ACE_DEBUG ((LM_DEBUG,
-      		  "(%P|%t) = released, nesting = %d, thread id = %u\n",
-		  rm->get_nesting_level (), rm->get_thread_id ()));
-    }
-}
-
-static void *
-worker (void *arg)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-
-  ACE_Recursive_Thread_Mutex *rm = (ACE_Recursive_Thread_Mutex *) arg;
-
-  recursive_worker (0, rm);
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon (argv[0]);
-
-  parse_args (argc, argv);
-  ACE_Recursive_Thread_Mutex rm;
-
-  ACE_Service_Config::thr_mgr ()->spawn_n (n_threads, 
-					   ACE_THR_FUNC (worker), 
-					   (void *) &rm);
-
-  ACE_Service_Config::thr_mgr ()->wait ();
-  return 0;
-}
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support process mutexes on this platform (yet)\n"), 
-		    -1);
-}
-#endif /* ACE_WIN32 */
diff --git a/examples/Threads/test_task.cpp b/examples/Threads/test_task.cpp
deleted file mode 100644
index 7cd7976d2bb..00000000000
--- a/examples/Threads/test_task.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// This test program illustrates how the ACE barrier synchronization
-// $Id$
-
-// mechanisms work in conjunction with the ACE_Task and the
-// ACE_Thread_Manager.  It is instructive to compare this with the
-// test_barrier.cpp test to see how they differ.
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-#include "ace/Log_Msg.h"
-
-#if defined (ACE_HAS_THREADS)
-
-#include "ace/Task.h"
-
-class Barrier_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Barrier_Task (ACE_Thread_Manager *thr_mgr,
-		int n_threads, 
-		int n_iterations);
-  
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-private:
-  ACE_Barrier barrier_;
-  // Reference to the tester barrier.  This controls each
-  // iteration of the tester function running in every thread.
-
-  int n_iterations_;
-  // Number of iterations to run.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, 
-			    int n_threads, 
-			    int n_iterations)
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr), 
-    barrier_ (n_threads), 
-    n_iterations_ (n_iterations) 
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Barrier_Task::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run() method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  for (int iterations = 1; 
-       iterations <= this->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations));
-
-      // Block until all other threads have waited, then continue.
-      this->barrier_.wait ();
-    }
-
-  // Note that the ACE_Task::svc_run() method automatically removes us
-  // from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-// Default number of threads to spawn.
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  Barrier_Task barrier_task (ACE_Service_Config::thr_mgr (), 
-			     n_threads, 
-			     n_iterations);
-
-  // Wait for all the threads to reach their exit point.
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_four.cpp b/examples/Threads/test_task_four.cpp
deleted file mode 100644
index 64209cb3430..00000000000
--- a/examples/Threads/test_task_four.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-// $Id$
-
-// The following test was written by Hamutal Yanay & Ari Erev's
-// (Ari_Erev@comverse.com). 
-//
-// This test program test enhancements to the thread_manager and task
-// classes.  The purpose of these enhancements was to allow the
-// thread_manager to recognize the concept of an ACE_Task and to be
-// able to group ACE_Tasks in groups.
-//
-// There are two main ACE_Tasks in this sample:
-//
-// Invoker_Task - is run from main (). It's purpose is to run a number of 
-//                ACE_Tasks of type Worker_Task. The number can be specified
-//                on the command line.
-//                After starting the tasks, the Invoker_Task groups all the tasks
-//                in one group and then uses the
-//                num_tasks_in_group () to find out if the real number of tasks
-//                that are now running (should be the same as the number of tasks
-//                started).
-//                It also, suspends and resumes all the threads in the group to
-//                test the suspend_grp () and resume_grp () methods.
-//                Then it waits for all the tasks to end.
-// Worker_Task  - ACE_Tasks that are started by the Invoker_Task.
-//                Each Worker_Task can start a number of threads.
-//                The Worker_Task threads perform some work (iteration). The number
-//                of the iterations can be specified on the command line.
-//
-// The command line syntax is:
-//
-// test_task   [num_tasks] [num_threads] [num_iterations]
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-
-#if defined (ACE_HAS_THREADS)
-
-#include "ace/Task.h"
-
-class Invoker_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Invoker_Task (ACE_Thread_Manager *thr_mgr,
-		int n_tasks,
-		int n_threads,
-		int n_iterations);
-  virtual int svc (void);
-  // creats <n_tasks> and wait for them to finish
-
-private:
-  int n_tasks_;
-  // Number of tasks to start.
-  int n_threads_;
-  // Number of threads per task.
-  int n_iterations_;
-  // Number of iterations per thread.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-class Worker_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Worker_Task (ACE_Thread_Manager *thr_mgr,
-	       int n_threads,
-	       int n_iterations);  
-  virtual int svc (void);
-  // Does a small work...
-  virtual int open (void * = NULL);
-private:
-  static int workers_count_;
-  int index_;
-  int n_threads_;
-  int n_iterations_;
-
-  // = Not needed for this test.
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-int Worker_Task::workers_count_ = 1;
-
-Worker_Task::Worker_Task (ACE_Thread_Manager *thr_mgr, 
-                          int n_threads,
-                          int n_iterations)
-  : n_threads_ (n_threads), 
-    n_iterations_ (n_iterations), 
-    ACE_Task<ACE_MT_SYNCH> (thr_mgr)
-{
-  index_ = workers_count_++;
-}
- 
-int 
-Worker_Task::open (void *)
-{
-  // Create worker threads.
-  int rc = this->activate (THR_NEW_LWP, n_threads_, 0, 0, -1, this);
-
-  if (rc == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-
-  return rc;
-}
-
-int 
-Worker_Task::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG, " (%t) in worker %d\n", index_));
-
-  for (int iterations = 1; 
-       iterations <= this->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, " (%t) in iteration %d\n", iterations));
-      ACE_OS::sleep (0);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) worker %d ends\n", index_));
-
-  return 0;
-}
-
-Invoker_Task::Invoker_Task (ACE_Thread_Manager *thr_mgr, 
-			    int n_tasks,
-			    int n_threads,
-			    int n_iterations)           
-  : n_tasks_ (n_tasks), 
-    n_threads_ (n_threads), 
-    n_iterations_ (n_iterations),
-    ACE_Task<ACE_MT_SYNCH> (thr_mgr)
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, 1, 0, 0, -1, this) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Invoker_Task::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run () method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
-  Worker_Task **pTask = new Worker_Task* [n_tasks_];
-   
-  for (int task = 0; 
-       task < this->n_tasks_;
-       task++)
-    {
-      ACE_DEBUG ((LM_DEBUG, " (%t) in task %d\n", task+1));
-      pTask[task] = new Worker_Task (thr_mgr, n_threads_, n_iterations_);
-      pTask[task]->open ();  
-    }
-
-  // Set all tasks to be one group
-  ACE_DEBUG ((LM_DEBUG, " (%t) setting tasks group id\n"));
-  for (task = 0; 
-       task < this->n_tasks_;
-       task++)
-    if (thr_mgr->set_grp (pTask[task], 1) == -1)
-      ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "set_grp"));
-
-  int nTasks = thr_mgr->num_tasks_in_group (1);
-  cout << "Number of tasks in group 1: " << nTasks << endl;
-
-  // Wait for 1 second and then suspend every thread in the group.
-  ACE_OS::sleep (1);
-  ACE_DEBUG ((LM_DEBUG, " (%t) suspending group\n"));
-  if (thr_mgr->suspend_grp (1) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "suspend_grp"));
-
-  // Wait for 5 more second and then resume every thread in the
-  // group.
-  ACE_OS::sleep (ACE_Time_Value (5));
-  
-  // @QTSK  This ACE_DEBUG statement blows us away! can't understand why
-  ACE_DEBUG ((LM_DEBUG, " (%t) resuming group\n"));
-  if (thr_mgr->resume_grp (1) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "resume_grp"));
-
-
-  // Wait for all the tasks to reach their exit point.
-  thr_mgr->wait ();
-
-  // Note that the ACE_Task::svc_run () method automatically removes us
-  // from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-// Default number of tasks and iterations.
-static const int DEFAULT_TASKS = 4;
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  int n_tasks = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_TASKS;
-  int n_threads = argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 3 ? ACE_OS::atoi (argv[3]) : DEFAULT_ITERATIONS;
-
-  // Since ACE_Thread_Manager can only wait for all threads, we'll have
-  // special manager for the Invoker_Task.
-  ACE_Thread_Manager invoker_manager;
-
-  Invoker_Task invoker (&invoker_manager, 
-			n_tasks, 
-			n_threads,
-			n_iterations); 
-
-  // Wait for 1 second and then suspend the invoker task
-  ACE_OS::sleep (1);
-  ACE_DEBUG ((LM_DEBUG, " (%t) suspending invoker task\n"));
-
-  if (invoker_manager.suspend_task (&invoker) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "suspend_task"));
-
-  // Wait for 5 more second and then resume the invoker task.
-  ACE_OS::sleep (ACE_Time_Value (5));
-
-  // @QTSK  This ACE_DEBUG statement blows us away! can't understand why
-  ACE_DEBUG ((LM_DEBUG, " (%t) resuming invoker task\n"));
-  if (invoker_manager.resume_task (&invoker) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "resume_task"));
-
-
-  // Wait for all the threads to reach their exit point.
-  invoker_manager.wait ();
-
-  // @QTSK  This ACE_DEBUG statement blows us away! can't understand why
-  ACE_DEBUG ((LM_DEBUG, " (%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_one.cpp b/examples/Threads/test_task_one.cpp
deleted file mode 100644
index d0a8a12e6c4..00000000000
--- a/examples/Threads/test_task_one.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// This test program illustrates how the ACE barrier synchronization
-// $Id$
-
-// mechanisms work in conjunction with the ACE_Task and the
-// ACE_Thread_Manager.  It is instructive to compare this with the
-// test_barrier.cpp test to see how they differ.
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-
-#if defined (ACE_HAS_THREADS)
-
-#include "ace/Task.h"
-
-class Barrier_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Barrier_Task (ACE_Thread_Manager *thr_mgr,
-		int n_threads, 
-		int n_iterations);
-  
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-private:
-  ACE_Barrier barrier_;
-  // Reference to the tester barrier.  This controls each
-  // iteration of the tester function running in every thread.
-
-  int n_iterations_;
-  // Number of iterations to run.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, 
-			    int n_threads, 
-			    int n_iterations)
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr), 
-    barrier_ (n_threads), 
-    n_iterations_ (n_iterations) 
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Barrier_Task::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run() method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  for (int iterations = 1; 
-       iterations <= this->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations));
-
-      // Block until all other threads have waited, then continue.
-      this->barrier_.wait ();
-    }
-
-  // Note that the ACE_Task::svc_run() method automatically removes us
-  // from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-// Default number of threads to spawn.
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  Barrier_Task barrier_task (ACE_Service_Config::thr_mgr (), 
-			     n_threads, 
-			     n_iterations);
-
-  // Wait for all the threads to reach their exit point.
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_three.cpp b/examples/Threads/test_task_three.cpp
deleted file mode 100644
index c6ad69511b5..00000000000
--- a/examples/Threads/test_task_three.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// $Id$
-
-// Exercise more tests for the ACE Tasks.  This also shows off some
-// Interesting uses of the ACE Log_Msg's ability to print to ostreams.
-// BTW, make sure that you set the out_stream in *every* thread that
-// you want to have write to the output file, i.e.:
-//
-//
-//  if (out_stream)
-//    {
-//      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-//      ACE_LOG_MSG->msg_ostream (out_stream);
-//    }
-
-#include <fstream.h>
-#include "ace/Reactor.h"
-#include "ace/Service_Config.h"
-#include "ace/Task.h"
-
-
-#if defined (ACE_HAS_THREADS)
-
-static ofstream *out_stream = 0;
-
-static const int NUM_INVOCATIONS = 100;
-static const int TASK_COUNT = 130;
-
-class Test_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Test_Task (void);
-  ~Test_Task (void);
-
-  virtual int open (void *args = 0);
-  virtual int close (u_long flags = 0);
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
-
-  virtual int handle_input (ACE_HANDLE fd);
-
-  ACE_Reactor *r_;
-  int handled_;
-  static int current_count_;
-  static int done_cnt_;
-};
-
-int Test_Task::current_count_ = 0;
-int Test_Task::done_cnt_ = 0;
-
-static ACE_Thread_Mutex lock_;
-
-Test_Task::Test_Task (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  this->handled_ = 0;
-  Test_Task::current_count_++;
-  ACE_DEBUG ((LM_DEBUG, 
-	      "Test_Task constructed, current_count_ = %d\n", 
-	      Test_Task::current_count_));
-}
-
-Test_Task::~Test_Task (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  ACE_DEBUG ((LM_DEBUG, "Test_Task destroyed, current_count_ = %d\n",
-	      Test_Task::current_count_));
-}
-
-int 
-Test_Task::open (void *args)
-{
-  r_ = (ACE_Reactor *) args;
-  return ACE_Task<ACE_MT_SYNCH>::activate (THR_NEW_LWP);
-}
-
-int 
-Test_Task::close (u_long)
-{
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
-
-  Test_Task::current_count_--;
-  ACE_DEBUG ((LM_DEBUG, "Test_Task::close () current_count_ = %d.\n", 
-	      Test_Task::current_count_));
-  return 0;
-}
-
-int 
-Test_Task::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  return 0;
-}
-
-Test_Task::svc (void)
-{
-  // Every thread must register the same stream to write to file.
-  if (out_stream)
-    {
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-      ACE_LOG_MSG->msg_ostream (out_stream);
-    }
-
-  for (int index = 0; index < NUM_INVOCATIONS; index++)
-    {
-      ACE_OS::thr_yield ();
-
-      if (r_->notify (this, ACE_Event_Handler::READ_MASK))
-	{
-	  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
-
-	  ACE_DEBUG ((LM_DEBUG, "Test_Task: error notifying reactor!\n"));
-	}
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) returning from svc ()\n"));
-  return 0;
-}
-
-int 
-Test_Task::handle_input (ACE_HANDLE)
-{
-  this->handled_++;
-
-  if (this->handled_ == NUM_INVOCATIONS)
-    {
-      ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
-      Test_Task::done_cnt_++;
-      ACE_DEBUG ((LM_DEBUG, 
-		  " (%t) Test_Task: handle_input! done_cnt_ = %d.\n",
-		  Test_Task::done_cnt_));
-    }
-
-  ACE_OS::thr_yield ();
-  return -1;
-}
-
-static void *
-dispatch (void *arg)
-{
-  // every thread must register the same stream to write to file
-  if (out_stream)
-    {
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-      ACE_LOG_MSG->msg_ostream (out_stream);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) Dispatcher Thread started!\n"));
-  ACE_Reactor *r = (ACE_Reactor *) arg;
-  int result;
-
-  r->owner (ACE_OS::thr_self ());
-
-  while (1)
-    {
-      result = r->handle_events ();
-      if (result <= 0)
-	ACE_DEBUG ((LM_DEBUG, "Dispatch: handle_events (): %d", result));
-    }
-
-  return 0;
-}
-
-extern "C" void 
-handler (int)
-{
-  *out_stream << flush;
-  out_stream->close ();
-  ACE_OS::exit (42);
-}
-
-int 
-main (int argc, char **argv)
-{
-  if (argc > 1)
-    {
-      // Send output to file.
-      out_stream = new ofstream ("test_task_three.out", ios::trunc|ios::out);
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-      ACE_LOG_MSG->msg_ostream (out_stream);
-    }
-
-  // Register a signal handler.
-  ACE_Sig_Action sa (ACE_SignalHandler (handler), SIGINT);
-
-  ACE_Reactor *reactor1 = ACE_Service_Config::reactor ();
-  ACE_Reactor *reactor2 = new ACE_Reactor ();
-
-  Test_Task t1[TASK_COUNT];
-  Test_Task t2[TASK_COUNT];
-
-  ACE_Thread::spawn (ACE_THR_FUNC (dispatch), reactor2);
-
-  reactor1->owner (ACE_OS::thr_self ());
-
-  for (int index = 0; index < TASK_COUNT; index++)
-    {
-      t1[index].open (reactor1);
-      t2[index].open (reactor2);
-    }
-
-  ACE_OS::sleep (3);
-
-  for (;;)
-    {
-      ACE_Time_Value timeout (2);
-
-      if (reactor1->handle_events (timeout) <= 0)
-	{
-	  if (errno == ETIME)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, "no activity within 2 seconds, shutting down\n"));
-	      break;
-	    }
-	  else
-	    ACE_ERROR ((LM_ERROR, "%p error handling events\n", "main"));
-	}
-    }
-
-  return 0;
-}
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_two.cpp b/examples/Threads/test_task_two.cpp
deleted file mode 100644
index 9f25962c795..00000000000
--- a/examples/Threads/test_task_two.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// $Id$
-
-// Exercise more tests for the ACE Tasks.  This test can spawn off
-// zillions of tasks and then wait for them using both polling and the
-// ACE Thread Manager.
-
-#include "ace/Task.h"
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-
-#if defined (ACE_HAS_THREADS)
-
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT;
-
-static u_long zero = 0;
-static ATOMIC_INT task_count (zero);
-static ATOMIC_INT max_count (zero);
-static ATOMIC_INT wait_count (zero);
-
-static u_long n_threads = 0;
-
-// Default number of tasks.
-static const int default_threads = ACE_DEFAULT_THREADS;
-
-// Default number of times to run the test.
-static const int default_iterations = 1000;
-
-class Task_Test : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  virtual int open (void *args = 0);
-  virtual int close (u_long flags = 0);
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
-
-private:
-  static ACE_Thread_Mutex lock_;
-};
-
-ACE_Thread_Mutex Task_Test::lock_;
-
-int 
-Task_Test::open (void *)
-{
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Task_Test::lock_, -1);
-
-  task_count++;
-  ACE_DEBUG ((LM_DEBUG, "(%t) creating Task_Test, task count = %d\n", 
-	      (u_long) task_count));
-
-  return this->activate (THR_BOUND);
-}
-
-int 
-Task_Test::close (u_long)
-{
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Task_Test::lock_, -1);
-
-  task_count--;
-  ACE_DEBUG ((LM_DEBUG, "(%t) destroying Task_Test, task count = %d\n", 
-	      (u_long) task_count));
-  wait_count--;
-// delete this;
-  return 0;
-}
-
-int 
-Task_Test::put (ACE_Message_Block *,
-		ACE_Time_Value *)
-{
-  return 0;
-}
-
-int 
-Task_Test::svc (void)
-{
-  wait_count++;
-  max_count++;
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) svc: waiting\n"));
-
-  for (;;)
-    if (max_count >= n_threads)
-      break;
-    else
-      ACE_Thread::yield ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) svc: finished waiting\n"));
-  return 0;
-}
-
-int 
-main (int argc, char *argv[])
-{
-  n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : default_threads;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : default_iterations;
-
-  Task_Test **task_array = new Task_Test *[n_threads];
-
-  for (int i = 1; i <= n_iterations; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) iteration = %d, max_count %d\n", 
-		  i, (u_long) max_count));
-      max_count = 0;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) starting %d task%s\n", 
-		  n_threads, n_threads == 1 ? "" : "s"));
-
-      // Launch the new tasks.
-      for (int j = 0; j < n_threads; j++)
-	{
-	  task_array[j] = new Task_Test;
-	  // Activate the task, i.e., make it an active object.
-	  task_array[j]->open ();
-	}
-
-      // Wait for initialization to kick in.
-      while (max_count == 0)
-	ACE_Thread::yield ();
-      
-      ACE_DEBUG ((LM_DEBUG, "(%t) waiting for threads to finish\n"));
-
-      // Wait for the threads to finish this iteration.
-      while (max_count != n_threads && wait_count != 0)
-	ACE_Thread::yield ();
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) iteration %d finished, max_count %d, wait_count %d, waiting for tasks to exit\n",
-		  i, (u_long) max_count, (u_long) wait_count));
-
-      // Wait for all the tasks to exit.
-      ACE_Service_Config::thr_mgr ()->wait ();
-
-      // Delete the existing tasks.
-      for (int k = 0; k < n_threads; k++)
-	delete task_array[k];
-    }
-
-  delete [] task_array;
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) shutting down the test\n"));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_thread_manager.cpp b/examples/Threads/test_thread_manager.cpp
deleted file mode 100644
index 73029d70d88..00000000000
--- a/examples/Threads/test_thread_manager.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-
-// Test out the group management mechanisms provided by the
-// ACE_Thread_Manager, including the group signal handling, group
-// suspension and resumption, and cooperative thread cancellation
-// mechanisms.
-
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-
-extern "C" void
-handler (int signum)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) received signal %d\n", signum));
-}
-
-static void *
-worker (int iterations)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-
-  for (int i = 0; i < iterations; i++)
-    {
-      if ((i % 1000) == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "(%t) checking cancellation before iteration %d!\n", 
-		      i));
-	
-	  if (ACE_Service_Config::thr_mgr ()->testcancel (ACE_Thread::self ()) != 0)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "(%t) has been cancelled before iteration %d!\n", 
-			  i));
-	      break;
-	    }
-	}
-    }
-
-  // Destructor removes thread from Thread_Manager.
-  return 0;
-}
-
-static const int DEFAULT_THREADS = ACE_DEFAULT_THREADS;
-static const int DEFAULT_ITERATIONS = 100000;
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon;
-
-  daemon.open (argv[0]);
-
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
-
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
-
-  int grp_id = thr_mgr->spawn_n (n_threads, ACE_THR_FUNC (worker),
-				 (void *) n_iterations,
-				 THR_NEW_LWP | THR_DETACHED);
-
-  // Wait for 1 second and then suspend every thread in the group.
-  ACE_OS::sleep (1);
-  ACE_DEBUG ((LM_DEBUG, "(%t) suspending group\n"));
-  if (thr_mgr->suspend_grp (grp_id) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "suspend_grp"));
-
-  // Wait for 1 more second and then resume every thread in the
-  // group.
-  ACE_OS::sleep (ACE_Time_Value (1));
-  ACE_DEBUG ((LM_DEBUG, "(%t) resuming group\n"));
-  if (thr_mgr->resume_grp (grp_id) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "resume_grp"));
-
-  // Wait for 1 more second and then send a SIGINT to every thread in
-  // the group.
-  ACE_OS::sleep (ACE_Time_Value (1));
-  ACE_DEBUG ((LM_DEBUG, "(%t) signaling group\n"));
-  if (thr_mgr->kill_grp (grp_id, SIGINT) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "kill_grp"));
-
-  // Wait for 1 more second and then cancel all the threads.
-  ACE_OS::sleep (ACE_Time_Value (1));
-  ACE_DEBUG ((LM_DEBUG, "(%t) cancelling group\n"));
-  if (thr_mgr->cancel_grp (grp_id) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "cancel_grp"));
-
-  // Perform a barrier wait until all the threads have shut down.
-  thr_mgr->wait ();
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_thread_pool.cpp b/examples/Threads/test_thread_pool.cpp
deleted file mode 100644
index 68741156b83..00000000000
--- a/examples/Threads/test_thread_pool.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-// This test program illustrates how the ACE task synchronization
-// $Id$
-
-// mechanisms work in conjunction with the ACE_Task and the
-// ACE_Thread_Manager.  If the manual flag is not set input comes from
-// stdin until the user enters a return only.  This stops all workers
-// via a message block of length 0. This is an alternative shutdown of
-// workers compared to queue deactivate.
-//
-// This code is original based on a test program written by Karlheinz
-// Dorn.  It was modified to utilize more "ACE" features by Doug Schmidt.
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-#include "ace/Task.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Number of iterations to run the test.
-static size_t n_iterations = 100;
-
-class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Thread_Pool (ACE_Thread_Manager *thr_mgr, int n_threads);
-  
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv=0);
-  // This allows the producer to pass messages to the <Thread_Pool>.
-
-private:
-  virtual int close (u_long);
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-};
-
-int 
-Thread_Pool::close (u_long) 
-{ 
-  ACE_DEBUG ((LM_DEBUG, "(%t) close of worker\n"));
-  return 0;
-}
-
-Thread_Pool::Thread_Pool (ACE_Thread_Manager *thr_mgr, 
-			  int n_threads) 
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr) 
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Simply enqueue the Message_Block into the end of the queue.
-
-int
-Thread_Pool::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
-{ 
-  return this->putq (mb, tv); 
-}
-
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Thread_Pool::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run () method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  int result = 0;
-  int count = 1;
-
-  // Keep looping, reading a message out of the queue, until we get a
-  // message with a length == 0, which signals us to quit.
-
-  for (;; count++)
-    {       
-      ACE_Message_Block *mb;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d before getq ()\n", count));
-
-      if (this->getq (mb) == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) in iteration %d, got result -1, exiting\n", count));
-	    break;
-	}
-
-      int length = mb->length ();
-
-      if (length > 0)
-	ACE_DEBUG ((LM_DEBUG, 
-		    "(%t) in iteration %d, length = %d, text = \"%*s\"\n",
-		    count, length, length - 1, mb->rd_ptr ()));
-
-      // We're responsible for deallocating this.
-      delete mb;
-
-      if (length == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "(%t) in iteration %d, got NULL message, exiting\n",
-		      count));
-	  break;
-	}
-    }
-
-  // Note that the ACE_Task::svc_run () method automatically removes
-  // us from the Thread_Manager when the thread exits.
-  return 0;
-}
-
-static void 
-produce (Thread_Pool &thread_pool)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) producer start, dumping the Thread_Pool\n"));
-  thread_pool.dump ();
-
-  for (int n;;)
-    {
-      // Allocate a new message.
-      ACE_Message_Block *mb = new ACE_Message_Block (BUFSIZ);
-
-#if defined (manual)
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) press chars and enter to put a new message into task queue..."));
-      n = ACE_OS::read (ACE_STDIN, mb->rd_ptr (), mb->size ());
-#else // Automatically generate messages.
-      static int count = 0;
-
-      ACE_OS::sprintf (mb->rd_ptr (), "%d\n", count);
-
-      n = ACE_OS::strlen (mb->rd_ptr ());
-
-      if (count == n_iterations)
-	n = 1; // Indicate that we need to shut down.
-      else
-	count++;
-
-      if (count == 0 || (count % 20 == 0))
-	ACE_OS::sleep (1);
-#endif /* manual */
-      if (n > 1)
-        {
-	  // Send a normal message to the waiting threads and continue
-	  // producing.
-	  mb->wr_ptr (n);
-
-	  // Pass the message to the Thread_Pool.
-	  if (thread_pool.put (mb) == -1)
-            ACE_ERROR ((LM_ERROR, " (%t) %p\n", "put"));
-	}
-      else
-	{
-          // Send a shutdown message to the waiting threads and exit.
-	  ACE_DEBUG ((LM_DEBUG, "\n(%t) start loop, dump of task:\n"));
-	  thread_pool.dump ();
-
-	  for (int i = thread_pool.thr_count (); i > 0; i--)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "(%t) EOF, enqueueing NULL block for thread = %d\n", 
-			  i));
-
-	      // Enqueue a NULL message to flag each consumer to
-	      // shutdown.
-	      if (thread_pool.put (new ACE_Message_Block) == -1)
-		ACE_ERROR ((LM_ERROR, " (%t) %p\n", "put"));
-	    }
-
-	  ACE_DEBUG ((LM_DEBUG, "\n(%t) end loop, dump of task:\n"));
-	  thread_pool.dump ();
-          break;
-	}
-    }
-}
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : n_iterations;
-  
-  ACE_DEBUG ((LM_DEBUG, "(%t) argc = %d, threads = %d\n", 
-	      argc, n_threads));
-
-  // Create the worker tasks.
-  Thread_Pool thread_pool (ACE_Service_Config::thr_mgr (), 
-			   n_threads);
-
-  // Create work for the worker tasks to process in their own threads.
-  produce (thread_pool);
-
-  // Wait for all the threads to reach their exit point.
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) waiting with thread manager...\n"));
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) destroying worker tasks and exiting...\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_thread_specific.cpp b/examples/Threads/test_thread_specific.cpp
deleted file mode 100644
index f7a4f6dccf3..00000000000
--- a/examples/Threads/test_thread_specific.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-#include "ace/Service_Config.h"
-// $Id$
-
-#include "ace/Synch.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Define a class that will be stored in thread-specific data.  Note
-// that as far as this class is concerned it's just a regular C++
-// class.  The ACE_TSS wrapper transparently ensures that
-// objects of this class will be placed in thread-specific storage.
-// All calls on ACE_TSS::operator->() are delegated to the
-// appropriate method in the Errno class.
-
-class Errno
-{
-public:
-  int error (void) { return this->errno_; }
-  void error (int i) { this->errno_ = i; }
-  
-  int line (void) { return this->lineno_; }
-  void line (int l) { this->lineno_ = l; }
-
-  // Errno::flags_ is a static variable, so we've got to protect it
-  // with a mutex since it isn't kept in thread-specific storage.
-  int flags (void) 
-  { 
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Errno::lock_, -1);
-
-    return Errno::flags_;
-  }
-
-  void flags (int f)
-  {
-    ACE_GUARD (ACE_Thread_Mutex, ace_mon, Errno::lock_);
-
-    Errno::flags_ = f;
-  }
-
-private:
-  // = errno_ and lineno_ will be thread-specific data so they don't
-  // need a lock.  
-  int errno_;
-  int lineno_;
-
-  static int flags_;
-#if defined (ACE_HAS_THREADS)
-  // flags_ needs a lock. 
-  static ACE_Thread_Mutex lock_;
-#endif /* ACE_HAS_THREADS */
-};
-
-// Static variables.
-ACE_MT (ACE_Thread_Mutex Errno::lock_);
-int Errno::flags_;
-
-// This is our thread-specific error handler...
-static ACE_TSS<Errno> TSS_Error;
-
-#if defined (ACE_HAS_THREADS)
-// Serializes output via cout.
-static ACE_Thread_Mutex lock;
-
-typedef ACE_TSS_Guard<ACE_Thread_Mutex> GUARD;
-#else
-// Serializes output via cout.
-static ACE_Null_Mutex lock;
-
-typedef ACE_Guard<ACE_Null_Mutex> GUARD;
-#endif /* ACE_HAS_THREADS */
-
-static void 
-cleanup (void *ptr)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) in cleanup, ptr = %x\n", ptr));
-
-  delete ptr;
-}
-
-// This worker function is the entry point for each thread.
-
-static void *
-worker (void *c)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  int count = int (c);
-
-  ACE_thread_key_t key = 0;
-  int *ip = 0;
-
-  // Make one key that will be available when the thread exits so that
-  // we'll have something to cleanup!
-
-  if (ACE_OS::thr_keycreate (&key, cleanup) == -1)
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate"));
-
-  ip = new int;
-
-  if (ACE_OS::thr_setspecific (key, (void *) ip) == -1)
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-  for (int i = 0; i < count; i++)
-    {
-      if (ACE_OS::thr_keycreate (&key, cleanup) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate"));
-
-      ip = new int;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) in worker 1, key = %d, ip = %x\n", key, ip));
-
-      if (ACE_OS::thr_setspecific (key, (void *) ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_getspecific (key, (void **) &ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_setspecific (key, (void *) 0) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      delete ip;
-
-      if (ACE_OS::thr_keyfree (key) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keyfree"));
-
-      // Cause an error.
-      ACE_OS::read (ACE_INVALID_HANDLE, 0, 0);
-
-      // The following two lines set the thread-specific state.
-      TSS_Error->error (errno);
-      TSS_Error->line (__LINE__);
-
-      // This sets the static state (note how C++ makes it easy to do
-      // both).
-      TSS_Error->flags (count);
-
-      {
-	// Use the guard to serialize access to cout...
-	ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock, 0);
-
-	cout << "(" << ACE_Thread::self ()
-	     << ") errno = "  << TSS_Error->error () 
-	     << ", lineno = " << TSS_Error->line ()
-	     << ", flags = " << TSS_Error->flags () 
-	     << endl;
-      }
-      key = 0;
-
-      if (ACE_OS::thr_keycreate (&key, cleanup) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate"));
-
-      ip = new int;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) in worker 2, key = %d, ip = %x\n", key, ip));
-
-      if (ACE_OS::thr_setspecific (key, (void *) ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_getspecific (key, (void **) &ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_setspecific (key, (void *) 0) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      delete ip;
-
-      if (ACE_OS::thr_keyfree (key) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keyfree"));
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) exiting\n"));
-  return 0;
-}
-
-extern "C" void 
-handler (int signum)
-{
-  ACE_DEBUG ((LM_DEBUG, "signal = %S\n", signum));
-  ACE_Service_Config::thr_mgr ()->exit (0);
-}
-
-int 
-main (int argc, char *argv[])
-{
-  // The Service_Config must be the first object defined in main...
-  ACE_Service_Config daemon (argv[0]);
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  int threads = argc > 1 ? ACE_OS::atoi (argv[1]) : 4;
-  int count = argc > 2 ? ACE_OS::atoi (argv[2]) : 10000;
-
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) (handler), SIGINT);
-
-#if defined (ACE_HAS_THREADS)
-  if (ACE_Service_Config::thr_mgr ()->spawn_n (threads, 
-					       ACE_THR_FUNC (&worker), 
-					       (void *) count,
-					       THR_BOUND | THR_DETACHED) == -1)
-    ACE_OS::perror ("ACE_Thread_Manager::spawn_n");
-
-  ACE_Service_Config::thr_mgr ()->wait ();
-#else
-  worker ((void *) count);
-#endif /* ACE_HAS_THREADS */
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_TSS<Errno>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support threads on this platform (yet)\n"),
-		    -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_token.cpp b/examples/Threads/test_token.cpp
deleted file mode 100644
index 5a51496d011..00000000000
--- a/examples/Threads/test_token.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// Test out the ACE Token class.
-// $Id$
-
-#include "ace/Token.h"
-#include "ace/Task.h"
-
-#if defined (ACE_HAS_THREADS)
-
-class My_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  My_Task (int n);
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-  virtual int svc (void);
-
-  static void sleep_hook (void *);
-
-private:
-  ACE_Token token_;
-};
-
-My_Task::My_Task (int n)
-{
-  // Make this Task into an Active Object.
-  this->activate (THR_BOUND | THR_DETACHED, n);
-
-  // Wait for all the threads to exit.
-  this->thr_mgr ()->wait ();
-}
-
-void 
-My_Task::sleep_hook (void *)
-{
-  cerr << '(' << ACE_Thread::self () << ')'
-       << " blocking, My_Task::sleep_hook () called" << endl;
-}
-
-// Test out the behavior of the ACE_Token class.
-
-int 
-My_Task::svc (void)
-{
-  for (int i = 0; i < 10000; i++)
-    {
-      // Wait for up to 1 millisecond past the current time to get the token.
-      ACE_Time_Value timeout (ACE_OS::time (0), 1000);
-
-      if (this->token_.acquire (&My_Task::sleep_hook, 0, &timeout) == 1)
-	{
-	  this->token_.acquire ();
-	  this->token_.renew ();
-	  this->token_.release ();
-	  this->token_.release ();
-	}
-      else
-	ACE_Thread::yield ();
-    }
-  return 0;
-}
-
-int 
-main (int argc, char *argv[])
-{
-  My_Task tasks (argc > 1 ? atoi (argv[1]) : 4);
-
-  return 0;
-}
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "your platform doesn't support threads\n"), -1);
-}
-#endif /* */
diff --git a/examples/Threads/test_tss.cpp b/examples/Threads/test_tss.cpp
deleted file mode 100644
index c81ca41c429..00000000000
--- a/examples/Threads/test_tss.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-// Torture test ACE thread-specific storage...
-// $Id$
-
-
-#include "ace/Task.h"
-#include "ace/Token.h"
-
-#if defined (ACE_HAS_THREADS)
-
-class TSS_Obj
-{
-public:
-
-  TSS_Obj (void);
-  ~TSS_Obj (void);
-
-private:
-  static int        count_;
-  static ACE_Thread_Mutex  lock_;
-};
-
-int TSS_Obj::count_ = 0;
-ACE_Thread_Mutex TSS_Obj::lock_;
-
-TSS_Obj::TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_++;
-  cout << "TO+ : " << count_ << endl;
-}
-
-TSS_Obj::~TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_--;
-  cout << "TO- : " << count_ << endl;
-}
-
-class Test_Task
-{
-public:
-
-  Test_Task (void);
-  ~Test_Task (void);
-
-  int open (void *arg);
-
-  static void* svc (void *arg);
-
-  static int wait_count_;
-  static int max_count_;
-
-private:
-  static int count_;
-};
-
-int Test_Task::count_ = 0;
-int Test_Task::wait_count_ = 0;
-int Test_Task::max_count_ = 0;
-int num_threads_ = 0;
-
-ACE_Token token;
-
-Test_Task::Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_++;
-  cout << "Test_Task+ : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-}
-
-Test_Task::~Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_--;
-  cout << "Test_Task- : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-
-  wait_count_--;
-}
-
-int Test_Task::open (void *arg)
-{
-
-  ACE_Thread::spawn (Test_Task::svc, arg);
-
-  return 0;
-}
-
-
-void * 
-Test_Task::svc (void *arg)
-{
-  ACE_TSS<TSS_Obj> tss (new TSS_Obj);
-
-  {
-    ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-    wait_count_++;
-    max_count_++;
-    cout << "svc: waiting (" << ACE_OS::thr_self () << ")" << endl;
-  }
-
-  while (1)
-    {   
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	if (max_count_ >= num_threads_)
-	  break;
-	else
-	  {
-	    ace_mon.release ();
-	    ACE_Thread::yield ();
-	    ace_mon.acquire ();
-	  }
-      }
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	cout << "svc: waiting (" << ACE_OS::thr_self () << ") finished" << endl;
-      }
-    }
-
-  delete (Test_Task *) arg;
-
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  if (argc != 2)
-    {
-      cout << "Missing parameters!" << endl;
-      return 1;
-    }
-
-  int num_Tasks = atoi (argv[1]);
-
-  num_threads_ = num_Tasks;
-
-  Test_Task **task_arr = (Test_Task**) new char[sizeof (Test_Task*) * num_Tasks];
-
-  while (1)
-    {
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "ReseTest_Tasking Test_Task::max_count_ from: " 
-	     << Test_Task::max_count_ << endl;
-
-	Test_Task::max_count_ = 0;
-      }
-
-      for (int i = 0; i < num_Tasks; i++)
-	{
-          task_arr[i] = new Test_Task;
-	  task_arr[i]->open (task_arr[i]);
-	}
-
-      cout << "Waiting for first thread started..." << endl;
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (Test_Task::max_count_ != 0 )
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      break;
-	    }
-	  ace_mon.release ();
-	  ACE_Thread::yield ();
-	  ace_mon.acquire ();
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "First thread started!" << endl 
-	     << "Waiting for all threads finished..." << endl;
-      }
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (!(Test_Task::max_count_ == num_threads_ 
-		&& Test_Task::wait_count_ == 0))
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      continue;
-	    }
-
-	  cout << "Test_Task::max_count_ = " 
-	       << Test_Task::max_count_ 
-	       << " Test_Task::wait_count_ = " 
-	       << Test_Task::wait_count_ 
-	       << endl;
-	  break;
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-	cout << "All threads finished..." << endl;
-      }
-
-      ACE_OS::sleep (2);
-    }
-
-  return 0;
-}
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_tss1.cpp b/examples/Threads/test_tss1.cpp
deleted file mode 100644
index 7efdc9dc3ef..00000000000
--- a/examples/Threads/test_tss1.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    TSS_Test.cpp
-//
-// = DESCRIPTION
-//     This program tests thread specific storage of data. The ACE_TSS
-//     wrapper transparently ensures that the objects of this class
-//     will be placed in thread-specific storage. All calls on
-//     ACE_TSS::operator->() are delegated to the appropriate method
-//     in the Errno class. 
-//
-// = AUTHOR
-//    Detlef Becker
-// 
-// ============================================================================
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-#include "ace/Task.h"
-
-#if defined (ACE_HAS_THREADS)
-
-static int iterations = 100;
-
-class Errno
-{
-public:
-  int error (void) { return this->errno_; }
-  void error (int i) { this->errno_ = i; }
-  
-  int line (void) { return this->lineno_; }
-  void line (int l) { this->lineno_ = l; }
-
-  // Errno::flags_ is a static variable, so we've got to protect it
-  // with a mutex since it isn't kept in thread-specific storage.
-  int flags (void) { 
-    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_Mon, Errno::lock_, -1));
-
-    return Errno::flags_;
-  }
-  int flags (int f)
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Errno::lock_, -1));
-
-    Errno::flags_ = f;
-    return 0;
-  }
-
-private:
-  // = errno_ and lineno_ will be thread-specific data so they don't
-  // need a lock.  
-  int errno_;
-  int lineno_;
-
-  static int flags_;
-#if defined (ACE_HAS_THREADS)
-  // flags_ needs a lock. 
-  static ACE_Thread_Mutex lock_;
-#endif /* ACE_HAS_THREADS */
-};
-
-// Static variables.
-ACE_MT (ACE_Thread_Mutex Errno::lock_);
-int Errno::flags_;
-
-// This is our thread-specific error handler...
-static ACE_TSS<Errno> TSS_Error;
-
-#if defined (ACE_HAS_THREADS)
-// Serializes output via cout.
-static ACE_Thread_Mutex lock;
-
-typedef ACE_TSS_Guard<ACE_Thread_Mutex> GUARD;
-#else
-// Serializes output via cout.
-static ACE_Null_Mutex lock;
-
-typedef ACE_Guard<ACE_Null_Mutex> GUARD;
-#endif /* ACE_HAS_THREADS */
-
-// Keeps track of whether Tester::close () has started.
-static int close_started = 0;
-
-template <ACE_SYNCH_1>
-class Tester: public ACE_Task<ACE_SYNCH_2>
-{
-public:
-  Tester (void) {}
-  ~Tester (void) {}
-
-  virtual int open (void *theArgs = 0);
-  virtual int close (u_long theArg = 0);
-  virtual int put (ACE_Message_Block *theMsgBlock,
-		   ACE_Time_Value *theTimeVal = 0);
-  virtual int svc (void);
-};
-
-template <ACE_SYNCH_1> int 
-Tester<ACE_SYNCH_2>::open (void *)
-{
-  return this->activate ();
-}
-
-template <ACE_SYNCH_1>
-int Tester<ACE_SYNCH_2>::close (u_long)
-{
-  ACE_DEBUG ((LM_DEBUG, "close running\n!"));
-  close_started = 1;
-  ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "close: trying to log error code 7!\n"));
-  TSS_Error->error (7);
-  ACE_DEBUG ((LM_DEBUG, "close: logging succeeded!\n"));
-  return 0;
-}
-
-template <ACE_SYNCH_1> int 
-Tester<ACE_SYNCH_2>::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  return 0;
-}
-
-template <ACE_SYNCH_1> int 
-Tester<ACE_SYNCH_2>::svc (void)
-{
-  return 0;
-}
-
-int 
-main (int, char *[])
-{
-  Tester<ACE_MT_SYNCH> tester;
-
-  tester.open ();
-
-  while (!close_started)
-    continue;
-
-  ACE_DEBUG ((LM_DEBUG, "main: trying to log error code 7!\n"));
-
-  TSS_Error->error (3);
-
-  ACE_DEBUG ((LM_DEBUG, "main: logging succeeded!\n"));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_TSS<Errno>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support threads on this platform (yet)\n"),
-		    -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_tss2.cpp b/examples/Threads/test_tss2.cpp
deleted file mode 100644
index 24a8d958e91..00000000000
--- a/examples/Threads/test_tss2.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    TSS_Test.cpp
-//
-// = DESCRIPTION
-//     This program tests thread specific storage of data. The ACE_TSS
-//     wrapper transparently ensures that the objects of this class
-//     will be placed in thread-specific storage. All calls on
-//     ACE_TSS::operator->() are delegated to the appropriate method
-//     in the Errno class. 
-//
-// = AUTHOR
-//    Prashant Jain and Doug Schmidt
-// 
-// ============================================================================
-
-#include "ace/Task.h"
-#include "ace/Token.h"
-
-#if defined (ACE_HAS_THREADS)
-
-class TSS_Obj
-{
-public:
-
-  TSS_Obj (void);
-  ~TSS_Obj (void);
-
-private:
-  static int count_;
-  static ACE_Thread_Mutex  lock_;
-};
-
-int TSS_Obj::count_ = 0;
-ACE_Thread_Mutex TSS_Obj::lock_;
-
-TSS_Obj::TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_++;
-  cout << "TO+ : " << count_ << endl;
-}
-
-TSS_Obj::~TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_--;
-  cout << "TO- : " << count_ << endl;
-}
-
-class Test_Task
-{
-public:
-
-  Test_Task (void);
-  ~Test_Task (void);
-
-  int open (void *arg);
-
-  static void *svc (void *arg);
-  static int wait_count_;
-  static int max_count_;
-
-private:
-  static int count_;
-};
-
-int Test_Task::count_ = 0;
-int Test_Task::wait_count_ = 0;
-int Test_Task::max_count_ = 0;
-int num_threads_ = 0;
-
-ACE_Token token;
-
-Test_Task::Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_++;
-  cout << "Test_Task+ : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-}
-
-Test_Task::~Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_--;
-  cout << "Test_Task- : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-
-  wait_count_--;
-}
-
-void *
-Test_Task::svc (void *arg)
-{
-  ACE_TSS<TSS_Obj> tss (new TSS_Obj);
-
-  {
-    ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-    wait_count_++;
-    max_count_++;
-    cout << "svc: waiting (" << ACE_OS::thr_self () << ")" << endl;
-  }
-
-  while (1)
-    {   
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	if (max_count_ >= num_threads_)
-	  break;
-	else
-	  {
-	    ace_mon.release ();
-	    ACE_Thread::yield ();
-	    ace_mon.acquire ();
-	  }
-      }
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	cout << "svc: waiting (" << ACE_OS::thr_self () << ") finished" << endl;
-      }
-    }
-
-  delete (Test_Task *) arg;
-
-  return 0;
-}
-
-int 
-Test_Task::open (void *arg)
-{
-  if (ACE_Thread::spawn (Test_Task::svc, arg) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Thread::spawn"), 0);
-
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  if (argc != 2)
-    {
-      cout << "Missing parameters!" << endl;
-      return 1;
-    }
-
-  int num_Tasks = atoi (argv[1]);
-
-  num_threads_ = num_Tasks;
-
-  Test_Task **task_arr = (Test_Task**) new char[sizeof (Test_Task*) * num_Tasks];
-
-  while (1)
-    {
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "ReseTest_Tasking Test_Task::max_count_ from: " 
-	     << Test_Task::max_count_ << endl;
-
-	Test_Task::max_count_ = 0;
-      }
-
-      for (int i = 0; i < num_Tasks; i++)
-	{
-          task_arr[i] = new Test_Task;
-	  task_arr[i]->open (task_arr[i]);
-	}
-
-      cout << "Waiting for first thread started..." << endl;
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (Test_Task::max_count_ != 0 )
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      break;
-	    }
-	  ace_mon.release ();
-	  ACE_Thread::yield ();
-	  ace_mon.acquire ();
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "First thread started!" << endl 
-	     << "Waiting for all threads finished..." << endl;
-      }
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (!(Test_Task::max_count_ == num_threads_ 
-		&& Test_Task::wait_count_ == 0))
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      continue;
-	    }
-
-	  cout << "Test_Task::max_count_ = " 
-	       << Test_Task::max_count_ 
-	       << " Test_Task::wait_count_ = " 
-	       << Test_Task::wait_count_ 
-	       << endl;
-	  break;
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-	cout << "All threads finished..." << endl;
-      }
-
-      ACE_OS::sleep (2);
-    }
-
-  return 0;
-}
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor
index 29fc58487d5..93be29d69e7 100644
--- a/include/makeinclude/build_dll.bor
+++ b/include/makeinclude/build_dll.bor
@@ -18,35 +18,24 @@
 
 TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).dll
 
-$(TARGET): $(OBJFILES) $(RESOURCE)
+$(TARGET): $(OBJFILES)
 	@$(MAKE_BINDIR)
 	$(LD) @&&!
 	$(COMMON_LFLAGS) $(DLL_LFLAGS) $(LFLAGS) +
 	$(DLL_STARTUP_OBJ) $(OBJFILES), +
 	$(TARGET),, +
-	$(COMMON_LIBS) $(LIBFILES),, +
-	$(RESOURCE)
+	$(COMMON_LIBS) $(LIBFILES)
 !
 
 !ifdef CPPDIR
 .path.cpp = $(CPPDIR)
 !endif
 
-!ifdef RESDIR
-.path.rc = $(RESDIR)
-!else
-.path.rc = .
-!endif
-
 .path.obj = $(OBJDIR)
 
 .cpp.obj:
 	@$(MAKE_OBJDIR)
 	$(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) $<
 
-.rc.res:
-	@$(MAKE_OBJDIR)
-	$(RC) -fo$@ $<
-
 .autodepend
 
diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor
index c209fbe5cf5..d407aaec077 100644
--- a/include/makeinclude/build_exe.bor
+++ b/include/makeinclude/build_exe.bor
@@ -19,36 +19,25 @@
 
 TARGET = $(BINDIR)\$(NAME).exe
 
-$(TARGET): $(OBJFILES) $(RESOURCE)
+$(TARGET): $(OBJFILES)
 	@$(MAKE_BINDIR)
 	$(LD) @&&!
 	$(COMMON_LFLAGS) $(EXE_LFLAGS) $(LFLAGS) +
 	$(EXE_STARTUP_OBJ) $(OBJFILES), +
 	$(TARGET),, +
-	$(COMMON_LIBS) $(LIBFILES),, +
-	$(RESOURCE)
+	$(COMMON_LIBS) $(LIBFILES)
 !
 
 !ifdef CPPDIR
 .path.cpp = $(CPPDIR)
 !endif
 
-!ifdef RESDIR
-.path.rc = $(RESDIR)
-!else
-.path.rc = .
-!endif
-
 .path.obj = $(OBJDIR)
 
 .cpp.obj:
 	@$(MAKE_OBJDIR)
 	$(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) $<
 
-.rc.res:
-	@$(MAKE_OBJDIR)
-	$(RC) -fo$@ $<
-
 .autodepend
 
 
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
index 24cae748a23..664cee6b4a1 100644
--- a/include/makeinclude/compiler.bor
+++ b/include/makeinclude/compiler.bor
@@ -11,8 +11,6 @@
 # ~~~~~~~~
 # CC - name of compiler
 # LD - name of linker
-# AR - name of librarian
-# RC - name of resource compiler
 # COMMON_CFLAGS - compiler flags for all targets
 # COMMON_LFLAGS - linker flags for all targets
 # COMMON_LIBS - linker library files for all targets
@@ -37,7 +35,6 @@
 CC = bcc32
 LD = ilink32
 AR = tlib
-RC = brcc32
 
 #
 # Common flags
diff --git a/include/makeinclude/platform_aix4_cset++.GNU b/include/makeinclude/platform_aix4_cset++.GNU
index 09a29b05657..ae31b487da6 100644
--- a/include/makeinclude/platform_aix4_cset++.GNU
+++ b/include/makeinclude/platform_aix4_cset++.GNU
@@ -16,15 +16,7 @@
 # ftp://service.boulder.ibm.com/aix/fixes/v4/os/bos.rte.bind_cmds.4.2.0.4.bff
 # or a successor.
 
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(distrib))
-  distrib = 0
-endif
-ifeq (,$(optimize))
-  optimize = 0
-endif
+debug = 1
 
 # In case anything here or in the config depends on OS version number,
 # grab it here and pass it all to the compiler as well.
@@ -37,18 +29,11 @@ CXX	    = xlC_r
 # -qextchk is handy, but produces false type mismatches when linking
 # netsvcs with 3.1.4, so it's disabled.  IBM reports this fixed in 3.6.4.
 CCFLAGS     += $(CFLAGS) -qtempinc -qinfo
-
-# IBM C/C++ compiler 3.6.x produces a bazillion warnings about 0-valued
-# preprocessor defs. Since both 3.1 and 3.4 could be installed, don't ask
-# lslpp for one or the other. Instead, compile a file and see which compiler
-# the user has set up for use. This trick was submitted by Craig Rodrigues
-# <rodrigc@mediaone.net>, originally from the vacpp compiler newsgroup.
-# It relies on the preprocessor defining __xlC__ to the proper version
-# number of the compiler.
-XLCVERSION := $(shell echo "__xlC__" > ./testAIXCompilerVersion.cpp)
-XLCVERSION := $(shell $(CXX) -E ./testAIXCompilerVersion.cpp | tail -1')
-ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp)
-ifeq ($(XLCVERSION),0x0306)
+# AIX 4.3 and IBM C/C++ compilers 3.6.4 produce a bazillion warnings
+# about 0-valued preprocessor defs. The problem may be a 3.6.4 compiler thing,
+# but the only way I know of at this moment to turn the things off is to switch
+# it based on the OS minor vers (assuming AIX 4.3 is used w/ xlC 3.6.4).
+ifeq ($(AIX_MINOR_VERS),3)
  CCFLAGS    += -qflag=e:e
 else
  CCFLAGS    += -qflag=w:w
diff --git a/include/makeinclude/platform_aix4_g++.GNU b/include/makeinclude/platform_aix4_g++.GNU
index 9da6ad1d96e..69793ceb341 100644
--- a/include/makeinclude/platform_aix4_g++.GNU
+++ b/include/makeinclude/platform_aix4_g++.GNU
@@ -6,19 +6,9 @@
 # Original contributed by Ian Wright <I.Wright@elsevier.co.uk>. Updated for
 # AIX 4 and egcs by Steve Huston <shuston@riverace.com>.
 
-
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(distrib))
-  distrib = 0
-endif
-ifeq (,$(optimize))
-  optimize = 0
-endif
-ifeq (,$(threads))
-  threads = 1
-endif
+debug = 1
+optimize = 0
+threads = 1
  
 # In case anything here or in the config depends on OS version number,
 # grab it here and pass it all to the compiler as well.
@@ -35,12 +25,7 @@ CCFLAGS        += $(CFLAGS) -fno-implicit-templates
 DCFLAGS        += -g
 DLD             = $(CXX)
 LD              = $(CXX)
-LDFLAGS	       += -Wl,-bI:/lib/pse.exp
-# Linking TAO_IDL runs out of TOC space unless -bbigtoc is given to ld.
-# Don't do it for everything because it decreases run-time performance.
-ifeq ($(notdir $(shell pwd)), TAO_IDL)
-LDFLAGS        += -Wl,-bbigtoc
-endif
+LDFLAGS	       += -Wl,-bI:/lib/pse.exp 
 OCFLAGS         = -O2
 OCCFLAGS        = $(OCFLAGS)
 ifeq ($(threads),1)
diff --git a/include/makeinclude/platform_cray.GNU b/include/makeinclude/platform_cray.GNU
index a36b6fd3c27..026ded4ba07 100644
--- a/include/makeinclude/platform_cray.GNU
+++ b/include/makeinclude/platform_cray.GNU
@@ -1,13 +1,12 @@
 # $Id$
 
-# Platform macros for SGI/Cray UNICOS (vector) & UNICOS/mk (mpp) -
-#    UNICOS 9.0.2.8
-#    UNICOS 10.0.0.5
-#    UNICOS/mk 2.0.4.57
-#    Cray C++ Version 3.2.0.1
-#    Cray Standard C Version 6.2.0.1
+# Initial platform macros for SGI/Cray UNICOS (vector) & UNICOS/mk (mpp) - 
+#    UNICOS 10.0.0.2
+#    UNICOS/mk 2.0.3.10
+#    Cray C++ Version 3.1.0.0
+#    Cray Standard C Version 6.1.0.0
 #
-# Contributed by Doug Anderson <dla@home.com>
+# Contributed by Doug Anderson <doug@clark.net>
 
 debug = 1
 exceptions = 1
@@ -19,13 +18,13 @@ purify =
 # C++ prelinker: error: instantiation loop
 # So, we're using ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 CC              = cc
-LDLIB           += -L$(ACE_ROOT)/ace
-CXX             = CC
-#CFLAGS         +=
-CCFLAGS         += -h noautoinstantiate
-DCFLAGS         += -g
-DCCFLAGS        += $(DCFLAGS)
-OCFLAGS         += -O2
+LDLIB		+= -L$(ACE_ROOT)/ace
+CXX		= CC
+#CFLAGS		+= 
+CCFLAGS		+= -h noautoinstantiate
+DCFLAGS		+= -g
+DCCFLAGS	+= $(DCFLAGS)
+OCFLAGS		+= -O2
 OCCFLAGS        += $(OCFLAGS)
 
 ifndef exceptions
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index 3814a3e074d..dab665250d5 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -15,21 +15,10 @@
 #  -Wl,+vnocompatwarnings is added to shut up the "At least one PA 2.0 object
 # file detected..." messages.
 
-ifeq (,$(buildbits))
-  buildbits = 0
-endif
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(distrib))
-  distrib = 0
-endif
-ifeq (,$(optimize))
-  optimize = 0
-endif
-ifeq (,$(threads))
-  threads = 1
-endif
+buildbits = 0
+debug = 1
+distrib = 0
+threads = 1
 
 # First, extract the OS version number.
 HPVERS_WORDS := $(subst ., ,$(shell uname -r))
@@ -37,6 +26,8 @@ HPUX_VERS	:= $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
 #
 CC		= /bin/cc
 CXX		= /opt/aCC/bin/aCC
+# CPP_LOCATION is for TAO builds - says where the C preprocessor is
+CPP_LOCATION    = /usr/ccs/lbin/cpp
 #
 # Set the appropriate preprocessor defs for threading based on OS version.
 # If the user has requested building without threads, then don't set any
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU
index f83ca5db6cf..0bef1ac4e2b 100644
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ b/include/makeinclude/platform_osf1_4.0.GNU
@@ -36,14 +36,14 @@ ifneq ($(CXX_VER),CXX_5)
   endif # ACE_DU_VERSION
 endif # 6.0 or later
 
-CCFLAGS         += $(CFLAGS) $(WARNING_FLAGS)
+CCFLAGS         += $(CFLAGS) -ptr ptrepository $(WARNING_FLAGS)
 ifeq ($(rtti),)
   CCFLAGS += -nortti
 endif # rtti
 DCFLAGS         += -g -O0
 DLD             = $(CXX)
 LD              = $(CXX)
-LIBS            += $(CFLAGS) -ltli -lrt
+LIBS            += $(CFLAGS) -ptr ptrepository -ltli -lrt
 MATHLIB         = -lm
 OCFLAGS         += -O4
 PIC             =
diff --git a/include/makeinclude/platform_osf1_cxx.GNU b/include/makeinclude/platform_osf1_cxx.GNU
new file mode 100644
index 00000000000..285499f3454
--- /dev/null
+++ b/include/makeinclude/platform_osf1_cxx.GNU
@@ -0,0 +1,30 @@
+# $Id$
+
+# This platform macros file is intended to work with
+# Digital UNIX using the cxx compiler.
+
+ifndef ACE_DU_VERSION
+  ACE_DU_VERSION := $(shell uname -r)
+endif # ACE_DU_VERSION
+
+ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
+  include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
+
+else # ! 3.x
+ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
+  include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
+  CFLAGS += -DDIGITAL_UNIX=4
+  ifneq ($(CXX_VER),CXX_5)
+    # 9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
+    WARNING_FLAGS += -msg_disable 9
+  endif # 6.0 or later
+
+else # ! 4.x
+ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
+  include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
+  CFLAGS += -DDIGITAL_UNIX=5
+  SOFLAGS = -shared -use_ld_input $(ACELIB)
+
+endif # 5.x
+endif # ! 4.x
+endif # ! 3.x
diff --git a/include/makeinclude/platform_qnx_neutrino.GNU b/include/makeinclude/platform_qnx_neutrino.GNU
index 8558118b8d9..682770780e5 100644
--- a/include/makeinclude/platform_qnx_neutrino.GNU
+++ b/include/makeinclude/platform_qnx_neutrino.GNU
@@ -7,21 +7,17 @@
 #       way to do that is to set "optimize = 0", either below or on
 #       your make command line.
 
-CROSS-COMPILE = 1
-
 ifeq (,$(debug))
   debug = 1
-endif # ! debug
+endif
 ifeq (,$(optimize))
   optimize = 0
-endif # ! optimize
+endif
 
 static_libs_only = 1
 
-ACE_HAS_GNUG_PRE_2_8 := 0
-
-CC      = i386-nto-gcc
-CXX     = i386-nto-g++
+CC      = /usr/gcc/bin/i386-nto-gcc
+CXX     = /usr/gcc/bin/i386-nto-g++
 CFLAGS  += -pipe -W -Wall -Wpointer-arith -Winline
 CCFLAGS += $(CFLAGS) -fno-implicit-templates
 DCFLAGS += -g
@@ -31,9 +27,9 @@ LDFLAGS +=
 LIBS    += -lsocket -lstdc++
 OCFLAGS += -O2
 PIC     = -fPIC
-AR      = i386-nto-ar
+AR      = /usr/gcc/bin/ar
 ARFLAGS = ruv
-RANLIB  = i386-nto-ranlib
+RANLIB  = /usr/gcc/bin/ranlib
 SOFLAGS = -G $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 PRELIB  = @true
diff --git a/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU b/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU
index 4eba0aa5e00..da2331d139a 100644
--- a/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU
+++ b/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU
@@ -10,37 +10,27 @@
 # to produce libACE.so correctly changed the specs file for gcc 2.7.2
 # for not link -lc and -lgcc and other not shared libraries
 
-debug = 0
+debug = 1
 optimize = 1
 
 CC              = gcc
 # for no threads
 LDLIBS		+= -lm -L $(ACE_ROOT)/ace 
 CXX		= g++
-CFLAGS		+= -melf -m386 -w 
-CCFLAGS		+= -melf -m386  
-ifneq ($(FSU_PTHREADS_DIR),"")
-CCFLAGS		+= -I$(FSU_PTHREADS_DIR)/include
-endif
+CFLAGS		+= -melf -w 
+CCFLAGS		+= -melf -fno-implicit-templates 
 # -g option not supported for C++ on systems using the DWARF debugging format
-DCFLAGS		+= -g
+#DCFLAGS		+= -g
 DCCFLAGS	+= $(DCFLAGS)
 DLD             = $(CXX)
 LD              = $(CXX) /usr/lib/libc.so.1
-ifneq ($(FSU_PTHREADS_DIR),"")
-LIBS		+= -L$(FSU_PTHREADS_DIR)/lib
-endif
-LIBS		+= -lgthreads
-LIBS            += -lnsl -lsocket
-LIBS		+= -lgthreads
-OCFLAGS		+= -O2
+LIBS            = -lnsl -lsocket
 OCCFLAGS        += $(OCFLAGS)
-PIC             = -fpic
+PIC             = -fPIC
 AR              = ar
 ARFLAGS         = ruv
 RANLIB          = /bin/true
 
-SOFLAGS = 
-SOLINK = gcc $(PIC) -melf -shared
-SOBUILD = $(SOLINK) -o $(VSHDIR)$*.so $<
+SOFLAGS = $(CPPFLAGS) -melf -fPIC -G
+SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 PRELIB  = @true
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 166b6a09f1e..f551c5d9814 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -7,14 +7,6 @@
 #   inlining is disabled by default with Sun C++ 5.0.  If you'd like
 #   to try enabling it, comment out the "inline = 0" line below.
 #
-# To enable compilation of 64-bit binaries with Sun CC 5.0, a
-# platform_macros.GNU file such as this can be used:
-#     fast=1
-#     include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU
-#     CCFLAGS += -xtarget=ultra2 -xarch=v9a #### CPU specific!
-# Please note that the xtarget and xarch settings are specific to
-# the target CPU.
-#
 # With slight modification, this file could be used with Sun C++ 4.1.
 # However, it's likely that you won't be able to build all of ACE
 # with Sun C++ 4.1.
diff --git a/include/makeinclude/platform_tru64_cxx.GNU b/include/makeinclude/platform_tru64_cxx.GNU
index fd31859ee28..285499f3454 100644
--- a/include/makeinclude/platform_tru64_cxx.GNU
+++ b/include/makeinclude/platform_tru64_cxx.GNU
@@ -5,7 +5,7 @@
 
 ifndef ACE_DU_VERSION
   ACE_DU_VERSION := $(shell uname -r)
-endif # ! ACE_DU_VERSION
+endif # ACE_DU_VERSION
 
 ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
@@ -13,25 +13,7 @@ ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
 else # ! 3.x
 ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
-
-  ifndef ACE_DU_SUBVERSION
-    ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer v-)
-  endif # ! ACE_DU_SUBVERSION
-
-  ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION)))
-    CFLAGS += -DDIGITAL_UNIX=0x40F
-  else
-  ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION)))
-    CFLAGS += -DDIGITAL_UNIX=0x40E
-  else
-  ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION)))
-    CFLAGS += -DDIGITAL_UNIX=0x40D
-  else
-    CFLAGS += -DDIGITAL_UNIX=0x400
-  endif
-  endif
-  endif
-
+  CFLAGS += -DDIGITAL_UNIX=4
   ifneq ($(CXX_VER),CXX_5)
     # 9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
     WARNING_FLAGS += -msg_disable 9
@@ -40,7 +22,7 @@ ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
 else # ! 4.x
 ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
-  CFLAGS += -DDIGITAL_UNIX=0x500
+  CFLAGS += -DDIGITAL_UNIX=5
   SOFLAGS = -shared -use_ld_input $(ACELIB)
 
 endif # 5.x
diff --git a/include/makeinclude/platform_tru64_g++.GNU b/include/makeinclude/platform_tru64_g++.GNU
deleted file mode 100644
index ef5fea64d5c..00000000000
--- a/include/makeinclude/platform_tru64_g++.GNU
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id$
-
-# This platform macros file is intended to work with
-# Digital UNIX using the GNU compiler.
-
-ifndef ACE_DU_VERSION
-  ACE_DU_VERSION := $(shell uname -r)
-endif # ACE_DU_VERSION
-
-ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
-
-else # ! 3.x
-ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU
-
-  ifeq (4.0F,$(findstring 4.0F,$(shell /usr/sbin/sizer -v)))
-    CFLAGS += -DDIGITAL_UNIX=0x40F
-  else  # ! 4.0F
-    CFLAGS += -DDIGITAL_UNIX=0x400
-  endif # ! 4.0F
-
-else # ! 4.x
-ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU
-  CFLAGS += -DDIGITAL_UNIX=0x500
-
-endif # 5.x
-endif # ! 4.x
-endif # ! 3.x
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index 531c3a3840b..76ca934af3c 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -15,19 +15,13 @@
 VXWORKS = 1
 CROSS-COMPILE = 1
 
-ifndef debug
-  debug = 1
-endif # ! debug
-ifndef optimize
-  optimize = 1
-endif # ! optimize
-ifndef rtti
-  rtti =
-endif # ! rtti
-
+debug = 1
+optimize = 1
+rtti =
 shared_libs =
 static_libs = 1
 
+
 ifeq (,$(WIND_BASE))
   default:
 	@ERROR: you must set your WIND_BASE environment variable
@@ -158,23 +152,6 @@ OCFLAGS         += -O
 PIC             =
 
 
-#### Tornado II uses egcs
-ifndef ACE_CC
-  ACE_CC := $(shell PATH=${PATH} type $(CC) | sed -e 's/.* is //')
-endif # ! ACE_CC
-ifndef ACE_CC_VERSION
-  ACE_CC_VERSION := $(shell $(ACE_CC) --version)
-endif # ! ACE_CC_VERSION
-ifeq (egcs,$(findstring egcs,$(ACE_CC_VERSION)))
-  ACE_HAS_GNUG_PRE_2_8 := 0
-  CFLAGS += -DACE_VXWORKS=0x540
-  ifndef exceptions
-    #### With exceptions, this is applied in wrapper_macros.GNU.
-    CFLAGS += -Wno-uninitialized
-  endif # ! exceptions
-endif # egcs
-
-
 #### ld can't handle INCLDIRS, so override LINK definitions.
 LINK.c           = override
 LINK.c.override  = $(LD) $(LDFLAGS) $(LDLIBS) $(LIBS)
diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU
index be646f2f62e..ee1bca15cec 100644
--- a/include/makeinclude/platform_vxworks5.x_ghs.GNU
+++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU
@@ -61,6 +61,9 @@ ifeq ($(CPU),86)
 
   #### For GHS 1.8.8:
   #### LIBS += $(GHS)/libedgnoe.a
+
+  #### For GHS 1.8.9:
+  LIBS += $(GHS)/libscnoe.a $(GHS)/libsedgnoe.a $(GHS)/liblockinit_sc.o
 else
 ifeq ($(CPU),ppc)
   ifndef GHS
@@ -68,14 +71,10 @@ ifeq ($(CPU),ppc)
   endif # GHS
   AR = ax
   ARFLAGS  = cr
-
-  #### For GHS 1.8.8:
-  #### LIBS += $(GHS)/ghsbltin.o $(GHS)/ghsmath.o
+  LIBS += $(GHS)/ghsbltin.o $(GHS)/ghsmath.o
 endif # ppc
 endif # CPU
 
-#### For GHS 1.8.9:
-LIBS += $(GHS)/libscnoe.a $(GHS)/libsedgnoe.a $(GHS)/liblockinit_sc.o
 
 CC       = cxvx$(CPU)
 CXX      = $(CC)
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index 5af8b175996..80a9aa29aee 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -32,7 +32,7 @@ ifndef TAO_ROOT
 # only ONE of these rules will be run at make-time,
 
 # The rules are only used if TAO_ROOT is not defined to avoid
-# conflicts with a similar rule in TAO.
+# conflicts with a similar rule in TAO. 
 
 %S.cpp: %.idl
 	$(IDL) --version $(IDLFLAGS) $<
@@ -111,19 +111,13 @@ show_uninit:
 install.local: $(INSTALL)
 
 deinstall.local:
-	$(RM) $(INSTALL) $(LIB:%.a=$(INSLIB)/%*.a) \
-$(SHLIB:%.$(SOEXT)=$(INSLIB)/%*.$(SOEXT))
+	$(RM) $(INSTALL) $(LIB:%.a=$(INSLIB)/%*.a) $(SHLIB:%.$(SOEXT)=$(INSLIB)/%*.$(SOEXT))
 
 
 #### To disable installs, just add "INSTALL=" to your "make" invocation.
 
 ifeq (,$(LN_S))
-  ifdef COMSPEC
-    #### Assume we're on a WIN32 host.
-    LN_S = cp -p
-  else  # ! WIN32
-    LN_S = ln -s
-  endif # ! WIN32
+  LN_S = ln -s
 endif # ! LN_S
 
 $(INSBIN)/%$(VAR) \
@@ -166,8 +160,8 @@ endif
 
 clean.local:
 	-$(RM) *.o *~ *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-$(RM) -r $(OBJDIRS) $(TEMPINCDIR) cxx_repository ptrepository \
-Templates.DB gcctemp.c gcctemp so_locations
+	-$(RM) -r $(OBJDIRS) $(TEMPINCDIR) ptrepository Templates.DB \
+	  gcctemp.c gcctemp so_locations
 
 realclean.local: clean.local
 	-$(RM) $(BIN) $(BIN:%=%_debug) $(BIN:%=%_profile) $(BIN:%=%_optimize) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize) $(SHLIBA:%=%) $(BIN2) $(BIN2:%=%_debug) $(BIN2:%=%_profile) $(BIN2:%=%_optimize) $(LIB2:%=%) $(LIB2:%=%_debug) $(LIB2:%=%_profile) $(LIB2:%=%_optimize) $(SHLIB2:%=%) $(SHLIB2:%=%_debug) $(SHLIB2:%=%_profile) $(SHLIB2:%=%_optimize) $(SHLIBA2:%=%)
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 41af00636de..e3624eb97fb 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -40,7 +40,7 @@
 #  threads          Build with thread support.
 #  xt_reactor       Build the XtReactor.
 #  fl_reactor       Build the FlReactor.
-#  tk_reactor       Build the TkReactor.
+#  tk_reactor       Build the TkReactor.    
 #
 #  Usually, users do not need to be concerned with make targets.
 #  Just enter "make" on the command line to build.  A few notable
@@ -60,11 +60,7 @@
 #  ACE_HAS_GNUG_PRE_2_8 CXX includes "g++", and the g++ version is
 #                       prior to 2.8.0.  This is automatically determined
 #                       below, but can be overridden in the user's
-#                       platform_macros.GNU or environment.  Three values
-#                       are supported:
-#                         1 for g++ < 2.8.0,
-#                         0 for g++ >= 2.8.0 or egcs,
-#                         undefined for non-g++ compilers.
+#                       platform_macros.GNU or environment.
 #  ARFLAGS      Flags for the archive utility (ar)
 #  CC           C compiler command
 #  CXX          C++ compiler command
@@ -199,16 +195,18 @@ ifeq ($(findstring g++,$(CXX)),g++)
         $(shell \
           if $(CXX) --version | egrep '^(cygnus-)?2\.[0-7]' > /dev/null; then \
           echo 1; else echo 0; fi)
-    else  # ! g++
+    else
     ifeq ($(CXX),eg++)
       # Assume that eg++ is egcs.
       ACE_HAS_GNUG_PRE_2_8 := 0
     else  # ! plain g++ or eg++
       # CXX is something like g++386.  Assume, for now, that it's an old g++.
       ACE_HAS_GNUG_PRE_2_8 := 1
-    endif # ! plain g++ or eg++eg++
-    endif # ! g++
+    endif # eg++
+    endif # ! plain g++ or eg++
   endif # ! ACE_HAS_GNUG_PRE_2_8
+else
+  ACE_HAS_GNUG_PRE_2_8 =
 endif # g++
 
 #----------------------------------------------------------------------------
@@ -301,17 +299,13 @@ endif # ace_with_x11
 
 ifdef exceptions
   CPPFLAGS += -DACE_HAS_EXCEPTIONS
-  ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    #### Enable exception handling with g++ < 2.8.0.  Not recommended,
-    #### but provided here for completeness.
-    CCFLAGS += -fhandle-exceptions
-  else  # ! ACE_HAS_GNUG_PRE_2_8
-  ifeq ($(ACE_HAS_GNUG_PRE_2_8),0)
-    #### Disable this warning on g++ >= 2.8.0 if exceptions are enabled,
-    #### it gets confused and reports too many bogus warnings.
-    CFLAGS += -Wno-uninitialized
-  endif # g++ > 2.8.0
-  endif # ! ACE_HAS_GNUG_PRE_2_8
+  ifeq ($(findstring g++,$(CXX)),g++)
+    ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
+      #### Enable exception handling with g++ < 2.8.0.  Not recommended,
+      #### but provided here for completeness.
+      CCFLAGS += -fhandle-exceptions
+    endif # ACE_HAS_GNUG_PRE_2_8
+  endif # g++
 else  # ! exceptions
   ifeq ($(ACE_HAS_GNUG_PRE_2_8),0)
     #### Disable the default exception handling of g++ >= 2.8.0.
diff --git a/netsvcs/clients/Naming/Dump_Restore/nametest.cpp b/netsvcs/clients/Naming/Dump_Restore/nametest.cpp
deleted file mode 100644
index fb9c71a5014..00000000000
--- a/netsvcs/clients/Naming/Dump_Restore/nametest.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "ace/Naming_Context.h"
-// $Id$
-
-#include "ace/Name_Options.h"
-#include "nametest.h"
-
-void 
-Nametest::listopt (void)
-{
-  cout << "serverport is " 
-       << ACE_Name_Options::instance ()->nameserver_port() 
-       << endl;
-  cout << "serverhost is " 
-       << ACE_Name_Options::instance ()->nameserver_host() 
-       << endl;
-  cout << "process_name is " 
-       << ACE_Name_Options::instance ()->process_name() 
-       << endl;
-  cout << "namespace_dir is " 
-       << ACE_Name_Options::instance ()->namespace_dir() 
-       << endl;
-}
-
-int 
-Nametest::init (int argc, char *argv[])
-{
-  ACE_Server_Record *sr;
-  ACE_Service_Config::svc_rep ()->find ("Name_Server_Proxy", &sr);
-  ACE_Service_Type *st = sr->type ();
-  ACE_Server_Object *so = st->object ();
-dynamic_cast<ACE_Name_Server_Proxy *> (so);
-
-  ACE_Name_Server_Proxy *ns_proxy = ACE_Service_Config::name_server_proxy ();
-  
-  ns_proxy->bind (...);
-
-  this->listopt ();
-
-  ACE_Naming_Context ns_context;
-
-  if (ns_context.open (ACE_Naming_Context::NET_LOCAL) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ns_context.open"), -1);
-
-  const char *mykey = argv[0];
-  char *myvalue = argv[1];
-  char *ns_value = 0;
-  char *ns_type = 0;
-
-  if (ns_context.bind (mykey, myvalue, "ottotype") == -1)
-    cout << "bind failed" << endl;
-  else
-    cout << "bind succeeded" << endl;
-
-
-  if (ns_context.resolve (mykey, ns_value, ns_type) == -1)
-    cout << "resolve of " << mykey << " failed" << endl;
-  else
-    cout << "resolve of " << mykey << " succeeded, value = " 
-	 << ns_value << ", type = " << ns_type << endl;
-
-  delete [] ns_value;
-  delete [] ns_type;
-  ns_value = 0;
-  ns_type = 0;
-
-  if (ns_context.rebind (mykey, myvalue, "newottotype") == -1)
-    cout << "rebind failed" << endl;
-  else
-    cout << "rebind succeeded" << endl;
-
-  if (ns_context.resolve (mykey, ns_value, ns_type) == -1)
-    cout << "resolve of " << mykey << " failed" << endl;
-  else
-    cout << "resolve of " << mykey << " succeeded, value = " 
-	 << ns_value << ", type = " << ns_type << endl;
-
-  delete [] ns_value;
-  delete [] ns_type;
-  ns_value = 0;
-  ns_type = 0;
-
-  if (ns_context.unbind (mykey) == -1)
-    cout << "unbind failed" << endl;
-  else
-    cout << "unbind succeeded" << endl;
-
-  return 0;
-}
-
-int 
-Nametest::fini (void)
-{
-  cout << "Nametest::fini called" << endl;
-  return 0;
-}
-
-int 
-Nametest::info (char **, unsigned) const
-{
-  cout << "Nametest::info called" << endl;
-  return 0;
-}
-
-extern "C" ACE_Service_Object *_alloc(void);
-
-// Factory function that is called automatically when the ACE
-// framework dynamically links this shared object file.
-
-ACE_Service_Object *_alloc (void) 
-{
-  return new Nametest;
-}
diff --git a/netsvcs/clients/Naming/Dump_Restore/nametest.h b/netsvcs/clients/Naming/Dump_Restore/nametest.h
deleted file mode 100644
index fa0cc5dc05c..00000000000
--- a/netsvcs/clients/Naming/Dump_Restore/nametest.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "ace/Service_Object.h"
-
-class Nametest : public ACE_Service_Object
-{
-public:
-  virtual int init (int argc, char *argv[]);
-  virtual int fini (void);
-  virtual int info (char **, size_t) const;
-
-  void listopt (void);
-};
-
diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp
index 0fc8fa295b3..5cc31341df3 100644
--- a/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/netsvcs/lib/Client_Logging_Handler.cpp
@@ -216,9 +216,7 @@ int
 ACE_Client_Logging_Handler::send (ACE_Log_Record &log_record)
 {
   if (this->logging_output_ == ACE_STDERR)
-    log_record.print ("<localhost>",
-                      ACE_Log_Msg::instance ()->flags (),
-                      stderr);
+    log_record.print ("<localhost>", 0, stderr);
   else
     {
       long len = log_record.length ();
@@ -238,7 +236,7 @@ ACE_Client_Logging_Handler::send (ACE_Log_Record &log_record)
 
   if (orig_ostream)
     log_record.print ("<localhost>",
-                      ACE_Log_Msg::instance ()->flags (),
+                      0,
                       *orig_ostream);
   return 0;
 }
diff --git a/netsvcs/lib/Client_Logging_Handler.i b/netsvcs/lib/Client_Logging_Handler.i
deleted file mode 100644
index 57c6d26e751..00000000000
--- a/netsvcs/lib/Client_Logging_Handler.i
+++ /dev/null
@@ -1,4 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
diff --git a/netsvcs/lib/Log_Message_Receiver.cpp b/netsvcs/lib/Log_Message_Receiver.cpp
index 0a10a735988..e9e6cf4812e 100644
--- a/netsvcs/lib/Log_Message_Receiver.cpp
+++ b/netsvcs/lib/Log_Message_Receiver.cpp
@@ -19,9 +19,7 @@ Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (char const *hostname,
     ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, lock_);
 #endif /* ACE_HAS_THREADS */
 
-  record.print (hostname,
-                ACE_Log_Msg::instance ()->flags (),
-                stderr);
+  record.print (hostname, 0, stderr);
 }
 
 template<ACE_SYNCH_DECL> void
@@ -35,9 +33,7 @@ Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_output (char const *hostname,
       static ACE_SYNCH_MUTEX_T lock_;
       ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, lock_);
 #endif /* ACE_HAS_THREADS */
-      record.print (hostname,
-                    ACE_Log_Msg::instance ()->flags (),
-                    *outputfile);
+      record.print (hostname, 0, *outputfile);
     }
 }
 
@@ -102,9 +98,7 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (char const *hostname,
 						    ACE_Log_Record &record)
 {
   ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, print_lock_));
-  record.print (hostname,
-                ACE_Log_Msg::instance ()->flags (),
-                stderr);
+  record.print (hostname, 0, stderr);
 }
 
 template<ACE_SYNCH_DECL> void
@@ -115,9 +109,7 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_output (char const *hostname,
   if (outputfile != 0)
     {
       ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, print_lock_));
-      record.print (hostname,
-                    ACE_Log_Msg::instance ()->flags (),
-                    *outputfile);
+      record.print (hostname, 0, *outputfile);
     }
 }
 
diff --git a/netsvcs/lib/Logging_Strategy.cpp b/netsvcs/lib/Logging_Strategy.cpp
index 2ce9b48d9bd..d0e045e2f18 100644
--- a/netsvcs/lib/Logging_Strategy.cpp
+++ b/netsvcs/lib/Logging_Strategy.cpp
@@ -24,8 +24,6 @@ ACE_Logging_Strategy::tokenize (char *flag_string)
 	ACE_SET_BITS (this->flags_, ACE_Log_Msg::OSTREAM);
       else if (ACE_OS::strcmp (flag, "VERBOSE") == 0)
 	ACE_SET_BITS (this->flags_, ACE_Log_Msg::VERBOSE);
-      else if (ACE_OS::strcmp (flag, "VERBOSE_LITE") == 0)
-        ACE_SET_BITS (this->flags_, ACE_Log_Msg::VERBOSE_LITE);
       else if (ACE_OS::strcmp (flag, "SILENT") == 0)
 	ACE_SET_BITS (this->flags_, ACE_Log_Msg::SILENT);
     }
@@ -40,6 +38,8 @@ ACE_Logging_Strategy::parse_args (int argc, char *argv[])
   this->flags_ = 0;
   this->filename_ = ACE_DEFAULT_LOGFILE;
 
+  ACE_LOG_MSG->open ("Logging_Strategy");
+
   ACE_Get_Opt get_opt (argc, argv, "f:s:", 0);
 
   for (int c; (c = get_opt ()) != -1; )
@@ -76,28 +76,22 @@ ACE_Logging_Strategy::init (int argc, char *argv[])
   if (this->flags_ != 0)
     {
       // Clear all flags
-      ACE_Log_Msg::instance()->clr_flags (ACE_Log_Msg::STDERR  
-                                          | ACE_Log_Msg::LOGGER  
-                                          | ACE_Log_Msg::OSTREAM 
-                                          | ACE_Log_Msg::VERBOSE 
-                                          | ACE_Log_Msg::VERBOSE_LITE 
-                                          | ACE_Log_Msg::SILENT);
+      ACE_Log_Msg::instance()->clr_flags (ACE_Log_Msg::STDERR  | 
+					  ACE_Log_Msg::LOGGER  |
+					  ACE_Log_Msg::OSTREAM |
+					  ACE_Log_Msg::VERBOSE |
+					  ACE_Log_Msg::SILENT);
       // Check if OSTREAM bit is set
-      if (ACE_BIT_ENABLED (this->flags_, 
-                           ACE_Log_Msg::OSTREAM))
+      if (ACE_BIT_ENABLED (this->flags_, ACE_Log_Msg::OSTREAM))
 	{
 	  // Create a new ofstream to direct output to the file
-	  ofstream *output_file =
-            new ofstream (this->filename_);
+	  ofstream *output_file = new ofstream (this->filename_);
 	  ACE_Log_Msg::instance()->msg_ostream (output_file);
 	}
       // Now set the flags for Log_Msg
       ACE_Log_Msg::instance()->set_flags (this->flags_);
     }
-
-  return ACE_LOG_MSG->open ("Logging_Strategy",
-                            ACE_LOG_MSG->flags (),
-                            ACE_WIDE_STRING (ACE_DEFAULT_LOGGER_KEY));
+  return 0;
 }
 
 // The following is a "Factory" used by the ACE_Service_Config and
diff --git a/netsvcs/lib/Server_Logging_Handler.i b/netsvcs/lib/Server_Logging_Handler.i
deleted file mode 100644
index 57c6d26e751..00000000000
--- a/netsvcs/lib/Server_Logging_Handler.i
+++ /dev/null
@@ -1,4 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
diff --git a/netsvcs/servers/cli.conf b/netsvcs/servers/cli.conf
deleted file mode 100644
index b2d8fbc8194..00000000000
--- a/netsvcs/servers/cli.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# UNIX version
-#
-# These are the services that can be linked into ACE.
-# Note that you can replace the hardcoded "../lib/libnet_svcs" with
-# a relative path if you set your LD search path correctly -- ACE will
-# locate this for you automatically by reading your LD search path!
-# In addition, you can replace the hardcoded "-p 20xxx" with "-p
-# $PORTxxx" if you set your environment variables correctly.
-
-# Activate the Client Logging Daemon.
-dynamic Client_Logging_Service Service_Object * ../lib/libnet_svcs:_make_ACE_Client_Logging_Connector() active "-p 20009 -h merengue"
diff --git a/netsvcs/servers/main.cpp b/netsvcs/servers/main.cpp
index e926bee451d..c0881b3b0aa 100644
--- a/netsvcs/servers/main.cpp
+++ b/netsvcs/servers/main.cpp
@@ -33,119 +33,109 @@ main (int argc, char *argv[])
   if (ACE_Service_Config::open (argc, argv) == -1)
     {
       if (errno != ENOENT)
-        ACE_ERROR_RETURN ((LM_ERROR,
+	ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "open"),
                           1);
       else // Use static linking.
-        {
-          if (ACE::debug () == 0)
-            ACE_Log_Msg::disable_debug_messages ();
-
+	{
           // Calling ACE_SVC_INVOKE to create a new Service_Object.
           // Stash the newly created Service_Object into an
           // ACE_Service_Object_Ptr which is an <auto_ptr> specialized
           // for ACE_Service_Object.
 
-          char *l_argv[3];
+	  char *l_argv[3];
           char name_port[] = "-p " ACE_DEFAULT_NAME_SERVER_PORT_STR;
 
           l_argv[0] = name_port;
-          l_argv[1] = 0;
-          ACE_Service_Object_Ptr sp_1 = ACE_SVC_INVOKE (ACE_Name_Acceptor);
+	  l_argv[1] = 0;
+	  ACE_Service_Object_Ptr sp_1 = ACE_SVC_INVOKE (ACE_Name_Acceptor);
 
-          if (sp_1->init (1, l_argv) == -1)
-            ACE_ERROR ((LM_ERROR,
+	  if (sp_1->init (1, l_argv) == -1)
+	    ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "Name Service",
                         1));
 
           char time_port[] = "-p " ACE_DEFAULT_TIME_SERVER_PORT_STR;
-          l_argv[0] = time_port;
-          l_argv[1] = 0;
-          ACE_Service_Object_Ptr sp_2 = ACE_SVC_INVOKE (ACE_TS_Server_Acceptor);
+	  l_argv[0] = time_port;
+	  l_argv[1] = 0;
+	  ACE_Service_Object_Ptr sp_2 = ACE_SVC_INVOKE (ACE_TS_Server_Acceptor);
 
-          if (sp_2->init (1, l_argv) == -1)
-            ACE_ERROR ((LM_ERROR,
+	  if (sp_2->init (1, l_argv) == -1)
+	    ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "TS Server Acceptor", 1));
 
           char clerk_port[] = "-p 10011";
-          l_argv[0] = argv[0];
-          l_argv[1] = clerk_port;
-          l_argv[2] = 0;
-          ACE_Service_Object_Ptr sp_3 = ACE_SVC_INVOKE (ACE_TS_Clerk_Processor);
+	  l_argv[0] = argv[0];
+	  l_argv[1] = clerk_port;
+	  l_argv[2] = 0;
+	  ACE_Service_Object_Ptr sp_3 = ACE_SVC_INVOKE (ACE_TS_Clerk_Processor);
 
-          if (sp_3->init (2, l_argv) == -1)
-            ACE_ERROR ((LM_ERROR,
+	  if (sp_3->init (2, l_argv) == -1)
+	    ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "TS Clerk Processor",
                         1));
 
           char token_port[] = "-p " ACE_DEFAULT_TOKEN_SERVER_PORT_STR;
-          l_argv[0] = token_port;
-          l_argv[1] = 0;
-          ACE_Service_Object_Ptr sp_4 = ACE_SVC_INVOKE (ACE_Token_Acceptor);
+	  l_argv[0] = token_port;
+	  l_argv[1] = 0;
+	  ACE_Service_Object_Ptr sp_4 = ACE_SVC_INVOKE (ACE_Token_Acceptor);
 
-          if (sp_4->init (1, l_argv) == -1)
-            ACE_ERROR ((LM_ERROR,
+	  if (sp_4->init (1, l_argv) == -1)
+	    ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "Token Service",
                         1));
 
           char thr_logging_port[] = "-p " ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR;
-          l_argv[0] = thr_logging_port;
-          l_argv[1] = 0;
-          ACE_Service_Object_Ptr sp_5 =
-            ACE_SVC_INVOKE (ACE_Thr_Server_Logging_Acceptor);
+	  l_argv[0] = thr_logging_port;
+	  l_argv[1] = 0;
+	  ACE_Service_Object_Ptr sp_5 = ACE_SVC_INVOKE (ACE_Thr_Server_Logging_Acceptor);
 
-          if (sp_5->init (1, l_argv) == -1)
-            ACE_ERROR ((LM_ERROR,
+	  if (sp_5->init (1, l_argv) == -1)
+	    ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "Threaded Logging Server",
                         1));
 
           char logging_port[] = "-p " ACE_DEFAULT_LOGGING_SERVER_PORT_STR;
-          l_argv[0] = logging_port;
-          l_argv[1] = 0;
-          ACE_Service_Object_Ptr sp_6 =
-            ACE_SVC_INVOKE (ACE_Server_Logging_Acceptor);
+	  l_argv[0] = logging_port;
+	  l_argv[1] = 0;
+	  ACE_Service_Object_Ptr sp_6 = ACE_SVC_INVOKE (ACE_Server_Logging_Acceptor);
 
-          if (sp_6->init (1, l_argv) == -1)
-            ACE_ERROR ((LM_ERROR,
+	  if (sp_6->init (1, l_argv) == -1)
+	    ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "Logging Server", 1));
 
-          l_argv[0] = logging_port;
-          l_argv[1] = 0;
-          ACE_Service_Object_Ptr sp_7 =
-            ACE_SVC_INVOKE (ACE_Client_Logging_Acceptor);
+	  l_argv[0] = logging_port;
+	  l_argv[1] = 0;
+	  ACE_Service_Object_Ptr sp_7 = ACE_SVC_INVOKE (ACE_Client_Logging_Acceptor);
 
-          if (sp_7->init (1, l_argv) == -1)
-            ACE_ERROR ((LM_ERROR,
+	  if (sp_7->init (1, l_argv) == -1)
+	    ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "Logging Client",
                         1));
 
-          // Run forever, performing the configured services until we
-          // are shut down by a SIGINT/SIGQUIT signal.
+	  // Run forever, performing the configured services until we
+	  // are shut down by a SIGINT/SIGQUIT signal.
 
-          ACE_Reactor::run_event_loop ();
+	  ACE_Reactor::run_event_loop ();
 
-          // Destructors of ACE_Service_Object_Ptr's automagically
-          // call fini().
-        }
+	  // Destructors of ACE_Service_Object_Ptr's automagically
+	  // call fini().
+	}
     }
   else // Use dynamic linking.
-    {
-      if (ACE::debug () == 0)
-        ACE_Log_Msg::disable_debug_messages ();
 
-      // Run forever, performing the configured services until we are
-      // shut down by a SIGINT/SIGQUIT signal.
+    // Run forever, performing the configured services until we are
+    // shut down by a SIGINT/SIGQUIT signal.
 
-      ACE_Reactor::run_event_loop ();
-    }
+    ACE_Reactor::run_event_loop ();
 
   return 0;
 }
diff --git a/netsvcs/servers/ntsvc.conf b/netsvcs/servers/ntsvc.conf
deleted file mode 100644
index 94ed5d78c2a..00000000000
--- a/netsvcs/servers/ntsvc.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Windows NT version.
-#
-# These are the services that can be linked into ACE.
-# Note that your path needs to include the path for netsvcs.dll
-# In addition, you can replace the hardcoded "-p 20xxx" with "-p
-# $PORTxxx" if you set your environment variables correctly.
-
-dynamic Token_Service Service_Object * netsvcs.dll:_make_ACE_Token_Acceptor() "-p 20202"
-dynamic Name_Server Service_Object * netsvcs.dll:_make_ACE_Name_Acceptor() "-p 20012"
-#dynamic Client_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Client_Logging_Connector() active "-p 20008"
-#dynamic Server_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Server_Logging_Acceptor() active "-p 20009"
-#dynamic Thr_Server_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Thr_Server_Logging_Acceptor() active "-p 20020"
diff --git a/tests/ACE_Init_Test.h b/tests/ACE_Init_Test.h
index cd4d6d386f1..bfe7f784a81 100644
--- a/tests/ACE_Init_Test.h
+++ b/tests/ACE_Init_Test.h
@@ -1,23 +1,9 @@
-/* -*- C++ -*- */
 // $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    ACE_Init_Test.h
 //
-// = DESCRIPTION
-//   Main header file for the ACE_INIT_TEST application.
+// ACE_Init_Test.h : main header file for the ACE_INIT_TEST application
 //
-// = AUTHOR
-//    Steve Huston <shuston@cs.wustl.edu>
-//
-// ============================================================================
 
-#ifndef AFX_ACE_INIT_TEST_H__64FDC9FE_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_
+#if !defined(AFX_ACE_INIT_TEST_H__64FDC9FE_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_)
 #define AFX_ACE_INIT_TEST_H__64FDC9FE_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_
 
 #if _MSC_VER >= 1000
@@ -30,30 +16,36 @@
 
 #include "ACE_Init_Test_Resource.h"		// main symbols
 
+/////////////////////////////////////////////////////////////////////////////
+// CACE_Init_TestApp:
+// See ACE_Init_Test.cpp for the implementation of this class
+//
+
 class CACE_Init_TestApp : public CWinApp
 {
-  // = TITLE
-  //   See ACE_Init_Test.cpp for the implementation of this class
-public:
-  CACE_Init_TestApp (void);
-
-  // Overrides
-  // ClassWizard generated virtual function overrides
-  //{{AFX_VIRTUAL(CACE_Init_TestApp)
 public:
-  virtual BOOL InitInstance();
-  //}}AFX_VIRTUAL
+	CACE_Init_TestApp();
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CACE_Init_TestApp)
+	public:
+	virtual BOOL InitInstance();
+	//}}AFX_VIRTUAL
+
+// Implementation
+
+	//{{AFX_MSG(CACE_Init_TestApp)
+		// NOTE - the ClassWizard will add and remove member functions here.
+		//    DO NOT EDIT what you see in these blocks of generated code !
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
 
-  // Implementation
 
-  //{{AFX_MSG(CACE_Init_TestApp)
-  // NOTE - the ClassWizard will add and remove member functions here.
-  //    DO NOT EDIT what you see in these blocks of generated code !
-  //}}AFX_MSG
-  DECLARE_MESSAGE_MAP()
-};
+/////////////////////////////////////////////////////////////////////////////
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
 
-#endif /* !defined(AFX_ACE_INIT_TEST_H__64FDC9FE_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_) */
+#endif // !defined(AFX_ACE_INIT_TEST_H__64FDC9FE_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_)
diff --git a/tests/ACE_Init_Test_StdAfx.h b/tests/ACE_Init_Test_StdAfx.h
index ea1871ec913..d11f7c7efce 100644
--- a/tests/ACE_Init_Test_StdAfx.h
+++ b/tests/ACE_Init_Test_StdAfx.h
@@ -1,44 +1,26 @@
-/* -*- C++ -*- */
 // $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    ACE_Init_Test_StdAfx.h
+// stdafx.h : include file for standard system include files,
+//  or project specific include files that are used frequently, but
+//      are changed infrequently
 //
-// = DESCRIPTION
-//    stdafx.h : include file for standard system include files,
-//    or project specific include files that are used frequently, but
-//    are changed infrequently
-//
-// = AUTHOR
-//    Steve Huston <shuston@cs.wustl.edu>
-//
-// ============================================================================
 
-#ifndef AFX_STDAFX_H__64FDCA02_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_
+#if !defined(AFX_STDAFX_H__64FDCA02_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_)
 #define AFX_STDAFX_H__64FDCA02_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_
 
 #if _MSC_VER >= 1000
 #pragma once
 #endif // _MSC_VER >= 1000
 
-// Exclude rarely-used stuff from Windows headers
-#define VC_EXTRALEAN		
+#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
-// MFC core and standard components
-#include <afxwin.h>         
-// MFC extensions
-#include <afxext.h>         
+#include <afxwin.h>         // MFC core and standard components
+#include <afxext.h>         // MFC extensions
 #ifndef _AFX_NO_AFXCMN_SUPPORT
-// MFC support for Windows Common Controls
-#include <afxcmn.h>			
-#endif /* _AFX_NO_AFXCMN_SUPPORT */
+#include <afxcmn.h>			// MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+
 
-//{{AFX_INSERT_LOCATION}} Microsoft Developer Studio will insert
-//additional declarations immediately before the previous line.
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
 
-#endif /* !defined(AFX_STDAFX_H__64FDCA02_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_) */
+#endif // !defined(AFX_STDAFX_H__64FDCA02_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_)
diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp
index 437c9df0bbc..de8bf8d898c 100644
--- a/tests/Basic_Types_Test.cpp
+++ b/tests/Basic_Types_Test.cpp
@@ -118,10 +118,18 @@ main (int, ASYS_TCHAR *[])
   errors += check (ASYS_TEXT ("sizeof (ACE_UINT16) is %u%s"),
                    sizeof (ACE_INT16), 2);
 #else /* ! _UNICOS */
+  // MPP Crays have 32 bit shorts, so we use those for 16 bit quantities
+# if defined(_CRAYMPP)
+  errors += check (ASYS_TEXT ("sizeof (ACE_INT16) is %u%s"),
+                   sizeof (ACE_INT16), 4);
+  errors += check (ASYS_TEXT ("sizeof (ACE_UINT16) is %u%s"),
+                   sizeof (ACE_INT16), 4);
+# else
   errors += check (ASYS_TEXT ("sizeof (ACE_INT16) is %u%s"),
                    sizeof (ACE_INT16), 8);
   errors += check (ASYS_TEXT ("sizeof (ACE_UINT16) is %u%s"),
                    sizeof (ACE_INT16), 8);
+# endif
 #endif /* ! _UNICOS */
 
 // MPP Crays do have 32-bit quantities (short), though vector Crays don't
diff --git a/tests/CPP_Test.cpp b/tests/CPP_Test.cpp
deleted file mode 100644
index 4c0bd291a50..00000000000
--- a/tests/CPP_Test.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    CPP_Test.cpp
-//
-// = DESCRIPTION
-//     This is a simple test of the ACE_SOCK_Acceptor and
-//     AC_SOCK_Connector classes. The test forks two processes or
-//     spawns two threads (depending upon the platform) and then executes
-//     client and server allowing them to connect and exchange
-//     data. No user input is required as far as command line
-//     arguments are concerned.
-//
-// = AUTHOR
-//    Prashant Jain and Doug Schmidt
-// 
-// ============================================================================
-
-#include "ace/OS.h"
-#include "ace/Thread.h"
-#include "ace/Service_Config.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Acceptor.h"                             
-#include "ace/SOCK_Stream.h"
-#include "ace/INET_Addr.h"
-#include "ace/Handle_Set.h"
-#include "test_config.h"
-
-static void *
-client (void *arg)
-{
-#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS)
-  // Insert thread into thr_mgr
-  ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ());  
-  ACE_NEW_THREAD;
-#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */
-
-  ACE_INET_Addr *remote_addr = (ACE_INET_Addr *) arg;
-  ACE_INET_Addr server_addr (remote_addr->get_port_number (), "localhost");
-  ACE_SOCK_Stream cli_stream;
-  ACE_SOCK_Connector con;
-
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting non-blocking connect\n"));
-  // Initiate timed, non-blocking connection with server.
-  
-  // Attempt a non-blocking connect to the server, reusing the local
-  // addr if necessary.
-  if (con.connect (cli_stream, server_addr,
-		   (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "connection failed"));
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting timed connect\n"));
-
-      // Check if non-blocking connection is in progress, 
-      // and wait up to ACE_DEFAULT_TIMEOUT seconds for it to complete.
-      ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT);
-
-      if (con.complete (cli_stream, &server_addr, &tv) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "connection failed"), 0);
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) connected to %s\n", 
-		    server_addr.get_host_name ()));
-    }
-
-  if (cli_stream.disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "disable"));    
-
-  // Send data to server (correctly handles "incomplete writes").
-  
-  for (char c = 'a'; c <= 'z'; c++)
-    if (cli_stream.send_n (&c, 1) == -1) 
-      ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n"));
-
-  // Explicitly close the writer-side of the connection.
-  if (cli_stream.close_writer () == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close_writer"));
-
-  char buf[1];
-
-  // Wait for handshake with server.
-  if (cli_stream.recv_n (buf, 1) != 1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "recv_n"));
-
-  // Close the connection completely.
-  if (cli_stream.close () == -1) 
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close"));
-
-  return 0;
-}
-
-static void *
-server (void *arg)
-{
-#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS)
-  // Insert thread into thr_mgr
-  ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ());  
-  ACE_NEW_THREAD;
-#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */
-
-  ACE_SOCK_Acceptor *peer_acceptor = (ACE_SOCK_Acceptor *) arg;
-
-  if (peer_acceptor->enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "enable"));
-
-  // Keep these objects out here to prevent excessive constructor
-  // calls...
-  ACE_SOCK_Stream new_stream;                                   
-  ACE_INET_Addr cli_addr;
-  ACE_Handle_Set handle_set;
-  ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT);
-  // Performs the iterative server activities.
-
-  for (;;) 
-    {
-      char buf[BUFSIZ];                                     
-      char t = 'a';
-      
-      handle_set.reset ();
-      handle_set.set_bit (peer_acceptor->get_handle ());
-      
-      int result = ACE_OS::select (int (peer_acceptor->get_handle ()) + 1,
-				   handle_set,
-				   0, 0, &tv);
-      if (result == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0);
-      else if (result == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%P|%t) select timed out, shutting down\n"));
-	  return 0;
-	}
-
-      // Create a new ACE_SOCK_Stream endpoint (note automatic restart
-      // if errno == EINTR).
-      
-      while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%P|%t) client %s connected from %d\n", 
-		      cli_addr.get_host_name (), cli_addr.get_port_number ()));
-	  
-	  // Enable non-blocking I/O.
-	  if (new_stream.enable (ACE_NONBLOCK) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "enable"), 0);
-	  
-	  handle_set.reset ();
-	  handle_set.set_bit (new_stream.get_handle ());
-	  
-	  // Read data from client (terminate on error).
-	  
-	  for (ssize_t r_bytes; ;)
-	    {
-	      if (ACE_OS::select (int (new_stream.get_handle ()) + 1,
-				  handle_set,
-				  0, 0, 0) == -1)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0);
-	      
-	      while ((r_bytes = new_stream.recv_n (buf, 1)) > 0)
-		{
-		  ACE_ASSERT (t == buf[0]);
-		  t++;
-		}
-	      
-	      if (r_bytes == 0)
-		{
-		  ACE_DEBUG ((LM_DEBUG, 
-			      "(%P|%t) reached end of input, connection closed by client\n"));
-
-		  // Handshake back with client.
-		  if (new_stream.send_n ("", 1) != 1)
-		    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n"));
-
-		  // Close endpoint.
-		  if (new_stream.close () == -1) 
-		    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close"));
-		  return 0;
-		}
-	      else if (r_bytes == -1)
-		{
-		  if (errno == EWOULDBLOCK)
-		    ACE_DEBUG ((LM_DEBUG, "(%P|%t) no input available, going back to reading\n"));
-		  else
-		    ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "recv_n"), 0);
-		}
-	    }
-	}
-
-      if (result == -1)
-	{
-	  if (errno == EWOULDBLOCK)
-	    ACE_DEBUG ((LM_DEBUG, "(%P|%t) no connections available, going back to accepting\n"));
-	  else
-	    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "accept"));
-	}
-    }
-  return 0;
-}
-
-static void
-spawn (void)
-{
-  // Acceptor
-  ACE_SOCK_Acceptor peer_acceptor;
-
-  // Create a server address.
-  ACE_INET_Addr server_addr;
-
-  // Bind listener to any port and then find out what the port was.
-  if (peer_acceptor.open (ACE_Addr::sap_any) == -1
-      || peer_acceptor.get_local_addr (server_addr) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "open"));
-  else 
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting server at port %d\n",
-		  server_addr.get_port_number ()));
-
-#if !defined (ACE_WIN32) && !defined (VXWORKS)
-      switch (ACE_OS::fork ())
-	{
-	case -1:
-	  ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "fork failed"));
-	  exit (-1);
-	case 0: 
-	  ACE_LOG_MSG->sync ("child");
-	  client (&server_addr);
-	default:
-	  server ((void *) &peer_acceptor);
-	  ACE_OS::wait ();
-	}
-#elif defined (ACE_HAS_THREADS)
-      if (ACE_Service_Config::thr_mgr ()->spawn 
-	  (ACE_THR_FUNC (server), (void *) &peer_acceptor, THR_NEW_LWP | THR_DETACHED) == -1)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed"));
-
-      if (ACE_Service_Config::thr_mgr ()->spawn 
-	  (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed"));
-
-      // Wait for the threads to exit.
-      ACE_Service_Config::thr_mgr ()->wait ();
-#else
-      ACE_ERROR ((LM_ERROR, "(%P|%t) only one thread may be run in a process on this platform\n%a", 1));
-#endif /* ACE_HAS_THREADS */	
-    }
-}
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("CPP_Test");
-
-  spawn ();
-
-  ACE_END_TEST;
-  return 0;
-}
diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp
index 0da3c4fc53a..c6af6a52252 100644
--- a/tests/Cache_Map_Manager_Test.cpp
+++ b/tests/Cache_Map_Manager_Test.cpp
@@ -33,7 +33,7 @@
 #include "ace/Pair_T.h"
 #include "ace/Synch.h"
 #include "ace/Get_Opt.h"
-#include "Cache_Map_Manager_Test.h"     // Hash_Key class defined in here
+#include "Cache_Map_Manager_Test.h"     // hash_key class defined in here
 
 #if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
 USELIB("..\ace\aced.lib");
@@ -46,25 +46,17 @@ typedef int ATTR;
 typedef ACE_Pair<VALUE, ATTR> CACHE_VALUE;
 typedef ACE_Equal_To<KEY> COMPARE_KEYS;
 
-typedef ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
+typedef ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, hash_key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
         HASH_MAP_MANAGER;
-typedef ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
+typedef ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, hash_key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
         HASH_MAP_ITERATOR;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-        HASH_MAP_REVERSE_ITERATOR;
 
 typedef ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>
         MAP_MANAGER;
 typedef ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>
         MAP_ITERATOR;
 typedef ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>
-        MAP_REVERSE_ITERATOR;
-
-typedef ACE_Cleanup_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER>
-        HASH_MAP_CLEANUP;
-
-typedef ACE_Cleanup_Strategy<KEY, CACHE_VALUE, MAP_MANAGER>
-        MAP_CLEANUP;
+        MAP_REV_ITERATOR;
 
 typedef ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, ATTR>
         HASH_MAP_CACHING_UTILITY;
@@ -73,48 +65,48 @@ typedef ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_ITERATOR, AT
         MAP_CACHING_UTILITY;
 
 // = Hash_Map_Manager related
-typedef ACE_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
+typedef ACE_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
         HASH_MAP_CACHING_STRATEGY;
-typedef ACE_LRU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
+typedef ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
         HASH_MAP_LRU;
-typedef ACE_LFU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
+typedef ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
         HASH_MAP_LFU;
-typedef ACE_FIFO_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
+typedef ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
         HASH_MAP_FIFO;
-typedef ACE_Null_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
+typedef ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
         HASH_MAP_NULL;
-typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>
+typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>
         HASH_MAP_LRU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>
+typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>
         HASH_MAP_LFU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>
+typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>
         HASH_MAP_FIFO_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>
+typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>
         HASH_MAP_NULL_ADAPTER;
 
 // = Map_Manager related
-typedef ACE_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
+typedef ACE_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
         MAP_CACHING_STRATEGY;
-typedef ACE_LRU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
+typedef ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
         MAP_LRU;
-typedef ACE_LFU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
+typedef ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
         MAP_LFU;
-typedef ACE_FIFO_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
+typedef ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
         MAP_FIFO;
-typedef ACE_Null_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
+typedef ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
         MAP_NULL;
-typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LRU>
+typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LRU>
         MAP_LRU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LFU>
+typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LFU>
         MAP_LFU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_FIFO>
+typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_FIFO>
         MAP_FIFO_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_NULL>
+typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_NULL>
         MAP_NULL_ADAPTER;
 
-typedef ACE_Hash_Cache_Map_Manager<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>
+typedef ACE_Hash_Cache_Map_Manager<KEY, VALUE, hash_key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>
         HASH_MAP_CACHE;
-typedef ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_ITERATOR, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>
+typedef ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_ITERATOR, MAP_REV_ITERATOR, MAP_CACHING_STRATEGY, ATTR>
         MAP_CACHE;
 
 enum Caching_Strategy_Type
@@ -357,7 +349,7 @@ functionality_test_cache (MAP_CACHING_STRATEGY &caching_strategy)
       ACE_UNUSED_ARG (result);
 
       if (debug)
-        ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("keys[%d]=%d value=[%d]=%d\n"),
+        ACE_DEBUG ((LM_DEBUG, "keys[%d]=%d value=[%d]=%d\n",
                     i, i, j, j));
       ++counter;
       ACE_ASSERT (cache.current_size () == counter);
@@ -434,7 +426,7 @@ test_caching_strategy_type (void)
   switch (caching_strategy_type)
     {
     case ACE_NULL:
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nNull_Caching_Strategy\n\n")));
+      ACE_DEBUG ((LM_DEBUG, "\nNull_Caching_Strategy\n\n"));
       ACE_NEW (map_caching_strategy,
                MAP_NULL_ADAPTER);
       ACE_NEW (hash_map_caching_strategy,
@@ -442,7 +434,7 @@ test_caching_strategy_type (void)
       break;
 
     case ACE_LRU:
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nLRU_Caching_Strategy\n\n")));
+      ACE_DEBUG ((LM_DEBUG, "\nLRU_Caching_Strategy\n\n"));
       ACE_NEW (map_caching_strategy,
                MAP_LRU_ADAPTER);
       ACE_NEW (hash_map_caching_strategy,
@@ -450,7 +442,7 @@ test_caching_strategy_type (void)
       break;
 
     case ACE_LFU:
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nLFU_Caching_Strategy\n\n")));
+      ACE_DEBUG ((LM_DEBUG, "\nLFU_Caching_Strategy\n\n"));
       ACE_NEW (map_caching_strategy,
                MAP_LFU_ADAPTER);
       ACE_NEW (hash_map_caching_strategy,
@@ -458,13 +450,13 @@ test_caching_strategy_type (void)
       break;
 
     case ACE_FIFO:
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nFIFO_Caching_Strategy\n\n")));
+      ACE_DEBUG ((LM_DEBUG, "\nFIFO_Caching_Strategy\n\n"));
       ACE_NEW (map_caching_strategy,
                MAP_FIFO_ADAPTER);
       ACE_NEW (hash_map_caching_strategy,
                HASH_MAP_FIFO_ADAPTER);
       break;
-
+      
     case ACE_ALL: // Just to remove warnings!
       break;
     }
@@ -490,13 +482,13 @@ parse_args (int argc, ASYS_TCHAR *argv[])
     switch (cc)
       {
       case 'c':
-        if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("null")) == 0)
+        if (ACE_OS::strcmp (get_opt.optarg, "null") == 0)
           caching_strategy_type = ACE_NULL;
-        if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("lru")) == 0)
+        if (ACE_OS::strcmp (get_opt.optarg, "lru") == 0)
           caching_strategy_type = ACE_LRU;
-        if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("lfu")) == 0)
+        if (ACE_OS::strcmp (get_opt.optarg, "lfu") == 0)
           caching_strategy_type = ACE_LFU;
-        if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("fifo")) == 0)
+        if (ACE_OS::strcmp (get_opt.optarg, "fifo") == 0)
           caching_strategy_type = ACE_FIFO;
         break;
       case 'i':
@@ -609,10 +601,10 @@ template class ACE_Pair<VALUE, ATTR>;
 template class ACE_Reference_Pair<KEY, VALUE>;
 template class ACE_Equal_To<KEY>;
 
-template class ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, hash_key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, hash_key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, hash_key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<KEY, CACHE_VALUE, hash_key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Entry<KEY, CACHE_VALUE>;
 
 template class ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>;
@@ -621,40 +613,43 @@ template class ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>;
 template class ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>;
 template class ACE_Map_Entry<KEY, CACHE_VALUE>;
 
-template class ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, ATTR>;
-template class ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_ITERATOR, ATTR>;
-
-template class ACE_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>;
-template class ACE_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>;
-template class ACE_LRU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>;
-template class ACE_LRU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>;
-template class ACE_LFU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>;
-template class ACE_LFU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>;
-template class ACE_FIFO_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>;
-template class ACE_FIFO_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>;
-template class ACE_Null_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>;
-template class ACE_Null_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>;
-
-template class ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>;
-template class ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LRU>;
-template class ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>;
-template class ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LFU>;
-template class ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>;
-template class ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_FIFO>;
-template class ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>;
-template class ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_NULL>;
-
-template class ACE_Cleanup_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER>;
-template class ACE_Cleanup_Strategy<KEY, CACHE_VALUE, MAP_MANAGER>;
-
-template class ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_ITERATOR, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>;
-template class ACE_Cache_Map_Iterator<KEY, VALUE, MAP_ITERATOR, MAP_CACHING_STRATEGY, ATTR>;
-template class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>;
-
-template class ACE_Cache_Map_Manager<KEY, VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>;
-template class ACE_Cache_Map_Iterator<KEY, VALUE, HASH_MAP_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>;
-template class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_MAP_REVERSE_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>;
-template class ACE_Hash_Cache_Map_Manager<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>;
+template class ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, ATTR>;
+template class ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_MANAGER::iterator, ATTR>;
+
+template class ACE_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>;
+template class ACE_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>;
+template class ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>;
+template class ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>;
+template class ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>;
+template class ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>;
+template class ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>;
+template class ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>;
+template class ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>;
+template class ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>;
+
+template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>;
+template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LRU>;
+template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>;
+template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LFU>;
+template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>;
+template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_FIFO>;
+template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>;
+template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_NULL>;
+
+template class ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER>;
+template class ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER>;
+
+template class ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER>;
+template class ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER>;
+
+template class ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_MANAGER::iterator, MAP_MANAGER::reverse_iterator, MAP_CACHING_STRATEGY, ATTR>;
+template class ACE_Cache_Map_Iterator<KEY, VALUE, MAP_MANAGER::iterator, MAP_CACHING_STRATEGY, ATTR>;
+template class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, MAP_MANAGER::reverse_iterator, MAP_CACHING_STRATEGY, ATTR>;
+
+template class ACE_Cache_Map_Manager<KEY, VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR>;
+template class ACE_Cache_Map_Iterator<KEY, VALUE, HASH_MAP_MANAGER::iterator, HASH_MAP_CACHING_STRATEGY, ATTR>;
+template class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR>;
+template class ACE_Hash_Cache_Map_Manager<KEY, VALUE, hash_key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -662,10 +657,10 @@ template class ACE_Hash_Cache_Map_Manager<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY
 #pragma instantiate ACE_Reference_Pair<KEY, VALUE>
 #pragma instantiate ACE_Equal_To<KEY>
 
-#pragma instantiate ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, hash_key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, hash_key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, hash_key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<KEY, CACHE_VALUE, hash_key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<KEY, CACHE_VALUE>
 
 #pragma instantiate ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>
@@ -674,39 +669,42 @@ template class ACE_Hash_Cache_Map_Manager<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY
 #pragma instantiate ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Entry<KEY, CACHE_VALUE>
 
-#pragma instantiate ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, ATTR>
-#pragma instantiate ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_ITERATOR, ATTR>
-
-#pragma instantiate ACE_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
-#pragma instantiate ACE_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
-#pragma instantiate ACE_LRU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
-#pragma instantiate ACE_LRU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
-#pragma instantiate ACE_LFU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
-#pragma instantiate ACE_LFU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
-#pragma instantiate ACE_FIFO_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
-#pragma instantiate ACE_FIFO_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
-#pragma instantiate ACE_Null_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
-#pragma instantiate ACE_Null_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
-
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LRU>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LFU>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_FIFO>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_NULL>
-
-#pragma instantiate ACE_Cleanup_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER>
-#pragma instantiate ACE_Cleanup_Strategy<KEY, CACHE_VALUE, MAP_MANAGER>
-
-#pragma instantiate ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_ITERATOR, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Iterator<KEY, VALUE, MAP_ITERATOR, MAP_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>
-
-#pragma instantiate ACE_Cache_Map_Manager<KEY, VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Iterator<KEY, VALUE, HASH_MAP_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_MAP_REVERSE_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Hash_Cache_Map_Manager<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, ATTR>
+#pragma instantiate ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_MANAGER::iterator, ATTR>
+
+#pragma instantiate ACE_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
+#pragma instantiate ACE_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
+#pragma instantiate ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
+#pragma instantiate ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
+#pragma instantiate ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
+#pragma instantiate ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
+#pragma instantiate ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
+#pragma instantiate ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
+#pragma instantiate ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
+#pragma instantiate ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
+
+#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>
+#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LRU>
+#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>
+#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LFU>
+#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>
+#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_FIFO>
+#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>
+#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_NULL>
+
+#pragma instantiate ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER>
+#pragma instantiate ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER>
+
+#pragma instantiate ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER>
+#pragma instantiate ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER>
+
+#pragma instantiate ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_MANAGER::iterator, MAP_MANAGER::reverse_iterator, MAP_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Iterator<KEY, VALUE, MAP_MANAGER::iterator, MAP_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, MAP_MANAGER::reverse_iterator, MAP_CACHING_STRATEGY, ATTR>
+
+#pragma instantiate ACE_Cache_Map_Manager<KEY, VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Iterator<KEY, VALUE, HASH_MAP_MANAGER::iterator, HASH_MAP_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Hash_Cache_Map_Manager<KEY, VALUE, hash_key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Cache_Map_Manager_Test.h b/tests/Cache_Map_Manager_Test.h
index 5f75635a04c..54261be9d0c 100644
--- a/tests/Cache_Map_Manager_Test.h
+++ b/tests/Cache_Map_Manager_Test.h
@@ -1,22 +1,7 @@
-/* -*- C++ -*- */
 // $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Cache_Map_Manager_Test.h
-//
-// = DESCRIPTION
-//    Define class needed for generating templates. IBM C++ requires this to
-//    be in its own file for auto template instantiation.
-//
-// = AUTHOR
-//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-//
-// ============================================================================
+// Define class needed for generating templates. IBM C++ requires this to
+// be in its own file for auto template instantiation.
 
 #ifndef __ACE_CACHE_MAP_MANAGER_TEST_H
 #define __ACE_CACHE_MAP_MANAGER_TEST_H
@@ -25,7 +10,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class Hash_Key
+class hash_key
 {
 public:
   u_long operator () (size_t t) const
diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp
deleted file mode 100644
index 7452f9df092..00000000000
--- a/tests/Cached_Accept_Conn_Test.cpp
+++ /dev/null
@@ -1,812 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Cached_Accept_Conn_Test.cpp
-//
-// = DESCRIPTION
-//    The test illustrates how the <ACE_Strategy_Connector> works by
-//    showing how you can cache connections on the client using
-//    different caching strategies. Also how connections can be purged
-//    explicitly and implicitly if needed from the connection cache
-//    maintained by the connector. The <ACE_Strategy_Acceptor> can also
-//    explicitly purge connections from the process CONNECTION CACHE on
-//    demand.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef CACHED_ACCEPT_CONNECTION_TEST
-#define CACHED_ACCEPT_CONNECTION_TEST
-
-#include "test_config.h"
-
-// IBM C Set++ just can't grok the templates in here for auto template
-// instantiation. It ends up overwriting a tempinc/*.C file and mashes
-// its contents.
-#if !defined (__xlC__) || (__xlC__ > 0x0301)
-
-#include "Cached_Accept_Conn_Test.h"
-
-#if defined(__GNUC__) && __GNUC__ == 2 && __GNUC_MINOR__ < 8
-#define ACE_HAS_BROKEN_EXTENDED_TEMPLATES
-#endif /* __GNUC__ */
-
-#include "ace/INET_Addr.h"
-#include "ace/Strategies.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/Svc_Handler.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Acceptor.h"
-#include "ace/Connector.h"
-#include "ace/Get_Opt.h"
-#include "ace/Caching_Utility_T.h"
-#include "ace/Cached_Connect_Strategy_T.h"
-#include "ace/Handle_Gobbler.h"
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4503)
-#endif /* _MSC_VER */
-
-ACE_RCSID(tests, Cached_Accept_Conn_Test, "$Id$")
-
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-static int debug = 0;
-
-Client_Svc_Handler::Client_Svc_Handler (ACE_Thread_Manager *t)
-  : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (t)
-{
-}
-
-int
-Client_Svc_Handler::open (void *)
-{
-  if (debug)
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("opening Client_Svc_Handler %d with handle %d\n"),
-                this,
-                this->peer ().get_handle ()));
-  return 0;
-}
-
-int
-Client_Svc_Handler::close (u_long flags)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Closing Client_Svc_Handler %d with handle %d\n"),
-              this,
-              this->peer ().get_handle ()));
-  return ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::close (flags);
-}
-
-
-Server_Svc_Handler::Server_Svc_Handler (ACE_Thread_Manager *t)
-  : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (t)
-{
-}
-
-int
-Server_Svc_Handler::open (void *)
-{
-  if (debug)
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("opening Server_Svc_Handler %d with handle %d\n"),
-                this,
-                this->peer ().get_handle ()));
-
-  return this->close ();
-}
-
-typedef size_t ATTRIBUTES;
-typedef ACE_Pair<Client_Svc_Handler *, ATTRIBUTES>
-        CACHED_HANDLER;
-typedef ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-        ADDR;
-typedef ACE_Hash<ADDR> H_KEY;
-typedef ACE_Equal_To<ADDR> C_KEYS;
-
-typedef ACE_Hash_Map_Manager_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-        HASH_MAP;
-typedef ACE_Hash_Map_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-        HASH_MAP_ITERATOR;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-        HASH_MAP_REVERSE_ITERATOR;
-
-typedef ACE_Recyclable_Handler_Cleanup_Strategy<ADDR, CACHED_HANDLER, HASH_MAP>
-        CLEANUP_STRATEGY;
-typedef ACE_Recyclable_Handler_Caching_Utility<ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>
-        CACHING_UTILITY;
-
-typedef ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        LRU_CACHING_STRATEGY;
-
-#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-typedef LRU_CACHING_STRATEGY
-        CACHING_STRATEGY;
-
-#else
-
-typedef ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        LFU_CACHING_STRATEGY;
-typedef ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        FIFO_CACHING_STRATEGY;
-typedef ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        NULL_CACHING_STRATEGY;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>
-        LRU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>
-        LFU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>
-        FIFO_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>
-        NULL_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        CACHING_STRATEGY;
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-typedef ACE_Strategy_Acceptor<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
-        ACCEPTOR;
-
-typedef ACE_Strategy_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>
-        STRATEGY_CONNECTOR;
-
-typedef ACE_NOOP_Creation_Strategy<Client_Svc_Handler>
-        NULL_CREATION_STRATEGY;
-
-typedef ACE_NOOP_Concurrency_Strategy<Client_Svc_Handler>
-        NULL_ACTIVATION_STRATEGY;
-
-typedef ACE_Cached_Connect_Strategy_Ex<Client_Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
-        CACHED_CONNECT_STRATEGY;
-
-enum Caching_Strategy_Type
-{
-  ACE_LFU,
-  ACE_FIFO,
-  ACE_LRU,
-  ACE_NULL,
-  ACE_ALL
-};
-
-// Default number of clients/servers.
-static int listen_once = 1;
-static int user_has_specified_iterations = 0;
-static size_t keep_handles_available = 100;
-static double purge_percentage = 20;
-static Caching_Strategy_Type caching_strategy_type = ACE_ALL;
-
-// On Win32, the handle gobbling doesn't work.  Therefore, we need
-// more iterations to get to the handle limit.
-#if defined (ACE_WIN32)
-static int iterations = 2000;
-#else
-static int iterations = 200;
-#endif /* ACE_WIN32 */
-
-//====================================================================
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-class Accept_Strategy : public ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>
-{
-public:
-
-  Accept_Strategy (CACHED_CONNECT_STRATEGY &caching_connect_strategy);
-  // Constructor.
-
-  int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-            int restart = 0);
-  // Initialize the <peer_acceptor_> with <local_addr>.  If the
-  // process runs out of descriptors, the unsed svc_handlers from the
-  // CONNECTION CACHE are removed.
-
-  int accept_svc_handler (SVC_HANDLER *svc_handler);
-  // The default behavior delegates to the <accept> method of the
-  // PEER_ACCEPTOR. A check is made here for the process running out
-  // of file descriptors. If so, the CONNECTION CACHE is purged of
-  // some idle svc_handlers.
-
-protected:
-
-  typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> ACCEPT_STRATEGY_BASE;
-
-  int out_of_sockets_handler (void);
-  // Handler for removing cached connections.
-
-  CACHED_CONNECT_STRATEGY &caching_connect_strategy_;
-};
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::Accept_Strategy (CACHED_CONNECT_STRATEGY &caching_connect_strategy)
-  : caching_connect_strategy_ (caching_connect_strategy)
-{
-}
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-                                                                    int restart)
-{
-  int result = ACCEPT_STRATEGY_BASE::open (local_addr,
-                                           restart);
-
-  if (result == 0)
-    return result;
-
-  // If the error occured due to the fact that the file descriptor
-  // limit was exhausted, then purge the connection cache of some
-  // entries.
-  result = this->out_of_sockets_handler ();
-  if (result == -1)
-    return -1;
-
-  // If we are able to purge, try again.
-  return ACCEPT_STRATEGY_BASE::open (local_addr, restart);
-}
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_HANDLER *svc_handler)
-{
-  // Stop the event loop.
-  int result = ACE_Reactor::instance ()->end_event_loop ();
-  ACE_ASSERT (result != 1);
-
-  // Try to find out if the implementation of the reactor that we are
-  // using requires us to reset the event association for the newly
-  // created handle. This is because the newly created handle will
-  // inherit the properties of the listen handle, including its event
-  // associations.
-  int reset_new_handle = this->reactor_->uses_event_associations ();
-
-  result = this->acceptor_.accept (svc_handler->peer (), // stream
-                                   0, // remote address
-                                   0, // timeout
-                                   1, // restart
-                                   reset_new_handle  // reset new handler
-                                   );
-  if (result == 0)
-    return result;
-
-  // If the error occured due to teh fact that the file descriptor
-  // limit was exhausted, then purge the connection cache of some
-  // entries.
-  result = this->out_of_sockets_handler ();
-  ACE_ASSERT (result == 0);
-
-  // Close down handler to avoid memory leaks.
-  svc_handler->close (0);
-  return -1;
-}
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (void)
-{
-  if (ACE::out_of_handles (errno))
-    {
-      // Close connections which are cached by explicitly purging the
-      // connection cache maintained by the connector.
-      ACE_DEBUG ((LM_DEBUG, "Purging connections from Connection Cache...\n"));
-
-      return this->caching_connect_strategy_.purge_connections ();
-    }
-
-  return -1;
-}
-
-typedef Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
-        ACCEPT_STRATEGY;
-
-static int
-cached_connect (STRATEGY_CONNECTOR &con,
-                const ACE_INET_Addr &server_addr)
-{
-  // This will make sure we get the host information correct.
-  ACE_INET_Addr remote_addr (server_addr.get_port_number (),
-                             ACE_LOCALHOST);
-
-  // Perform a blocking connect to the server using the Strategy
-  // Connector with a connection caching strategy.
-  Client_Svc_Handler *svc_handler = 0;
-  int result = con.connect (svc_handler,
-                            remote_addr);
-  if (result == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("connection failed")),
-                      -1);
-
-  // Reset Svc_Handler state.
-  svc_handler->recycle_state (ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE);
-
-  return 0;
-}
-
-static void
-server (void)
-{
-  ACE_Reactor::instance ()->reset_event_loop ();
-
-  int result = ACE_Reactor::instance ()->run_event_loop ();
-  ACE_ASSERT (result != 1);
-  ACE_UNUSED_ARG (result);
-}
-
-static void
-test_connection_management (CACHING_STRATEGY &caching_strategy)
-{
-  // Configure the Strategy Connector with a strategy that caches
-  // connection.
-  CACHED_CONNECT_STRATEGY caching_connect_strategy (caching_strategy);
-
-  NULL_CREATION_STRATEGY creation_strategy;
-  NULL_ACTIVATION_STRATEGY activation_strategy;
-
-  STRATEGY_CONNECTOR strategy_connector (0,
-                                         &creation_strategy,
-                                         &caching_connect_strategy,
-                                         &activation_strategy);
-
-  // Connect strategy is required by the <out_of_sockets_handler>.
-  ACCEPT_STRATEGY listen_one_time_accept_strategy (caching_connect_strategy);
-
-  // If <listen_once> is true, only one Acceptor is used for the test.
-  ACCEPTOR listen_one_time_acceptor;
-  ACE_INET_Addr server_addr;
-
-  int result =
-    listen_one_time_acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &),
-                                   ACE_Reactor::instance (),
-                                   0,
-                                   &listen_one_time_accept_strategy);
-  ACE_ASSERT (result == 0);
-
-  result = listen_one_time_acceptor.acceptor ().get_local_addr (server_addr);
-  ACE_ASSERT (result == 0);
-
-  for (int i = 1; i <= iterations; ++i)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("iteration %d\n"),
-                  i));
-
-      // Connect strategy is required by the <out_of_sockets_handler>.
-      ACCEPT_STRATEGY listen_multiple_times_accept_strategy (caching_connect_strategy);
-
-      // If <listen_once> is false, one Acceptor is used for every
-      // iteration.
-      ACCEPTOR listen_multiple_times_acceptor;
-
-      if (!listen_once)
-        {
-          // Bind acceptor to any port and then find out what the port
-          // was.
-          if (listen_multiple_times_acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &),
-                                                   ACE_Reactor::instance (),
-                                                   0,
-                                                   &listen_multiple_times_accept_strategy) == -1)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ASYS_TEXT ("%p\n"),
-                          ASYS_TEXT ("open")));
-              ACE_ASSERT (0);
-            }
-
-          if (listen_multiple_times_acceptor.acceptor ().get_local_addr (server_addr) == -1)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ASYS_TEXT ("%p\n"),
-                          ASYS_TEXT ("get_local_addr")));
-              ACE_ASSERT (0);
-            }
-
-          if (debug)
-            ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("starting server at port %d\n"),
-                        server_addr.get_port_number ()));
-        }
-
-      // Run the cached blocking test.
-      int result = cached_connect (strategy_connector,
-                                   server_addr);
-      ACE_ASSERT (result != -1);
-
-      server ();
-    }
-}
-
-#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-void
-test_caching_strategy_type (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "\nLRU_Caching_Strategy\n\n"));
-  CACHING_STRATEGY caching_strategy;
-  caching_strategy.purge_percent (purge_percentage);
-  test_connection_management (caching_strategy);
-}
-
-#else
-
-void
-test_caching_strategy_type (void)
-{
-  CACHING_STRATEGY *caching_strategy = 0;
-
-  switch (caching_strategy_type)
-    {
-    case ACE_NULL:
-      ACE_DEBUG ((LM_DEBUG, "\nNull_Caching_Strategy\n\n"));
-      ACE_NEW (caching_strategy,
-               NULL_CACHING_STRATEGY_ADAPTER);
-      break;
-
-    case ACE_LRU:
-      ACE_DEBUG ((LM_DEBUG, "\nLRU_Caching_Strategy\n\n"));
-      ACE_NEW (caching_strategy,
-               LRU_CACHING_STRATEGY_ADAPTER);
-      break;
-
-    case ACE_LFU:
-      ACE_DEBUG ((LM_DEBUG, "\nLFU_Caching_Strategy\n\n"));
-      ACE_NEW (caching_strategy,
-               LFU_CACHING_STRATEGY_ADAPTER);
-      break;
-
-    case ACE_FIFO:
-      ACE_DEBUG ((LM_DEBUG, "\nFIFO_Caching_Strategy\n\n"));
-      ACE_NEW (caching_strategy,
-               FIFO_CACHING_STRATEGY_ADAPTER);
-      break;
-
-    case ACE_ALL: // Just to remove warnings!
-      break;
-    }
-
-  caching_strategy->purge_percent (purge_percentage);
-  test_connection_management (*caching_strategy);
-  delete caching_strategy;
-}
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "l:i:p:c:a:d");
-
-  int cc;
-
-  while ((cc = get_opt ()) != -1)
-    switch (cc)
-      {
-      case 'd':
-        debug = 1;
-        break;
-      case 'l':
-        listen_once = atoi (get_opt.optarg);
-        break;
-      case 'i':
-        iterations = atoi (get_opt.optarg);
-        user_has_specified_iterations = 1;
-        break;
-      case 'p':
-        purge_percentage = atoi (get_opt.optarg);
-        break;
-      case 'c':
-        // Note that if null caching strategy is used then this test
-        // will fail if the number of servers exceed number of open
-        // files allowed for the process.
-        if (ACE_OS::strcmp (get_opt.optarg, "null") == 0)
-          caching_strategy_type = ACE_NULL;
-        if (ACE_OS::strcmp (get_opt.optarg, "lru") == 0)
-          caching_strategy_type = ACE_LRU;
-        if (ACE_OS::strcmp (get_opt.optarg, "lfu") == 0)
-          caching_strategy_type = ACE_LFU;
-        if (ACE_OS::strcmp (get_opt.optarg, "fifo") == 0)
-          caching_strategy_type = ACE_FIFO;
-        break;
-      case 'a':
-        keep_handles_available = atoi (get_opt.optarg);
-        break;
-      case '?':
-      case 'h':
-      default:
-        ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("usage: %s ")
-                    ASYS_TEXT ("[-t (timeout)] ")
-                    ASYS_TEXT ("[-c (caching strategy: lru / lfu / fifo / null [default = all])] ")
-                    ASYS_TEXT ("[-i (iterations)] ")
-                    ASYS_TEXT ("[-l (listen once)] ")
-                    ASYS_TEXT ("[-d (addition debugging output)] ")
-                    ASYS_TEXT ("[-p (purge percent)] ")
-                    ASYS_TEXT ("[-a (keep handles available)] "),
-                    argv[0]));
-        return -1;
-      }
-
-  return 0;
-}
-
-int
-main (int argc,
-      ASYS_TCHAR *argv[])
-{
-  // Validate options.
-  int result = parse_args (argc, argv);
-  if (result != 0)
-    return result;
-
-#if defined (ACE_WIN32)
-  // Somehow, on Win32, the <listen once> option allows us to create
-  // more handles.
-  if (!user_has_specified_iterations &&
-      listen_once)
-    iterations *= 2;
-#endif /* ACE_WIN32 */
-
-  // Start the test only if options are valid.
-  ACE_START_TEST (ASYS_TEXT ("Cached_Accept_Conn_Test"));
-
-  // Remove the extra debugging attributes from Log_Msg output.
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::VERBOSE_LITE);
-
-  // The reactor's constructor changes the handle limit for the
-  // process.
-  ACE_Reactor::instance ();
-
-  // Consume all handles in the process, leaving us
-  // <keep_handles_available> to play with.
-  ACE_Handle_Gobbler handle_gobbler;
-  result = handle_gobbler.consume_handles (keep_handles_available);
-  ACE_ASSERT (result == 0);
-
-#if defined ACE_HAS_BROKEN_EXTENDED_TEMPLATES
-  caching_strategy_type = ACE_LRU;
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-  // Do we need to test all the strategies.  Note, that the less
-  // useful null strategy is ignored in this case.
-  if (caching_strategy_type == ACE_ALL)
-    {
-      caching_strategy_type = ACE_LRU;
-      test_caching_strategy_type ();
-
-      // Default iterations are too many; if the user hasn't specified
-      // otherwise, we'll shrink the iterations for LFU and FIFO.
-      if (!user_has_specified_iterations)
-        iterations /= 100;
-
-      caching_strategy_type = ACE_LFU;
-      test_caching_strategy_type ();
-
-      caching_strategy_type = ACE_FIFO;
-      test_caching_strategy_type ();
-    }
-  else
-    {
-      test_caching_strategy_type ();
-    }
-
-  ACE_LOG_MSG->set_flags (ACE_Log_Msg::VERBOSE_LITE);
-
-#else   /* Do this for C Set++ 3.1 */
-
-int
-main (int argc,
-      ASYS_TCHAR *argv[])
-{
-  ACE_UNUSED_ARG (argc);
-  ACE_UNUSED_ARG (argv);
-
-  ACE_START_TEST (ASYS_TEXT ("Cached_Accept_Conn_Test"));
-  ACE_ERROR ((LM_INFO,
-              ASYS_TEXT ("C Set++ won't build this test correctly\n")));
-
-#endif /* !__xlC__ || __xlC > 0x0301 */
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-// = Handle Gobbler
-template class ACE_Node<ACE_HANDLE>;
-template class ACE_Unbounded_Set<ACE_HANDLE>;
-template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>;
-
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
-template class ACE_NOOP_Creation_Strategy<Client_Svc_Handler>;
-template class ACE_Concurrency_Strategy<Client_Svc_Handler>;
-template class ACE_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Creation_Strategy<Client_Svc_Handler>;
-template class ACE_Hash_Map_Entry<ADDR, Client_Svc_Handler *>;
-template class ACE_Hash<ADDR>;
-template class ACE_Equal_To<ADDR>;
-template class ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Client_Svc_Handler> *>;
-template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Client_Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Client_Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Client_Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Client_Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_NOOP_Concurrency_Strategy<Client_Svc_Handler>;
-template class ACE_Recycling_Strategy<Client_Svc_Handler>;
-template class ACE_Strategy_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Svc_Tuple<Client_Svc_Handler>;
-
-template class ACE_Strategy_Acceptor<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>;
-template class Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Acceptor<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Creation_Strategy<Server_Svc_Handler>;
-template class ACE_Concurrency_Strategy<Server_Svc_Handler>;
-template class ACE_Scheduling_Strategy<Server_Svc_Handler>;
-
-template class ACE_Pair<Client_Svc_Handler *, ATTRIBUTES>;
-template class ACE_Reference_Pair<ADDR, Client_Svc_Handler *>;
-template class ACE_Hash_Map_Entry<ADDR, CACHED_HANDLER>;
-
-template class ACE_Hash_Map_Manager<ADDR, Client_Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ADDR, Client_Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<ADDR, Client_Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ADDR, Client_Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Manager<ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-
-// = Caching_Strategy
-template class ACE_Hash_Cache_Map_Manager<ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>;
-
-template class ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
-
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-template class ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
-template class ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
-template class ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
-template class ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
-
-template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>;
-
-template class ACE_Cache_Map_Manager<ADDR, Client_Svc_Handler *, HASH_MAP, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
-template class ACE_Cache_Map_Iterator<ADDR, Client_Svc_Handler *, HASH_MAP_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
-template class ACE_Cache_Map_Reverse_Iterator<ADDR, Client_Svc_Handler *, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
-
-#else
-
-template class ACE_Cache_Map_Manager<ADDR, Client_Svc_Handler *, HASH_MAP, CACHING_STRATEGY, ATTRIBUTES>;
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-template class ACE_Cached_Connect_Strategy_Ex<Client_Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Cached_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>;
-
-template class ACE_Cleanup_Strategy<ADDR, CACHED_HANDLER, HASH_MAP>;
-template class ACE_Recyclable_Handler_Cleanup_Strategy<ADDR, CACHED_HANDLER, HASH_MAP>;
-template class ACE_Recyclable_Handler_Caching_Utility<ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>;
-
-template class ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-// = Handle Gobbler
-#pragma instantiate ACE_Node<ACE_HANDLE>
-#pragma instantiate ACE_Unbounded_Set<ACE_HANDLE>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE>
-
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-#pragma instantiate ACE_NOOP_Creation_Strategy<Client_Svc_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<Client_Svc_Handler>
-#pragma instantiate ACE_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Creation_Strategy<Client_Svc_Handler>
-#pragma instantiate ACE_Hash_Map_Entry<ADDR, Client_Svc_Handler *>
-#pragma instantiate ACE_Hash<ADDR>
-#pragma instantiate ACE_Equal_To<ADDR>
-#pragma instantiate ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Client_Svc_Handler> *>
-#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Client_Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Client_Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Client_Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Client_Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_NOOP_Concurrency_Strategy<Client_Svc_Handler>
-#pragma instantiate ACE_Recycling_Strategy<Client_Svc_Handler>
-#pragma instantiate ACE_Strategy_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Svc_Tuple<Client_Svc_Handler>
-
-#pragma instantiate ACE_Strategy_Acceptor<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Acceptor<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<Server_Svc_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<Server_Svc_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<Server_Svc_Handler>
-
-#pragma instantiate ACE_Pair<Client_Svc_Handler *, ATTRIBUTES>
-#pragma instantiate ACE_Reference_Pair<ADDR, Client_Svc_Handler *>
-#pragma instantiate ACE_Hash_Map_Entry<ADDR, CACHED_HANDLER>
-
-#pragma instantiate ACE_Hash_Map_Manager<ADDR, Client_Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ADDR, Client_Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ADDR, Client_Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ADDR, Client_Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Manager<ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-
-// = Caching_Strategy
-#pragma instantiate ACE_Hash_Cache_Map_Manager<ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>
-
-#pragma instantiate ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-#pragma instantiate ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-#pragma instantiate ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-#pragma instantiate ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-#pragma instantiate ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>
-
-#pragma instantiate ACE_Cache_Map_Manager<ADDR, Client_Svc_Handler *, HASH_MAP, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Iterator<ADDR, Client_Svc_Handler *, HASH_MAP_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<ADDR, Client_Svc_Handler *, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
-
-#else
-
-#pragma instantiate ACE_Cache_Map_Manager<ADDR, Client_Svc_Handler *, HASH_MAP, CACHING_STRATEGY, ATTRIBUTES>
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-#pragma instantiate ACE_Cached_Connect_Strategy_Ex<Client_Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Cached_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>
-
-#pragma instantiate ACE_Cleanup_Strategy<ADDR, CACHED_HANDLER, HASH_MAP>
-#pragma instantiate ACE_Recyclable_Handler_Cleanup_Strategy<ADDR, CACHED_HANDLER, HASH_MAP>
-#pragma instantiate ACE_Recyclable_Handler_Caching_Utility<ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>
-
-#pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* CACHED_CONNECT_TEST */
diff --git a/tests/Cached_Accept_Conn_Test.dsp b/tests/Cached_Accept_Conn_Test.dsp
deleted file mode 100644
index 2464e70bf6e..00000000000
--- a/tests/Cached_Accept_Conn_Test.dsp
+++ /dev/null
@@ -1,298 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Cached_Accept_Conn_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

-

-CFG=Cached_Accept_Conn_Test - Win32 PharLap ETS Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "Cached_Accept_Conn_Test.mak".

-!MESSAGE

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "Cached_Accept_Conn_Test.mak" CFG="Cached_Accept_Conn_Test - Win32 PharLap ETS Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Cached_Accept_Conn_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cached_Accept_Conn_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Cached_Accept_Conn_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

-!IF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\Debug"

-# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\Debug"

-# PROP BASE Target_Dir ".\Cached_Accept_Conn_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\DLL\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Cached_Accept_Conn_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Alpha Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Cached_Accept_Conn_Test\Alpha Debug"

-# PROP BASE Intermediate_Dir "Cached_Accept_Conn_Test\Alpha Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Cached_Accept_Conn_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Cached_Accept_Conn_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Cached_Accept_Conn_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Cached_Accept_Conn_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Cached_Accept_Conn_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Cached_Accept_Conn_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Cached_Accept_Conn_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF

-

-# Begin Target

-

-# Name "Cached_Accept_Conn_Test - Win32 Debug"

-# Name "Cached_Accept_Conn_Test - Win32 Alpha Debug"

-# Name "Cached_Accept_Conn_Test - Win32 PharLap ETS Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\Cached_Accept_Conn_Test.cpp

-

-!IF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Alpha Debug"

-

-DEP_CPP_Cached_Accept_Conn_=\

-	"..\ace\Acceptor.cpp"\

-	"..\ace\Acceptor.h"\

-	"..\ace\Acceptor.i"\

-	"..\ace\ACE.h"\

-	"..\ace\ACE.i"\

-	"..\ace\Addr.h"\

-	"..\ace\Addr.i"\

-	"..\ace\Atomic_Op.i"\

-	"..\ace\Auto_Ptr.cpp"\

-	"..\ace\Auto_Ptr.h"\

-	"..\ace\Auto_Ptr.i"\

-	"..\ace\config-win32-common.h"\

-	"..\ace\config-win32.h"\

-	"..\ace\config.h"\

-	"..\ace\Cached_Accept_Connector.cpp"\

-	"..\ace\Cached_Accept_Connector.h"\

-	"..\ace\Cached_Accept_Connector.i"\

-	"..\ace\Containers.cpp"\

-	"..\ace\Containers.h"\

-	"..\ace\Containers.i"\

-	"..\ace\Dynamic.h"\

-	"..\ace\Dynamic.i"\

-	"..\ace\Event_Handler.h"\

-	"..\ace\Event_Handler.i"\

-	"..\ace\Free_List.cpp"\

-	"..\ace\Free_List.h"\

-	"..\ace\Free_List.i"\

-	"..\ace\Get_Opt.h"\

-	"..\ace\Get_Opt.i"\

-	"..\ace\Handle_Set.h"\

-	"..\ace\Handle_Set.i"\

-	"..\ace\Hash_Map_Manager.cpp"\

-	"..\ace\Hash_Map_Manager.h"\

-	"..\ace\INET_Addr.h"\

-	"..\ace\INET_Addr.i"\

-	"..\ace\IO_Cntl_Msg.h"\

-	"..\ace\IPC_SAP.h"\

-	"..\ace\IPC_SAP.i"\

-	"..\ace\Log_Msg.h"\

-	"..\ace\Log_Priority.h"\

-	"..\ace\Log_Record.h"\

-	"..\ace\Log_Record.i"\

-	"..\ace\Malloc.h"\

-	"..\ace\Malloc.i"\

-	"..\ace\Malloc_T.cpp"\

-	"..\ace\Malloc_T.h"\

-	"..\ace\Malloc_T.i"\

-	"..\ace\Managed_Object.cpp"\

-	"..\ace\Managed_Object.h"\

-	"..\ace\Managed_Object.i"\

-	"..\ace\Map_Manager.cpp"\

-	"..\ace\Map_Manager.h"\

-	"..\ace\Map_Manager.i"\

-	"..\ace\Mem_Map.h"\

-	"..\ace\Mem_Map.i"\

-	"..\ace\Memory_Pool.h"\

-	"..\ace\Memory_Pool.i"\

-	"..\ace\Message_Block.h"\

-	"..\ace\Message_Block.i"\

-	"..\ace\Message_Queue.cpp"\

-	"..\ace\Message_Queue.h"\

-	"..\ace\Message_Queue.i"\

-	"..\ace\Module.cpp"\

-	"..\ace\Module.h"\

-	"..\ace\Module.i"\

-	"..\ace\Object_Manager.h"\

-	"..\ace\Object_Manager.i"\

-	"..\ace\OS.h"\

-	"..\ace\OS.i"\

-	"..\ace\Reactor.h"\

-	"..\ace\Reactor.i"\

-	"..\ace\Reactor_Impl.h"\

-	"..\ace\Service_Config.h"\

-	"..\ace\Service_Config.i"\

-	"..\ace\Service_Object.h"\

-	"..\ace\Service_Object.i"\

-	"..\ace\Service_Types.h"\

-	"..\ace\Service_Types.i"\

-	"..\ace\Shared_Object.h"\

-	"..\ace\Shared_Object.i"\

-	"..\ace\Signal.h"\

-	"..\ace\Signal.i"\

-	"..\ace\SOCK.h"\

-	"..\ace\SOCK.i"\

-	"..\ace\SOCK_Acceptor.h"\

-	"..\ace\SOCK_Acceptor.i"\

-	"..\ace\SOCK_Cached_Accept_Connector.h"\

-	"..\ace\SOCK_Cached_Accept_Connector.i"\

-	"..\ace\SOCK_IO.h"\

-	"..\ace\SOCK_IO.i"\

-	"..\ace\SOCK_Stream.h"\

-	"..\ace\SOCK_Stream.i"\

-	"..\ace\SString.h"\

-	"..\ace\SString.i"\

-	"..\ace\Strategies.h"\

-	"..\ace\Strategies_T.cpp"\

-	"..\ace\Strategies_T.h"\

-	"..\ace\Stream_Modules.cpp"\

-	"..\ace\Stream_Modules.h"\

-	"..\ace\Stream_Modules.i"\

-	"..\ace\SV_Semaphore_Complex.h"\

-	"..\ace\SV_Semaphore_Complex.i"\

-	"..\ace\SV_Semaphore_Simple.h"\

-	"..\ace\SV_Semaphore_Simple.i"\

-	"..\ace\Svc_Conf_Tokens.h"\

-	"..\ace\Svc_Handler.cpp"\

-	"..\ace\Svc_Handler.h"\

-	"..\ace\Svc_Handler.i"\

-	"..\ace\Synch.h"\

-	"..\ace\Synch.i"\

-	"..\ace\Synch_Options.h"\

-	"..\ace\Synch_T.cpp"\

-	"..\ace\Synch_T.h"\

-	"..\ace\Synch_T.i"\

-	"..\ace\Task.h"\

-	"..\ace\Task.i"\

-	"..\ace\Task_T.cpp"\

-	"..\ace\Task_T.h"\

-	"..\ace\Task_T.i"\

-	"..\ace\Thread.h"\

-	"..\ace\Thread.i"\

-	"..\ace\Thread_Manager.h"\

-	"..\ace\Thread_Manager.i"\

-	"..\ace\Time_Value.h"\

-	"..\ace\Timer_Queue.h"\

-	"..\ace\Timer_Queue_T.cpp"\

-	"..\ace\Timer_Queue_T.h"\

-	"..\ace\Timer_Queue_T.i"\

-	"..\ace\Trace.h"\

-	"..\ace\Version.h"\

-	"..\ace\WFMO_Reactor.h"\

-	"..\ace\WFMO_Reactor.i"\

-	"..\ace\ws2tcpip.h"\

-	".\Cached_Accept_Conn_Test.h"\

-	".\test_config.h"\

-

-NODEP_CPP_Cached_Accept_Conn_=\

-	"..\ace\stdcpp.h"\

-

-

-!ELSEIF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 PharLap ETS Debug"

-

-!ENDIF

-

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\Cached_Accept_Conn_Test.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\test_config.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/tests/Cached_Accept_Conn_Test.h b/tests/Cached_Accept_Conn_Test.h
deleted file mode 100644
index 377413621ce..00000000000
--- a/tests/Cached_Accept_Conn_Test.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-//
-// Contains classes for Cached_Accept_Conn_Test which are used in automatic
-// template instantiation - IBM C++ requires these to be in their own header.
-
-#ifndef __CACHED_ACCEPT_CONN_TEST_H
-#define __CACHED_ACCEPT_CONN_TEST_H
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Synch.h"
-
-class Client_Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-
-  Client_Svc_Handler (ACE_Thread_Manager *t = 0);
-  int open (void *v = 0);
-  int close (u_long flags = 0);
-};
-
-
-class Server_Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-
-  Server_Svc_Handler (ACE_Thread_Manager *t = 0);
-  int open (void *v = 0);
-};
-
-#endif /* __CACHED_ACCEPT_CONN_TEST_H */
diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp
index 70d0134f794..39ffc3f235f 100644
--- a/tests/Cached_Conn_Test.cpp
+++ b/tests/Cached_Conn_Test.cpp
@@ -9,11 +9,11 @@
 //    Cached_Conn_Test.cpp
 //
 // = DESCRIPTION
-//    The test illustrates how the <ACE_Strategy_Connector> works by
-//    showing how you can cache connections on the client using
-//    different caching strategies. Also how connections can be purged
-//    explicitly and implicitly if needed from the connection cache
-//    maintained by the connector.
+//     The test illustrates how the <ACE_Strategy_Connector> works by
+//   showing how you can cache connections on the client using
+//   different caching strategies. Also how connections can be purged
+//   explicitly if needed from the connection cache maintained by the
+//   connector.
 //
 // = AUTHOR
 //    Kirthika Parameswaran <kirthika@cs.wustl.edu>
@@ -24,20 +24,9 @@
 #define CACHED_CONNECT_TEST
 
 #include "test_config.h"
-
-// IBM C Set++ just can't grok the templates in here for auto template
-// instantiation. It ends up overwriting a tempinc/*.C file and mashes
-// its contents.
-#if !defined (__xlC__) || (__xlC__ > 0x0301)
-
-#include "Cached_Conn_Test.h"
-
-#if defined(__GNUC__) && __GNUC__ == 2 && __GNUC_MINOR__ < 8
-#define ACE_HAS_BROKEN_EXTENDED_TEMPLATES
-#endif /* __GNUC__ */
-
 #include "ace/INET_Addr.h"
 #include "ace/Strategies.h"
+#include "ace/Auto_Ptr.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Svc_Handler.h"
@@ -47,11 +36,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Caching_Utility_T.h"
 #include "ace/Cached_Connect_Strategy_T.h"
-#include "ace/Handle_Gobbler.h"
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4503)
-#endif /* _MSC_VER */
 
 ACE_RCSID(tests, Cached_Conn_Test, "$Id$")
 
@@ -60,170 +44,150 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
-static int debug = 0;
+// Default number of clients/servers.
+static int n_servers = 3000;
+static double purge_percentage = 20;
 
-Svc_Handler::Svc_Handler (ACE_Thread_Manager *t)
-  : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (t)
+enum Caching_Strategy_Type
 {
-}
+  ACE_LFU,
+  ACE_FIFO,
+  ACE_LRU,
+  ACE_NULL,
+  ACE_ALL
+};
+static Caching_Strategy_Type caching_strategy_type = ACE_ALL;
 
-int
-Svc_Handler::open (void *)
+class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
-  if (debug)
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("opening Svc_Handler %d with handle %d\n"),
-                this,
-                this->peer ().get_handle ()));
 
-  return 0;
-}
+public:
 
-int
-Svc_Handler::close (u_long flags)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Closing Svc_Handler %d with handle %d\n"),
-              this,
-              this->peer ().get_handle ()));
-  return ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::close (flags);
-}
+  Svc_Handler (ACE_Thread_Manager *t = 0)
+    : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (t)
+    {
+    }
+     
+  int open (void *v = 0)
+    {
+      ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::open (v);
+      ACE_DEBUG ((LM_DEBUG,
+              ASYS_TEXT ("(%P|%t) opening Svc_Handler %d with handle %d\n"),
+                  this,
+                  this->peer ().get_handle ()));
+      return 0;
+    }
+ 
+  int close (u_long flags = 0)
+    {
+      ACE_UNUSED_ARG (flags);
+      ACE_DEBUG ((LM_DEBUG, 
+                  ASYS_TEXT ("(%P|%t) Closing Svc_Handler %d with handle %d\n"),
+                  this,
+                  this->peer ().get_handle ()));
+      return this->handle_close ();
+    }
+
+  int idle (u_long flags = 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ASYS_TEXT ("(%P|%t) idling Svc_Handler %d with handle %d\n"),
+                  this,
+                  this->peer ().get_handle ()));
+      return ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::idle (flags);
+    }
+  
+};
 
 typedef size_t ATTRIBUTES;
-typedef ACE_Pair<Svc_Handler *, ATTRIBUTES>
+typedef ACE_Pair<Svc_Handler *, ATTRIBUTES> 
         CACHED_HANDLER;
 typedef ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-        ADDR;
-typedef ACE_Hash<ADDR> H_KEY;
-typedef ACE_Equal_To<ADDR> C_KEYS;
+        REFCOUNTED_HASH_RECYCLABLE_ADDR;
+typedef ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR> H_KEY;
+typedef ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR> C_KEYS;
 
-typedef ACE_Hash_Map_Manager_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+typedef ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>,\
+                                ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
         HASH_MAP;
-typedef ACE_Hash_Map_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+typedef ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, \
+                                 ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
         HASH_MAP_ITERATOR;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+typedef ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>,\
+                                         ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
         HASH_MAP_REVERSE_ITERATOR;
-
-typedef ACE_Recyclable_Handler_Cleanup_Strategy<ADDR, CACHED_HANDLER, HASH_MAP>
+typedef ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>
         CLEANUP_STRATEGY;
-typedef ACE_Recyclable_Handler_Caching_Utility<ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>
+typedef ACE_Recyclable_Handler_Caching_Utility<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>
         CACHING_UTILITY;
 
-typedef ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        LRU_CACHING_STRATEGY;
-
-#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-typedef LRU_CACHING_STRATEGY
+typedef ACE_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
         CACHING_STRATEGY;
-
-#else
-
-typedef ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+typedef ACE_LRU_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
+        LRU_CACHING_STRATEGY;
+typedef ACE_LFU_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
         LFU_CACHING_STRATEGY;
-typedef ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+typedef ACE_FIFO_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
         FIFO_CACHING_STRATEGY;
-typedef ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+typedef ACE_Null_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
         NULL_CACHING_STRATEGY;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>
+typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY >
         LRU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>
+typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>
         LFU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>
+typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>
         FIFO_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>
+typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>
         NULL_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        CACHING_STRATEGY;
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
 
 typedef ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>
         ACCEPTOR;
-
+  
 typedef ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
         STRATEGY_CONNECTOR;
-
+  
 typedef ACE_NOOP_Creation_Strategy<Svc_Handler>
         NULL_CREATION_STRATEGY;
-
+  
 typedef ACE_NOOP_Concurrency_Strategy<Svc_Handler>
         NULL_ACTIVATION_STRATEGY;
-
+ 
 typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
         CACHED_CONNECT_STRATEGY;
 
-enum Caching_Strategy_Type
-{
-  ACE_LFU,
-  ACE_FIFO,
-  ACE_LRU,
-  ACE_NULL,
-  ACE_ALL
-};
-
-// Default number of clients/servers.
-static int listen_once = 1;
-static int user_has_specified_iterations = 0;
-static size_t keep_handles_available = 100;
-static double purge_percentage = 20;
-static Caching_Strategy_Type caching_strategy_type = ACE_ALL;
-static CACHED_CONNECT_STRATEGY *connect_strategy = 0;
-
-// On Win32, the handle gobbling doesn't work.  Therefore, we need
-// more iterations to get to the handle limit.
-#if defined (ACE_WIN32)
-static int iterations = 2000;
-#else
-static int iterations = 200;
-#endif /* ACE_WIN32 */
-
 //====================================================================
 
-static void
-out_of_sockets_handler (void)
-{
-  if (ACE::out_of_handles (errno))
-    {
-      // Close connections which are cached by explicitly purging the
-      // connection cache maintained by the connector.
-      ACE_DEBUG ((LM_DEBUG, "Purging connections from Connection Cache...\n"));
-
-      int retval = connect_strategy->purge_connections ();
-      ACE_ASSERT (retval != -1);
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("%p\n"),
-                  ASYS_TEXT ("out_of_sockets_handler  failed!")));
-      // This shouldn't happen!
-      ACE_ASSERT (0);
-    }
-}
 
 static int
 cached_connect (STRATEGY_CONNECTOR &con,
                 const ACE_INET_Addr &server_addr)
 {
-  // This will make sure we get the host information correct.
-  ACE_INET_Addr remote_addr (server_addr.get_port_number (),
-                             ACE_LOCALHOST);
-
-  // Perform a blocking connect to the server using the Strategy
-  // Connector with a connection caching strategy.
   Svc_Handler *svc_handler = 0;
+  
+  // Perform a blocking connect to the server using the Strategy
+  // Connector with a connection caching strategy.  Since we are
+  // connecting to the same <server_addr> these calls will return
+  // the same dynamically allocated <Svc_Handler> for each
+  // <connect>.
   int result = con.connect (svc_handler,
-                            remote_addr);
+                            server_addr);
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
+                       ASYS_TEXT ("(%P|%t) %p\n"),
                        ASYS_TEXT ("connection failed")),
                       -1);
-
-  // Reset Svc_Handler state.
-  svc_handler->recycle_state (ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE);
-
+      
+  // Send the data to the server.
+  for (char *c = ACE_ALPHABET; *c != '\0'; c++)
+    if (svc_handler->peer ().send_n (c, 1) == -1)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%P|%t) %p\n"),
+                         ASYS_TEXT ("send_n")),
+                        -1);
+      
+  // Svc_Handler is now idle, so mark it as such and let the cache
+  // recycle it.
+  svc_handler->idle (1);
   return 0;
 }
 
@@ -231,117 +195,133 @@ static int
 server (ACCEPTOR *acceptor)
 {
   ACE_INET_Addr cli_addr;
-
+      
   // Create a new <Svc_Handler> to consume the data.
   Svc_Handler svc_handler;
-
+  
   int result = acceptor->accept (&svc_handler,
                                  &cli_addr);
   if (result == -1)
-    return -1;
+    {
+      if (errno == EMFILE)
+        return 1;
+          
+      return -1;
+    }
 
-  if (debug)
+  ACE_DEBUG ((LM_DEBUG,
+              ASYS_TEXT ("(%P|%t) client %s connected from %d\n"),
+              cli_addr.get_host_name (),
+              cli_addr.get_port_number ()));
+      
+  char c;
+  char *t = ACE_ALPHABET;
+  ssize_t r_bytes = 0;
+      
+  // Read data from client (terminate on error).
+  while ((r_bytes ==  svc_handler.peer ().recv_n (&c, 1)) > 0)
+    {
+      ACE_ASSERT (*t == c);
+          
+      // We need to guard against cached connections, which
+      // will send multiple sequences of letters from 'a' ->
+      // 'z' through the same connection.
+      if (*t == 'z')
+        t = ACE_ALPHABET;
+      else
+        t++;
+    }
+      
+  if (r_bytes == 0)
     ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("client %s connected from %d\n"),
-                cli_addr.get_host_name (),
-                cli_addr.get_port_number ()));
+                ASYS_TEXT ("(%P|%t) reached end of input, connection closed by client\n")));
+  else if (r_bytes == -1)
+    {
+      if (errno == EWOULDBLOCK)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("(%P|%t) no input available, going back to reading\n")));
+      else
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ASYS_TEXT ("(%P|%t) %p\n"),
+                           ASYS_TEXT ("recv_n")),
+                          -1);
+    }
 
-  //
-  // Svc_Handler dies here, closing the server side socket.
-  //
   return 0;
 }
 
+
 static void
 test_connection_management (CACHING_STRATEGY &caching_strategy)
 {
+  NULL_CREATION_STRATEGY creation_strategy;
+  NULL_ACTIVATION_STRATEGY activation_strategy;     
+      
   // Configure the Strategy Connector with a strategy that caches
   // connection.
   CACHED_CONNECT_STRATEGY caching_connect_strategy (caching_strategy);
-
-  // This is required by the <out_of_sockets_handler>.
-  connect_strategy = &caching_connect_strategy;
-
-  NULL_CREATION_STRATEGY creation_strategy;
-  NULL_ACTIVATION_STRATEGY activation_strategy;
-
+      
   STRATEGY_CONNECTOR strategy_connector (0,
                                          &creation_strategy,
                                          &caching_connect_strategy,
                                          &activation_strategy);
-
-  // If <listen_once> is true, only one Acceptor is used for the test.
-  ACCEPTOR listen_one_time_acceptor;
-  ACE_INET_Addr server_addr;
-
-  int result = listen_one_time_acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &));
-  ACE_ASSERT (result == 0);
-
-  result = listen_one_time_acceptor.acceptor ().get_local_addr (server_addr);
-  ACE_ASSERT (result == 0);
-
-  for (int i = 1; i <= iterations; ++i)
+      
+  // Set the purging percentage explicitly. By default it is 10%.
+  // Note: The purge_percent could have been set before itself but,
+  // the following has been done just to show how one would explicitly
+  // set the purge_percent at any moment.
+  CACHED_CONNECT_STRATEGY *connect_strategy = 
+    ACE_dynamic_cast (CACHED_CONNECT_STRATEGY *,
+                      strategy_connector.connect_strategy ());
+  
+  connect_strategy->caching_strategy ().purge_percent (purge_percentage);
+      
+  for (int i = 0; i < n_servers; ++i)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("iteration %d\n"),
-                  i));
-
-      // If <listen_once> is false, one Acceptor is used for every
-      // iteration.
-      ACCEPTOR listen_multiple_times_acceptor;
-
-      ACCEPTOR &acceptor = listen_once ?
-        listen_one_time_acceptor :
-        listen_multiple_times_acceptor;
-
-      if (!listen_once)
+      // Acceptor
+      ACCEPTOR acceptor;
+      ACE_INET_Addr server_addr;
+          
+      // Bind acceptor to any port and then find out what the port
+      // was.
+      if (acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)) == -1
+          || acceptor.acceptor ().get_local_addr (server_addr) == -1)
         {
-          // Bind acceptor to any port and then find out what the port
-          // was.
-          if (acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)) == -1)
-            {
-              out_of_sockets_handler ();
-              continue;
-            }
-
-          if (acceptor.acceptor ().get_local_addr (server_addr) == -1)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ASYS_TEXT ("%p\n"),
-                          ASYS_TEXT ("get_local_addr")));
-              ACE_ASSERT (0);
-            }
-
-          if (debug)
-            ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("starting server at port %d\n"),
-                        server_addr.get_port_number ()));
+          ACE_ERROR ((LM_ERROR,
+                      ASYS_TEXT ("(%P|%t) %p\n"),
+                      ASYS_TEXT ("open")));
+          return;
         }
-
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ASYS_TEXT ("(%P|%t) starting server at port %d\n"),
+                      server_addr.get_port_number ()));
+        }
+          
       // Run the cached blocking test.
+      ACE_DEBUG ((LM_DEBUG,
+                  ASYS_TEXT ("(%P|%t) *starting cached blocking connect\n")));
+          
       int result = cached_connect (strategy_connector,
                                    server_addr);
       ACE_ASSERT (result != -1);
-
+          
       result = server (&acceptor);
-      if (result == -1)
-        out_of_sockets_handler ();
-    }
-}
-
-#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-void
-test_caching_strategy_type (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "\nLRU_Caching_Strategy\n\n"));
-  CACHING_STRATEGY caching_strategy;
-  caching_strategy.purge_percent (purge_percentage);
-  test_connection_management (caching_strategy);
+      if (result == 1)
+        {
+          // Close connections which are cached by explicitly purging
+          // the connection cache maintained by the connector.
+          ACE_DEBUG ((LM_DEBUG, "Purging connections from Connection Cache...\n"));
+              
+          int retval = connect_strategy->purge_connections (purge_percentage);
+          ACE_ASSERT (retval != -1);
+        }
+          
+      ACE_ASSERT (result != -1);
+    } 
 }
-
-#else
-
+  
 void
 test_caching_strategy_type (void)
 {
@@ -372,45 +352,33 @@ test_caching_strategy_type (void)
       ACE_NEW (caching_strategy,
                FIFO_CACHING_STRATEGY_ADAPTER);
       break;
-
+      
     case ACE_ALL: // Just to remove warnings!
       break;
-    }
+    } 
 
-  caching_strategy->purge_percent (purge_percentage);
   test_connection_management (*caching_strategy);
   delete caching_strategy;
 }
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "l:i:p:c:a:d");
-
+  ACE_Get_Opt get_opt (argc, argv, "s:p:c:");
+      
   int cc;
-
+      
   while ((cc = get_opt ()) != -1)
     switch (cc)
       {
-      case 'd':
-        debug = 1;
-        break;
-      case 'l':
-        listen_once = atoi (get_opt.optarg);
-        break;
-      case 'i':
-        iterations = atoi (get_opt.optarg);
-        user_has_specified_iterations = 1;
+      case 's':
+        n_servers = atoi (get_opt.optarg);
         break;
       case 'p':
         purge_percentage = atoi (get_opt.optarg);
         break;
-      case 'c':
-        // Note that if null caching strategy is used then this test
-        // will fail if the number of servers exceed number of open
-        // files allowed for the process.
+      case 'c': // If Null Caching Strategy then this test will fail!
         if (ACE_OS::strcmp (get_opt.optarg, "null") == 0)
           caching_strategy_type = ACE_NULL;
         if (ACE_OS::strcmp (get_opt.optarg, "lru") == 0)
@@ -420,20 +388,14 @@ parse_args (int argc, char *argv[])
         if (ACE_OS::strcmp (get_opt.optarg, "fifo") == 0)
           caching_strategy_type = ACE_FIFO;
         break;
-      case 'a':
-        keep_handles_available = atoi (get_opt.optarg);
-        break;
       case '?':
       case 'h':
       default:
         ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("usage: %s ")
-                    ASYS_TEXT ("[-c (caching strategy: lru / lfu / fifo / null [default = all])] ")
-                    ASYS_TEXT ("[-i (iterations)] ")
-                    ASYS_TEXT ("[-l (listen once)] ")
-                    ASYS_TEXT ("[-d (addition debugging output)] ")
-                    ASYS_TEXT ("[-p (purge percent)] ")
-                    ASYS_TEXT ("[-a (keep handles available)] "),
+                    "usage: %s "
+                    "[-s (number of servers to connect to)] "
+                    "[-p (purge percent)] "
+                    "[-c (caching_strategy_type 0=NULL , 1=LRU, 2=LFU, 3=FIFO default=LRU)]\n",
                     argv[0]));
         return -1;
       }
@@ -445,51 +407,21 @@ int
 main (int argc,
       ASYS_TCHAR *argv[])
 {
-  // Validate options.
-  int result = parse_args (argc, argv);
-  if (result != 0)
-    return result;
-
-#if defined (ACE_WIN32)
-  // Somehow, on Win32, the <listen once> option allows us to create
-  // more handles.
-  if (!user_has_specified_iterations &&
-      listen_once)
-    iterations *= 2;
-#endif /* ACE_WIN32 */
-
-  // Start the test only if options are valid.
   ACE_START_TEST (ASYS_TEXT ("Cached_Conn_Test"));
-
-  // Remove the extra debugging attributes from Log_Msg output.
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::VERBOSE_LITE);
-
-  // The reactor's constructor changes the handle limit for the
-  // process.
-  ACE_Reactor::instance ();
-
-  // Consume all handles in the process, leaving us
-  // <keep_handles_available> to play with.
-  ACE_Handle_Gobbler handle_gobbler;
-  result = handle_gobbler.consume_handles (keep_handles_available);
+  
+  // Obtain the <number of servers> to connect to. Also the purge
+  // percentage using which the entries in the connection cache of
+  // the connector will be removed.
+  int result = parse_args (argc, argv);
   ACE_ASSERT (result == 0);
 
-#if defined ACE_HAS_BROKEN_EXTENDED_TEMPLATES
-  caching_strategy_type = ACE_LRU;
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
-  // Do we need to test all the strategies.  Note, that the less
-  // useful null strategy is ignored in this case.
+  // Do we need to test all the strategies.
   if (caching_strategy_type == ACE_ALL)
     {
       caching_strategy_type = ACE_LRU;
       test_caching_strategy_type ();
 
-      // Default iterations are too many; if the user hasn't specified
-      // otherwise, we'll shrink the iterations for LFU and FIFO.
-      if (!user_has_specified_iterations)
-        iterations /= 100;
-
       caching_strategy_type = ACE_LFU;
       test_caching_strategy_type ();
 
@@ -500,24 +432,8 @@ main (int argc,
     {
       test_caching_strategy_type ();
     }
-
+  
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::VERBOSE_LITE);
-
-#else   /* Do this for C Set++ 3.1 */
-
-int
-main (int argc,
-      ASYS_TCHAR *argv[])
-{
-  ACE_UNUSED_ARG (argc);
-  ACE_UNUSED_ARG (argv);
-
-  ACE_START_TEST (ASYS_TEXT ("Cached_Conn_Test"));
-  ACE_ERROR ((LM_INFO,
-              ASYS_TEXT ("C Set++ won't build this test correctly\n")));
-
-#endif /* !__xlC__ || __xlC > 0x0301 */
-
   ACE_END_TEST;
   return 0;
 }
@@ -525,11 +441,6 @@ main (int argc,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-// = Handle Gobbler
-template class ACE_Node<ACE_HANDLE>;
-template class ACE_Unbounded_Set<ACE_HANDLE>;
-template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>;
-
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
 template class ACE_NOOP_Creation_Strategy<Svc_Handler>;
@@ -537,9 +448,16 @@ template class ACE_Concurrency_Strategy<Svc_Handler>;
 template class ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR>;
 template class ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>;
 template class ACE_Creation_Strategy<Svc_Handler>;
-template class ACE_Hash_Map_Entry<ADDR, Svc_Handler *>;
-template class ACE_Hash<ADDR>;
-template class ACE_Equal_To<ADDR>;
+template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>;
+template class ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
+template class ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
+template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *>;
 template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
@@ -552,70 +470,51 @@ template class ACE_Svc_Tuple<Svc_Handler>;
 template class ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>;
 
 template class ACE_Pair<Svc_Handler *, ATTRIBUTES>;
-template class ACE_Reference_Pair<ADDR, Svc_Handler *>;
-template class ACE_Hash_Map_Entry<ADDR, CACHED_HANDLER>;
-
-template class ACE_Hash_Map_Manager<ADDR, Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ADDR, Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<ADDR, Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ADDR, Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Manager<ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Reference_Pair<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>;
+template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER>;
+
+template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+
+template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
 
 // = Caching_Strategy
-template class ACE_Hash_Cache_Map_Manager<ADDR, Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>;
-
-template class ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
-
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-template class ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
-template class ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
-template class ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
-template class ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
-
-template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>;
-template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>;
-
-template class ACE_Cache_Map_Manager<ADDR, Svc_Handler *, HASH_MAP, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
-template class ACE_Cache_Map_Iterator<ADDR, Svc_Handler *, HASH_MAP_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
-template class ACE_Cache_Map_Reverse_Iterator<ADDR, Svc_Handler *, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
-
-#else
-
-template class ACE_Cache_Map_Manager<ADDR, Svc_Handler *, HASH_MAP, CACHING_STRATEGY, ATTRIBUTES>;
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
+template class ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>;
+template class ACE_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP, HASH_MAP::iterator, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES>;
+template class ACE_Cache_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::iterator, CACHING_STRATEGY, ATTRIBUTES>;
+template class ACE_Cache_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES>;
 template class ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>;
 template class ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>;
 
-template class ACE_Cleanup_Strategy<ADDR, CACHED_HANDLER, HASH_MAP>;
-template class ACE_Recyclable_Handler_Cleanup_Strategy<ADDR, CACHED_HANDLER, HASH_MAP>;
-template class ACE_Recyclable_Handler_Caching_Utility<ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>;
+template class ACE_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>;
+template class ACE_Default_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>;
+template class ACE_Recyclable_Handler_Caching_Utility<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP::iterator, ATTRIBUTES>;
+template class ACE_Pair_Caching_Utility<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP::iterator, ATTRIBUTES>;
+template class ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>;
 
-template class ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >;
+template class ACE_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>;
+template class ACE_LRU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>;
+template class ACE_LFU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>;
+template class ACE_FIFO_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>;
+template class ACE_Null_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>;
 
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY >;
+template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY >;
+template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY >;
+template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY >;
 
-// = Handle Gobbler
-#pragma instantiate ACE_Node<ACE_HANDLE>
-#pragma instantiate ACE_Unbounded_Set<ACE_HANDLE>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE>
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 #pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
@@ -624,9 +523,16 @@ template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >;
 #pragma instantiate ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR>
 #pragma instantiate ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
 #pragma instantiate ACE_Creation_Strategy<Svc_Handler>
-#pragma instantiate ACE_Hash_Map_Entry<ADDR, Svc_Handler *>
-#pragma instantiate ACE_Hash<ADDR>
-#pragma instantiate ACE_Equal_To<ADDR>
+#pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>
+#pragma instantiate ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>
+#pragma instantiate ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>
+#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *>
 #pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
@@ -635,67 +541,54 @@ template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >;
 #pragma instantiate ACE_NOOP_Concurrency_Strategy<Svc_Handler>
 #pragma instantiate ACE_Recycling_Strategy<Svc_Handler>
 #pragma instantiate ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
+
 #pragma instantiate ACE_Svc_Tuple<Svc_Handler>
 #pragma instantiate ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>
 
 #pragma instantiate ACE_Pair<Svc_Handler *, ATTRIBUTES>
-#pragma instantiate ACE_Reference_Pair<ADDR, Svc_Handler *>
-#pragma instantiate ACE_Hash_Map_Entry<ADDR, CACHED_HANDLER>
-
-#pragma instantiate ACE_Hash_Map_Manager<ADDR, Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ADDR, Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ADDR, Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ADDR, Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Manager<ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Reference_Pair<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>
+#pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER>
+
+#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+
+#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
 
 // = Caching_Strategy
-#pragma instantiate ACE_Hash_Cache_Map_Manager<ADDR, Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>
-
-#pragma instantiate ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-
-#pragma instantiate ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-#pragma instantiate ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-#pragma instantiate ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-#pragma instantiate ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>
-#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>
-
-#pragma instantiate ACE_Cache_Map_Manager<ADDR, Svc_Handler *, HASH_MAP, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Iterator<ADDR, Svc_Handler *, HASH_MAP_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<ADDR, Svc_Handler *, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
-
-#else
-
-#pragma instantiate ACE_Cache_Map_Manager<ADDR, Svc_Handler *, HASH_MAP, CACHING_STRATEGY, ATTRIBUTES>
-
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
-
+#pragma instantiate ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>
+#pragma instantiate ACE_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP, HASH_MAP::iterator, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES>
+#pragma instantiate ACE_Cache_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::iterator, CACHING_STRATEGY, ATTRIBUTES>
+#pragma instantiate ACE_Cache_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES>
 #pragma instantiate ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
 #pragma instantiate ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>
 
-#pragma instantiate ACE_Cleanup_Strategy<ADDR, CACHED_HANDLER, HASH_MAP>
-#pragma instantiate ACE_Recyclable_Handler_Cleanup_Strategy<ADDR, CACHED_HANDLER, HASH_MAP>
-#pragma instantiate ACE_Recyclable_Handler_Caching_Utility<ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>
-
-#pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >
+#pragma instantiate ACE_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>
+#pragma instantiate ACE_Default_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>
+#pragma instantiate ACE_Recyclable_Handler_Caching_Utility<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP::iterator, ATTRIBUTES>
+#pragma instantiate ACE_Pair_Caching_Utility<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP::iterator, ATTRIBUTES>
+#pragma instantiate ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>
+
+#pragma instantiate ACE_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
+#pragma instantiate ACE_LRU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
+#pragma instantiate ACE_LFU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
+#pragma instantiate ACE_FIFO_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
+#pragma instantiate ACE_Null_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
+
+#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY >
+#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY >
+#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY >
+#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY >
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/tests/Cached_Conn_Test.dsp b/tests/Cached_Conn_Test.dsp
deleted file mode 100644
index 1f6f2235fa5..00000000000
--- a/tests/Cached_Conn_Test.dsp
+++ /dev/null
@@ -1,194 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Cached_Conn_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

-

-CFG=Cached_Conn_Test - Win32 PharLap ETS Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "Cached_Conn_Test.mak".

-!MESSAGE

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "Cached_Conn_Test.mak" CFG="Cached_Conn_Test - Win32 PharLap ETS Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Cached_Conn_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cached_Conn_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Cached_Conn_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

-!IF  "$(CFG)" == "Cached_Conn_Test - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Atomic_O"

-# PROP BASE Intermediate_Dir "Atomic_O"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\DLL\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Cached_Conn_Test - Win32 Alpha Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Atomic_O"

-# PROP BASE Intermediate_Dir "Atomic_O"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Cached_Conn_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Atomic_O"

-# PROP BASE Intermediate_Dir "Atomic_O"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Cached_Conn_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF

-

-# Begin Target

-

-# Name "Cached_Conn_Test - Win32 Debug"

-# Name "Cached_Conn_Test - Win32 Alpha Debug"

-# Name "Cached_Conn_Test - Win32 PharLap ETS Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\Cached_Conn_Test.cpp

-

-!IF  "$(CFG)" == "Cached_Conn_Test - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "Cached_Conn_Test - Win32 Alpha Debug"

-

-DEP_CPP_CACHE=\

-	"..\ace\ACE.h"\

-	"..\ace\ACE.i"\

-	"..\ace\Atomic_Op.i"\

-	"..\ace\Auto_Ptr.cpp"\

-	"..\ace\Auto_Ptr.h"\

-	"..\ace\Auto_Ptr.i"\

-	"..\ace\config-win32-common.h"\

-	"..\ace\config-win32.h"\

-	"..\ace\config.h"\

-	"..\ace\Event_Handler.h"\

-	"..\ace\Event_Handler.i"\

-	"..\ace\Log_Msg.h"\

-	"..\ace\Log_Priority.h"\

-	"..\ace\Log_Record.h"\

-	"..\ace\Log_Record.i"\

-	"..\ace\Managed_Object.cpp"\

-	"..\ace\Managed_Object.h"\

-	"..\ace\Managed_Object.i"\

-	"..\ace\Object_Manager.h"\

-	"..\ace\Object_Manager.i"\

-	"..\ace\OS.h"\

-	"..\ace\OS.i"\

-	"..\ace\SString.h"\

-	"..\ace\SString.i"\

-	"..\ace\SV_Semaphore_Complex.h"\

-	"..\ace\SV_Semaphore_Complex.i"\

-	"..\ace\SV_Semaphore_Simple.h"\

-	"..\ace\SV_Semaphore_Simple.i"\

-	"..\ace\Synch.h"\

-	"..\ace\Synch.i"\

-	"..\ace\Synch_T.cpp"\

-	"..\ace\Synch_T.h"\

-	"..\ace\Synch_T.i"\

-	"..\ace\Thread.h"\

-	"..\ace\Thread.i"\

-	"..\ace\Trace.h"\

-	"..\ace\Version.h"\

-	"..\ace\ws2tcpip.h"\

-	".\test_config.h"\

-

-NODEP_CPP_CACHE=\

-	"..\ace\stdcpp.h"\

-

-

-!ELSEIF  "$(CFG)" == "Cached_Conn_Test - Win32 PharLap ETS Debug"

-

-!ENDIF

-

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\test_config.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/tests/Cached_Conn_Test.h b/tests/Cached_Conn_Test.h
deleted file mode 100644
index 8fd619769c4..00000000000
--- a/tests/Cached_Conn_Test.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-//
-// Contains classes for Cached_Conn_Test which are used in automatic
-// template instantiation - IBM C++ requires these to be in their own header.
-
-#ifndef __CACHED_CONN_TEST_H
-#define __CACHED_CONN_TEST_H
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Synch.h"
-
-class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-
-  Svc_Handler (ACE_Thread_Manager *t = 0);
-  int open (void *v = 0);
-  int close (u_long flags = 0);
-};
-
-#endif /* __CACHED_ACCEPT_CONN_TEST_H */
diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index 8f5b88a0b02..dbf3e29317c 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -718,16 +718,14 @@ main (int argc, ASYS_TCHAR *argv[])
   // Bind acceptor to any port and then find out what the port was.
   if (acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)) == -1
       || acceptor.acceptor ().get_local_addr (server_addr) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("(%P|%t) %p\n"),
-                  ASYS_TEXT ("open")));
-      ACE_ASSERT (0);
-    }
+    ACE_ERROR ((LM_ERROR,
+                ASYS_TEXT ("(%P|%t) %p\n"),
+                ASYS_TEXT ("open")));
   else
     {
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("(%P|%t) starting server at port %d\n"),
+
                   server_addr.get_port_number ()));
 
 #if !defined (ACE_LACKS_FORK)
@@ -754,7 +752,6 @@ main (int argc, ASYS_TCHAR *argv[])
 #define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
 template class CACHED_CONNECT_STRATEGY;
 template class REFCOUNTED_HASH_RECYCLABLE_ADDR;
 template class ACE_NOOP_Creation_Strategy<Svc_Handler>;
@@ -765,27 +762,20 @@ template class ACE_Creation_Strategy<Svc_Handler>;
 template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>;
 template class ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
 template class ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
-
-template class ACE_Reverse_Lock<ACE_SYNCH_MUTEX>;
-template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_MUTEX> >;
-
 #if defined (ACE_HAS_THREADS)
 template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
 #endif /* ACE_HAS_THREADS */
-
 template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
 template class ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>;
@@ -801,7 +791,6 @@ template class ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>;
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 template class ACE_Svc_Tuple<Svc_Handler>;
 template class ACE_Auto_Basic_Array_Ptr<pid_t>;
-
 #if defined (__BORLANDC__)
 // Borland C++ doesn't link with these instantiations in the ACE library.
 template class ACE_Double_Linked_List<ACE_Thread_Descriptor>;
@@ -821,27 +810,20 @@ template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>;
 #pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>
 #pragma instantiate ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>
 #pragma instantiate ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>
-
-#pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_MUTEX> >
-
 #if defined (ACE_HAS_THREADS)
 #pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
 #endif /* ACE_HAS_THREADS */
-
 #pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>
@@ -857,12 +839,10 @@ template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>;
 #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 #pragma instantiate ACE_Svc_Tuple<Svc_Handler>
 #pragma instantiate ACE_Auto_Basic_Array_Ptr<pid_t>
-
 #if defined (__BORLANDC__)
 // Borland C++ doesn't link with these instantiations in the ACE library.
 #pragma instantiate ACE_Double_Linked_List<ACE_Thread_Descriptor>
 #pragma instantiate ACE_Unbounded_Queue<ACE_Thread_Descriptor_Base>
 #pragma instantiate ACE_Unbounded_Queue<ACE_Thread_Descriptor*>
 #endif /* defined (__BORLANDC__) */
-
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Conn_Test.h b/tests/Conn_Test.h
index 86f7adbf805..c0dc9c37de0 100644
--- a/tests/Conn_Test.h
+++ b/tests/Conn_Test.h
@@ -1,23 +1,5 @@
-/* -*- C++ -*- */
 // $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Conn_Test.h
-//
-// = DESCRIPTION
-//    Define class needed for generating templates. IBM C++ requires this to
-//    be in its own file for auto template instantiation.
-//
-// = AUTHOR
-//    Irfan Pyarali  <irfan@cs.wustl.edu>
-//
-// ============================================================================
-
 #include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -28,7 +10,6 @@
 #include "ace/SOCK_Stream.h"
 
 class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
   // = TITLE
   //      This class is the product created by both <ACE_Connector>
   //      and <ACE_Acceptor> objects.
@@ -37,6 +18,7 @@ class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
   //    This class gets its own header file to work around AIX C++
   //    compiler "features" related to template instantiation...  It is
   //    only used by Conn_Test.cpp.
+{
 public:
   Svc_Handler (ACE_Thread_Manager * = 0);
   // Do-nothing constructor.
diff --git a/tests/DLL_Test.cpp b/tests/DLL_Test.cpp
index c862af6d065..a35b9b19a76 100644
--- a/tests/DLL_Test.cpp
+++ b/tests/DLL_Test.cpp
@@ -42,7 +42,11 @@ USELIB("..\ace\aced.lib");
 
 #if defined (ACE_WIN32)
 #  define OBJ_SUFFIX ".exe"
-#  define OBJ_PREFIX ""
+#    if defined (__BORLANDC__)
+#      define OBJ_PREFIX ".\\bor\\bin\\"
+#    else
+#      define OBJ_PREFIX ""
+#    endif /* defined (__BORLANDC__) */
 #else
 #  define OBJ_SUFFIX ACE_DLL_SUFFIX
 #  define OBJ_PREFIX "./" ACE_DLL_PREFIX
diff --git a/tests/DLL_Test.h b/tests/DLL_Test.h
index 7db2754cbce..bbdc085c520 100644
--- a/tests/DLL_Test.h
+++ b/tests/DLL_Test.h
@@ -1,22 +1,8 @@
 // $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    DLL_Test.h
-//
-// = DESCRIPTION
-//     This file has the class definitions needed for template generation in
-//     DLL_Test.cpp.  They have to be in a separate file so AIX xlC can
-//     find them at auto-instantiate time.
-//
-// = AUTHOR
-//     Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-//
-// ============================================================================
+// This file has the class definitions needed for template generation in
+// DLL_Test.cpp.  They have to be in a separate file so AIX xlC can
+// find them at auto-instantiate time.
 
 #ifndef ACE_DLL_TEST_H
 #define ACE_DLL_TEST_H
diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp
index 084102236dd..e9d0a79b1c0 100644
--- a/tests/Env_Value_Test.cpp
+++ b/tests/Env_Value_Test.cpp
@@ -38,15 +38,17 @@ do { \
 } while (0)
 
 int
-#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) || defined (ACE_LACKS_FORK)
+#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
 // ACE_HAS_NONSTATIC_OBJECT_MANAGER only allows main to have two
-// arguments.  And on platforms that lack fork (), we can't use spawn.
+// arguments.  And on VxWorks, which uses
+// ACE_HAS_NONSTATIC_OBJECT_MANAGER, we can't use spawn because it
+// doesn't have <fork>.
 main (int argc, ASYS_TCHAR* [])
 {
   ACE_UNUSED_ARG (argc);
   ACE_OS::putenv (ASYS_TEXT ("TEST_VALUE_POSITIVE=10.2"));
   ACE_OS::putenv (ASYS_TEXT ("TEST_VALUE_NEGATIVE=-10.2"));
-#else  /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER  &&  ! ACE_LACKS_FORK */
+#else  /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 main (int argc, LPTSTR [], LPTSTR envp[])
 {
   if (argc == 1)
@@ -76,7 +78,7 @@ main (int argc, LPTSTR [], LPTSTR envp[])
       p.wait ();
     }
   else
-#endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER  &&  ! ACE_LACKS_FORK */
+#endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */
     {
       // In this case we're the child
       ACE_START_TEST (ASYS_TEXT ("Env_Value_Test"));
diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp
index 7529ae8a9a1..ee4c6c25f7a 100644
--- a/tests/Handle_Set_Test.cpp
+++ b/tests/Handle_Set_Test.cpp
@@ -208,13 +208,13 @@ main (int argc, ASYS_TCHAR *argv[])
 // The ACE_Node<ACE_INT32> instantation is in ace/Stats.cpp.
 template class ACE_Unbounded_Set<ACE_HANDLE>;
 template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>;
-# if defined(_CRAYMPP)
-// MPP Cray ACE_HANDLE is 64-bit, defined as int, but ACE_INT32 is short
-// so instantiation in ace/Stats.cpp isn't used in this case
-template class ACE_Node<ACE_HANDLE>;
-# endif
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 // The ACE_Node<ACE_INT32> instantation is in ace/Stats.cpp.
 #pragma instantiate ACE_Unbounded_Set<ACE_HANDLE>
 #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE>
+# if defined(_CRAYMPP)
+// MPP Cray ACE_HANDLE is 64-bit, defined as int, but ACE_INT32 is short
+// so instantiation in ace/Stats.cpp isn't used in this case
+#pragma instantiate ACE_Node<ACE_HANDLE>
+# endif
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Hash_Map_Bucket_Iterator_Test.cpp b/tests/Hash_Map_Bucket_Iterator_Test.cpp
deleted file mode 100644
index 83bc58b2da5..00000000000
--- a/tests/Hash_Map_Bucket_Iterator_Test.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Hash_Map_Bucket_Iterator_Test.cpp
-//
-// = DESCRIPTION
-//     This is a simple test of the <Hash_Map_Bucket_Iterator>.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ============================================================================
-
-#include "test_config.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
-#include "ace/Get_Opt.h"
-#include "ace/Functor.h"
-
-ACE_RCSID(tests, Hash_Map_Bucket_Iterator_Test, "$Id$")
-
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-////////////////////////////////////////////////////////////////////////////////
-
-static ACE_UINT32 iterations = ACE_MAX_ITERATIONS * 10;
-static ACE_UINT32 table_size = ACE_MAX_ITERATIONS;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "t:i:");
-
-  int cc;
-
-  while ((cc = get_opt ()) != -1)
-    switch (cc)
-      {
-      case 't':
-        table_size = atoi (get_opt.optarg);
-        break;
-      case 'i':
-        iterations = atoi (get_opt.optarg);
-        break;
-      case '?':
-      case 'h':
-      default:
-        ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("usage: %s ")
-                    ASYS_TEXT ("[-i (iterations)] ")
-                    ASYS_TEXT ("[-t (table size)] "),
-                    argv[0]));
-        return -1;
-      }
-
-  return 0;
-}
-
-typedef ACE_Hash_Map_Manager_Ex<ACE_UINT32,
-                                ACE_UINT32,
-                                ACE_Hash<ACE_UINT32>,
-                                ACE_Equal_To<ACE_UINT32>,
-                                ACE_SYNCH_NULL_MUTEX> HASH_MAP;
-
-typedef ACE_Hash_Map_Bucket_Iterator<ACE_UINT32,
-                                     ACE_UINT32,
-                                     ACE_Hash<ACE_UINT32>,
-                                     ACE_Equal_To<ACE_UINT32>,
-                                     ACE_SYNCH_NULL_MUTEX> HASH_MAP_BUCKET_ITERATOR;
-
-int
-main (int argc, ASYS_TCHAR *argv[])
-{
-  // Validate options.
-  int result = parse_args (argc, argv);
-  if (result != 0)
-    return result;
-
-  // Start the test only if options are valid.
-  ACE_START_TEST (ASYS_TEXT ("Hash_Map_Bucket_Iterator_Test"));
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::VERBOSE_LITE);
-
-  ACE_UINT32 i = 0;
-  HASH_MAP map (table_size);
-
-  for (i = 0; i < iterations; ++i)
-    {
-      int result = map.bind (i, i);
-      ACE_ASSERT (result == 0);
-      ACE_UNUSED_ARG (result);
-    }
-
-  for (i = 0; i < table_size; ++i)
-    {
-      HASH_MAP_BUCKET_ITERATOR iterator (map,
-                                         i);
-
-      HASH_MAP_BUCKET_ITERATOR end (map,
-                                    i,
-                                    1);
-
-      for (;
-           iterator != end;
-           ++iterator)
-        {
-          ACE_UINT32 key = (*iterator).ext_id_;
-          ACE_ASSERT (((key - i) % table_size) == 0);
-        }
-    }
-
-  ACE_LOG_MSG->set_flags (ACE_Log_Msg::VERBOSE_LITE);
-  ACE_END_TEST;
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Equal_To<ACE_UINT32>;
-template class ACE_Hash_Map_Entry<ACE_UINT32, ACE_UINT32>;
-template class ACE_Hash_Map_Manager_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Bucket_Iterator<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Equal_To<ACE_UINT32>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_UINT32, ACE_UINT32>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Hash_Map_Bucket_Iterator_Test.dsp b/tests/Hash_Map_Bucket_Iterator_Test.dsp
deleted file mode 100644
index 8357f7ac33c..00000000000
--- a/tests/Hash_Map_Bucket_Iterator_Test.dsp
+++ /dev/null
@@ -1,230 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Hash_Map_Bucket_Iterator_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

-

-CFG=Hash_Map_Bucket_Iterator_Test - Win32 PharLap ETS Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "Hash_Map_Bucket_Iterator_Test.mak".

-!MESSAGE

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "Hash_Map_Bucket_Iterator_Test.mak" CFG="Hash_Map_Bucket_Iterator_Test - Win32 PharLap ETS Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

-!IF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\DLL\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Alpha Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Hash_Map"

-# PROP BASE Intermediate_Dir "Hash_Map"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Hash_Map_Bucket_Iterator_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Hash_Map_Bucket_Iterator_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Hash_Map_Bucket_Iterator_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF

-

-# Begin Target

-

-# Name "Hash_Map_Bucket_Iterator_Test - Win32 Debug"

-# Name "Hash_Map_Bucket_Iterator_Test - Win32 Alpha Debug"

-# Name "Hash_Map_Bucket_Iterator_Test - Win32 PharLap ETS Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\Hash_Map_Bucket_Iterator_Test.cpp

-

-!IF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Alpha Debug"

-

-DEP_CPP_HASH_=\

-	"..\ace\ACE.h"\

-	"..\ace\ACE.i"\

-	"..\ace\Atomic_Op.i"\

-	"..\ace\Auto_Ptr.cpp"\

-	"..\ace\Auto_Ptr.h"\

-	"..\ace\Auto_Ptr.i"\

-	"..\ace\config-win32-common.h"\

-	"..\ace\config-win32.h"\

-	"..\ace\config.h"\

-	"..\ace\Containers.cpp"\

-	"..\ace\Containers.h"\

-	"..\ace\Containers.i"\

-	"..\ace\Event_Handler.h"\

-	"..\ace\Event_Handler.i"\

-	"..\ace\Free_List.cpp"\

-	"..\ace\Free_List.h"\

-	"..\ace\Free_List.i"\

-	"..\ace\Handle_Set.h"\

-	"..\ace\Handle_Set.i"\

-	"..\ace\Hash_Map_Manager.cpp"\

-	"..\ace\Hash_Map_Manager.h"\

-	"..\ace\Log_Msg.h"\

-	"..\ace\Log_Priority.h"\

-	"..\ace\Log_Record.h"\

-	"..\ace\Log_Record.i"\

-	"..\ace\Malloc.h"\

-	"..\ace\Malloc.i"\

-	"..\ace\Malloc_T.cpp"\

-	"..\ace\Malloc_T.h"\

-	"..\ace\Malloc_T.i"\

-	"..\ace\Managed_Object.cpp"\

-	"..\ace\Managed_Object.h"\

-	"..\ace\Managed_Object.i"\

-	"..\ace\Mem_Map.h"\

-	"..\ace\Mem_Map.i"\

-	"..\ace\Memory_Pool.h"\

-	"..\ace\Memory_Pool.i"\

-	"..\ace\Object_Manager.h"\

-	"..\ace\Object_Manager.i"\

-	"..\ace\OS.h"\

-	"..\ace\OS.i"\

-	"..\ace\Reactor.h"\

-	"..\ace\Reactor.i"\

-	"..\ace\Reactor_Impl.h"\

-	"..\ace\Service_Config.h"\

-	"..\ace\Service_Config.i"\

-	"..\ace\Service_Object.h"\

-	"..\ace\Service_Object.i"\

-	"..\ace\Shared_Object.h"\

-	"..\ace\Shared_Object.i"\

-	"..\ace\Signal.h"\

-	"..\ace\Signal.i"\

-	"..\ace\SString.h"\

-	"..\ace\SString.i"\

-	"..\ace\SV_Semaphore_Complex.h"\

-	"..\ace\SV_Semaphore_Complex.i"\

-	"..\ace\SV_Semaphore_Simple.h"\

-	"..\ace\SV_Semaphore_Simple.i"\

-	"..\ace\Svc_Conf_Tokens.h"\

-	"..\ace\Synch.h"\

-	"..\ace\Synch.i"\

-	"..\ace\Synch_T.cpp"\

-	"..\ace\Synch_T.h"\

-	"..\ace\Synch_T.i"\

-	"..\ace\Thread.h"\

-	"..\ace\Thread.i"\

-	"..\ace\Timer_Queue.h"\

-	"..\ace\Timer_Queue_T.cpp"\

-	"..\ace\Timer_Queue_T.h"\

-	"..\ace\Timer_Queue_T.i"\

-	"..\ace\Trace.h"\

-	"..\ace\Version.h"\

-	"..\ace\ws2tcpip.h"\

-	".\test_config.h"\

-

-NODEP_CPP_HASH_=\

-	"..\ace\stdcpp.h"\

-	".\Hash_Map_Bucket_Iterator_Test.h"\

-

-

-!ELSEIF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 PharLap ETS Debug"

-

-!ENDIF

-

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/tests/MT_Reactor_Timer_Test.cpp b/tests/MT_Reactor_Timer_Test.cpp
index 42a6d2a4902..c37c63714f8 100644
--- a/tests/MT_Reactor_Timer_Test.cpp
+++ b/tests/MT_Reactor_Timer_Test.cpp
@@ -256,6 +256,7 @@ Dispatch_Count_Handler::handle_timeout (const ACE_Time_Value &tv,
   return 0;
 }
 
+
 int
 Dispatch_Count_Handler::verify_results (void)
 {
@@ -267,6 +268,7 @@ Dispatch_Count_Handler::verify_results (void)
 
 }
 
+
 int
 main (int, ASYS_TCHAR *[])
 {
@@ -290,7 +292,7 @@ main (int, ASYS_TCHAR *[])
                         1);
 
   ACE_Time_Value no_waiting (0);
-  size_t events = 0;
+  int events = 0;
 
   while (1)
     {
@@ -309,22 +311,17 @@ main (int, ASYS_TCHAR *[])
   // All <ACE_MAX_TIMERS> + 2 I/O dispatches (one for <handle_input>
   // and the other for <handle_exception>) should be counted in
   // events.
-  if (events < ACE_MAX_TIMERS + 2) 
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("expected %d events, got %d instead\n"),
-                  ACE_MAX_TIMERS + 2,
-                  events));
-      ACE_ASSERT (events >= ACE_MAX_TIMERS + 2);
-    }
+  if (events < ACE_MAX_TIMERS + 2) {
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("expected %d events, got %d instead\n"),
+                ACE_MAX_TIMERS + 2, events));
+    ACE_ASSERT (events >= ACE_MAX_TIMERS + 2);
+  }
 
   status = callback.verify_results ();
-  if (status != 0) 
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("Dispatch counting test failed.\n")));
-      test_result = 1;
-    }
+  if (status != 0) {
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Dispatch counting test failed.\n")));
+    test_result = 1;
+  }
 
 #if defined (ACE_HAS_THREADS)
 
@@ -344,9 +341,7 @@ main (int, ASYS_TCHAR *[])
   if (status == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("%p, errno is %d\n"),
-                  "wait ()",
-                  errno));
+                  ASYS_TEXT ("%p, errno is %d\n"), "wait ()", errno));
       ACE_ASSERT (status != -1);
     }
 
diff --git a/tests/Makefile b/tests/Makefile
index 923fc19be8f..c8cc327f25b 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -14,9 +14,7 @@ BIN =   Aio_Platform_Test \
         Barrier_Test \
         Basic_Types_Test \
         Buffer_Stream_Test \
-        Cache_Map_Manager_Test \
-        Cached_Accept_Conn_Test \
-        Cached_Conn_Test \
+	Cache_Map_Manager_Test \
         CDR_Test \
         Collection_Test \
         Conn_Test \
@@ -30,7 +28,6 @@ BIN =   Aio_Platform_Test \
         High_Res_Timer_Test \
         OrdMultiSet_Test \
         Hash_Map_Manager_Test \
-        Hash_Map_Bucket_Iterator_Test \
         IOStream_Test \
         Map_Test \
         Map_Manager_Test \
@@ -118,9 +115,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 ifndef SOEXT
   SOEXT=so
 endif
-ifdef shared_libs
-  BUILD += libDLL_Test.$(SOEXT)
-endif # shared_libs
+BUILD += libDLL_Test.$(SOEXT)
 
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
@@ -142,7 +137,7 @@ endif
 	@$(MAKE) -f Makefile.DLL
 
 realclean: clean
-	-$(RM) libDLL_Test.$(SOEXT) log/compilations.log*
+	-$(RM) libDLL_Test.$(SOEXT)
 
 #----------------------------------------------------------------------------
 #       Dependencies
@@ -543,404 +538,15 @@ realclean: clean
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Caching_Strategies_T.h \
  $(ACE_ROOT)/ace/Caching_Utility_T.h \
- $(ACE_ROOT)/ace/Cleanup_Strategies_T.h \
- $(ACE_ROOT)/ace/Cleanup_Strategies_T.i \
- $(ACE_ROOT)/ace/Cleanup_Strategies_T.cpp \
  $(ACE_ROOT)/ace/Caching_Utility_T.i \
  $(ACE_ROOT)/ace/Caching_Utility_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Caching_Strategies_T.i \
- $(ACE_ROOT)/ace/Caching_Strategies_T.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Cache_Map_Manager_Test.h
-.obj/Cached_Accept_Conn_Test.o .obj/Cached_Accept_Conn_Test.so .shobj/Cached_Accept_Conn_Test.o .shobj/Cached_Accept_Conn_Test.so: Cached_Accept_Conn_Test.cpp test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- Cached_Accept_Conn_Test.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Caching_Utility_T.h \
  $(ACE_ROOT)/ace/Cleanup_Strategies_T.h \
  $(ACE_ROOT)/ace/Cleanup_Strategies_T.i \
  $(ACE_ROOT)/ace/Cleanup_Strategies_T.cpp \
- $(ACE_ROOT)/ace/Caching_Utility_T.i \
- $(ACE_ROOT)/ace/Caching_Utility_T.cpp \
- $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.h \
- $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Cache_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Cache_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Cache_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Caching_Strategies_T.h \
  $(ACE_ROOT)/ace/Caching_Strategies_T.i \
  $(ACE_ROOT)/ace/Caching_Strategies_T.cpp \
- $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.i \
- $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.cpp \
- $(ACE_ROOT)/ace/Handle_Gobbler.h \
- $(ACE_ROOT)/ace/Handle_Gobbler.i
-.obj/Cached_Conn_Test.o .obj/Cached_Conn_Test.so .shobj/Cached_Conn_Test.o .shobj/Cached_Conn_Test.so: Cached_Conn_Test.cpp test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- Cached_Conn_Test.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Caching_Utility_T.h \
- $(ACE_ROOT)/ace/Cleanup_Strategies_T.h \
- $(ACE_ROOT)/ace/Cleanup_Strategies_T.i \
- $(ACE_ROOT)/ace/Cleanup_Strategies_T.cpp \
- $(ACE_ROOT)/ace/Caching_Utility_T.i \
- $(ACE_ROOT)/ace/Caching_Utility_T.cpp \
- $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.h \
- $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Cache_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Cache_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Cache_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Caching_Strategies_T.h \
- $(ACE_ROOT)/ace/Caching_Strategies_T.i \
- $(ACE_ROOT)/ace/Caching_Strategies_T.cpp \
- $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.i \
- $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.cpp \
- $(ACE_ROOT)/ace/Handle_Gobbler.h \
- $(ACE_ROOT)/ace/Handle_Gobbler.i
+ $(ACE_ROOT)/ace/Get_Opt.i
 .obj/CDR_Test.o .obj/CDR_Test.so .shobj/CDR_Test.o .shobj/CDR_Test.so: CDR_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1916,93 +1522,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
-.obj/Hash_Map_Bucket_Iterator_Test.o .obj/Hash_Map_Bucket_Iterator_Test.so .shobj/Hash_Map_Bucket_Iterator_Test.o .shobj/Hash_Map_Bucket_Iterator_Test.so: Hash_Map_Bucket_Iterator_Test.cpp \
- test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
 .obj/IOStream_Test.o .obj/IOStream_Test.so .shobj/IOStream_Test.o .shobj/IOStream_Test.so: IOStream_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -2371,37 +1890,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Caching_Strategies_T.h \
  $(ACE_ROOT)/ace/Caching_Utility_T.h \
+ $(ACE_ROOT)/ace/Caching_Utility_T.i \
+ $(ACE_ROOT)/ace/Caching_Utility_T.cpp \
  $(ACE_ROOT)/ace/Cleanup_Strategies_T.h \
  $(ACE_ROOT)/ace/Cleanup_Strategies_T.i \
  $(ACE_ROOT)/ace/Cleanup_Strategies_T.cpp \
- $(ACE_ROOT)/ace/Caching_Utility_T.i \
- $(ACE_ROOT)/ace/Caching_Utility_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Caching_Strategies_T.i \
  $(ACE_ROOT)/ace/Caching_Strategies_T.cpp
 .obj/Mem_Map_Test.o .obj/Mem_Map_Test.so .shobj/Mem_Map_Test.o .shobj/Mem_Map_Test.so: Mem_Map_Test.cpp test_config.h \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3474b195f93..6c0d9ba5f09 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -57,7 +57,6 @@ check_PROGRAMS = \
         Basic_Types_Test \
         Buffer_Stream_Test \
 	Cache_Map_Manager_Test \
-        Cached_Conn_Test \
         CDR_Test \
         Collection_Test \
         Conn_Test \
@@ -68,6 +67,7 @@ check_PROGRAMS = \
         Env_Value_Test \
         Future_Test \
         Handle_Set_Test \
+        Hash_Map_Manager_Test \
         High_Res_Timer_Test \
         IOStream_Test \
         MM_Shared_Memory_Test \
@@ -79,6 +79,7 @@ check_PROGRAMS = \
         Message_Block_Test \
         Message_Queue_Notifications_Test \
         Message_Queue_Test \
+        Naming_Test \
         New_Fail_Test \
         Notify_Performance_Test \
         OrdMultiSet_Test \
@@ -110,19 +111,15 @@ check_PROGRAMS = \
         Task_Test \
         Thread_Manager_Test \
         Thread_Mutex_Test \
+        Thread_Pool_Reactor_Test \
         Thread_Pool_Test \
         Time_Service_Test \
         Time_Value_Test \
         Timeprobe_Test \
         Timer_Queue_Test \
+        Tokens_Test \
         UPIPE_SAP_Test \
-        Upgradable_RW_Test \
-	\
-	Naming_Test \
-	\
-        FlReactor_Test \
-	Thread_Pool_Reactor_Test \
-        TkReactor_Test $(XTREACTOR_TEST)
+        Upgradable_RW_Test $(XTREACTOR_TEST)
 
 Aio_Platform_Test_SOURCES = Aio_Platform_Test.cpp
 
@@ -136,12 +133,7 @@ Buffer_Stream_Test_SOURCES = Buffer_Stream_Test.cpp
 
 CDR_Test_SOURCES = CDR_Test.cpp
 
-# Cached_Accept_Conn_Test_SOURCES = Cached_Accept_Conn_Test.cpp
-
-Cached_Conn_Test_SOURCES = Cached_Conn_Test.cpp
-
-Cache_Map_Manager_Test_SOURCES = Cache_Map_Manager_Test.cpp \
-                                 Cache_Map_Manager_Test.h
+Cache_Map_Manager_Test_SOURCES = Cache_Map_Manager_Test.cpp
 
 Collection_Test_SOURCES = Collection_Test.cpp
 
@@ -157,12 +149,12 @@ Enum_Interfaces_Test_SOURCES = Enum_Interfaces_Test.cpp
 
 Env_Value_Test_SOURCES = Env_Value_Test.cpp
 
-FlReactor_Test_SOURCES = FlReactor_Test.cpp
-
 Future_Test_SOURCES = Future_Test.cpp
 
 Handle_Set_Test_SOURCES = Handle_Set_Test.cpp
 
+Hash_Map_Manager_Test_SOURCES = Hash_Map_Manager_Test.cpp
+
 High_Res_Timer_Test_SOURCES = High_Res_Timer_Test.cpp
 
 IOStream_Test_SOURCES = IOStream_Test.cpp
@@ -210,7 +202,7 @@ Process_Strategy_Test_SOURCES = Process_Strategy_Test.cpp \
 
 # Purgable_Map_Manager_Test_SOURCES = Purgable_Map_Manager_Test.cpp
 
-RB_Tree_Test_SOURCES = RB_Tree_Test.cpp RB_Tree_Test.h
+RB_Tree_Test_SOURCES = RB_Tree_Test.cpp
 
 Reactor_Exceptions_Test_SOURCES = Reactor_Exceptions_Test.cpp
 
@@ -269,7 +261,7 @@ Timeprobe_Test_SOURCES = Timeprobe_Test.cpp
 
 Timer_Queue_Test_SOURCES = Timer_Queue_Test.cpp
 
-TkReactor_Test_SOURCES = TkReactor_Test.cpp
+Tokens_Test_SOURCES = Tokens_Test.cpp
 
 UPIPE_SAP_Test_SOURCES = UPIPE_SAP_Test.cpp
 
@@ -283,15 +275,12 @@ XtReactor_Test_LDADD = $(top_builddir)/ace/libACE.la @XTREACTOR_TEST_XLIBS@
 noinst_HEADERS = test_config.h
 
 ## Architecture independent data files
-noinst_DATA = \
-	TkReactor_Test.tcl \
-	\
-	UNIXserver.conf \
-        UNIXclerk.conf \
-        UNIXtokens.conf \
-        Win32server.conf \
-        Win32clerk.conf \
-        Win32tokens.conf
+noinst_DATA = UNIXserver.conf \
+              UNIXclerk.conf \
+              UNIXtokens.conf \
+              Win32server.conf \
+              Win32clerk.conf \
+              Win32tokens.conf
 
 
 ## The tests we want to run are all of the test programs we are going to build.
@@ -299,7 +288,7 @@ noinst_DATA = \
 if ACE_CROSS_COMPILED
 TESTS =
 else
-TESTS = $(check_PROGRAMS)
+TESTS = $(noinst_PROGRAMS)
 endif
 
 ## Set up the test environment
diff --git a/tests/Makefile.bor b/tests/Makefile.bor
index 7fb5b64127f..d895c168c90 100644
--- a/tests/Makefile.bor
+++ b/tests/Makefile.bor
@@ -10,9 +10,6 @@ TESTS = \
 	Barrier_Test \
 	Basic_Types_Test \
 	Buffer_Stream_Test \
-	Cache_Map_Manager_Test \
-	Cached_Conn_Test \
-	Cached_Accept_Conn_Test \
 	CDR_Test \
 	Collection_Test \
 	Conn_Test \
@@ -22,13 +19,10 @@ TESTS = \
 	Enum_Interfaces_Test \
 	Env_Value_Test \
 	Future_Test \
-	Future_Set_Test \
 	Handle_Set_Test \
 	High_Res_Timer_Test \
 	Hash_Map_Manager_Test \
-	Hash_Map_Bucket_Iterator_Test \
 	IOStream_Test \
-	Map_Manager_Test \
 	Map_Test \
 	Mem_Map_Test \
 	MM_Shared_Memory_Test \
@@ -72,7 +66,6 @@ TESTS = \
 	Task_Test \
 	Thread_Manager_Test \
 	Thread_Mutex_Test \
-	Thread_Pool_Reactor_Test \
 	Thread_Pool_Test \
 	Time_Service_Test \
 	Time_Value_Test \
@@ -83,6 +76,8 @@ TESTS = \
 	Upgradable_RW_Test \
 	XtReactor_Test
 
+#	Map_Manager_Test \
+
 all_tests: $(TESTS)
 
 $(TESTS):
diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp
index 5c8b63813a3..0b6fb1dae66 100644
--- a/tests/Map_Manager_Test.cpp
+++ b/tests/Map_Manager_Test.cpp
@@ -71,11 +71,9 @@ typedef ACE_Hash_Map_Iterator_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KE
 typedef ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
         CACHE_REV_ITER_IMPL;
 typedef int ATTR;
-typedef ACE_Null_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL>
-        NULL_CLEANUP;
 typedef ACE_Null_Caching_Utility <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>
         NULL_UTILITY;
-typedef ACE_Null_Caching_Strategy<ATTR, NULL_UTILITY>
+typedef ACE_Null_Caching_Strategy<TYPE, TYPE, CACHE_MAP_IMPL, ATTR, NULL_UTILITY>
         NULL_CACHING_STRATEGY;
 typedef ACE_Cache_Map_Manager<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
         CACHE_MAP_MANAGER;
@@ -934,7 +932,7 @@ main (int argc, ASYS_TCHAR *argv[])
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Equal_To<TYPE>;
-template class ACE_Pair<TYPE, ATTR>;
+template class ACE_Pair<TYPE, ATTR >;
 template class ACE_Reference_Pair<TYPE, TYPE>;
 template class ACE_Hash_Map_Manager_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
 template class ACE_Hash_Map_Iterator_Base_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
@@ -952,22 +950,20 @@ template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, TYPE, MUTEX>;
 template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>;
 template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>;
 template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, TYPE>;
-template class ACE_Hash_Map_Manager_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
 template class ACE_Hash_Map_Entry<TYPE, ACE_Pair<TYPE, ATTR> >;
-template class ACE_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL>;
-template class ACE_Null_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL>;
-template class ACE_Null_Caching_Utility<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>;
-template class ACE_Null_Caching_Strategy<ATTR, NULL_UTILITY>;
-template class ACE_Hash_Cache_Map_Manager<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR>;
-template class ACE_Cache_Map_Manager<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>;
-template class ACE_Cache_Map_Iterator<TYPE, TYPE, CACHE_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>;
+template class ACE_Null_Caching_Utility <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>;
+template class ACE_Null_Caching_Strategy <TYPE, TYPE, CACHE_MAP_IMPL, ATTR, NULL_UTILITY>;
+template class ACE_Hash_Cache_Map_Manager <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR> ;
+template class ACE_Cache_Map_Manager <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR> ;
+template class ACE_Cache_Map_Iterator <TYPE, TYPE, CACHE_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR> ;
 template class ACE_Cache_Map_Reverse_Iterator<TYPE,TYPE, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Equal_To<TYPE>
-#pragma instantiate ACE_Pair<TYPE, ATTR>
+#pragma instantiate ACE_Pair<TYPE, ATTR >
 #pragma instantiate ACE_Reference_Pair<TYPE, TYPE>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
@@ -985,17 +981,15 @@ template class ACE_Cache_Map_Reverse_Iterator<TYPE,TYPE, CACHE_REV_ITER_IMPL, NU
 #pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>
 #pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, TYPE>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
 #pragma instantiate ACE_Hash_Map_Entry<TYPE, ACE_Pair<TYPE, ATTR> >
-#pragma instantiate ACE_Null_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL>
-#pragma instantiate ACE_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL>
-#pragma instantiate ACE_Null_Caching_Utility<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>
-#pragma instantiate ACE_Null_Caching_Strategy<ATTR, NULL_UTILITY>
-#pragma instantiate ACE_Hash_Cache_Map_Manager<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Manager<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Iterator<TYPE, TYPE, CACHE_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Null_Caching_Utility <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>
+#pragma instantiate ACE_Null_Caching_Strategy <TYPE, TYPE, CACHE_MAP_IMPL, ATTR, NULL_UTILITY>
+#pragma instantiate ACE_Hash_Cache_Map_Manager <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Manager <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Iterator <TYPE, TYPE, CACHE_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
 #pragma instantiate ACE_Cache_Map_Reverse_Iterator<TYPE,TYPE, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Map_Test.h b/tests/Map_Test.h
index 824b52fc8f4..432ae1a4d57 100644
--- a/tests/Map_Test.h
+++ b/tests/Map_Test.h
@@ -1,23 +1,8 @@
-/* -*- C++ -*- */
 // $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Map_Test.h
-//
-// = DESCRIPTION
-//   This file has the class definitions needed for template generation in
-//   Map_Test.cpp.  They have to be in a separate file so AIX xlC can
-//   find them at auto-instantiate time.
-//
-// = AUTHOR
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//
-// ============================================================================
+// This file has the class definitions needed for template generation in
+// Map_Test.cpp.  They have to be in a separate file so AIX xlC can
+// find them at auto-instantiate time.
 
 #ifndef ACE_MAP_TEST_H
 #define ACE_MAP_TEST_H
@@ -30,9 +15,12 @@
 #include "ace/Active_Map_Manager.h"
 #include "ace/Containers.h"
 
+
 // Key data type.
 typedef ACE_Array<char> KEY;
 
+////////////////////////////////////////////////////////////////////////////////
+
 class Key_Generator
 {
   // = TITLE  
@@ -71,6 +59,8 @@ private:
   u_long counter_;
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 class Hash_Key
 {
 public:
@@ -90,6 +80,8 @@ public:
     } 
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 class Key_Adapter
 {
 public:
diff --git a/tests/New_Fail_Test.cpp b/tests/New_Fail_Test.cpp
index 7fe49e79948..82b6d5db501 100644
--- a/tests/New_Fail_Test.cpp
+++ b/tests/New_Fail_Test.cpp
@@ -1,5 +1,5 @@
 // $Id$
-
+//
 // ============================================================================
 //
 // = LIBRARY
@@ -19,7 +19,7 @@
 //    new will throw an exception, and trust that the user accepts that risk.
 //
 // = AUTHOR
-//    Steve Huston <shuston@riverace.com>
+//    Steve Huston
 //
 // ============================================================================
 
@@ -35,59 +35,54 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
-// This test allocates all of the heap memory, forcing 'new' to fail
-// because of a lack of memory.  The ACE_NEW macros should prevent an
-// exception from being thrown past the ACE_NEW.  If this test doesn't
-// wipe out on an alloc exception, it passes.
+
+// This test allocates all of the heap memory, forcing 'new' to fail because
+// of a lack of memory.  The ACE_NEW macros should prevent an exception from
+// being thrown past the ACE_NEW.  If this test doesn't wipe out on an alloc
+// exception, it passes.
 //
 // If it doesn't ever fail an allocation, there's a warning that something is
 // wrong.  The allocated memory is always freed to avoid masking a leak
 // somewhere else in the test.
+static const int BIG_BLOCK = 1024*1024;       // 1MB
+static const int MAX_ALLOCS_IN_TEST = 4096;   // about 4GB max in the test
 
-// 1MB
-static const int BIG_BLOCK = 1024*1024;       
 
-// about 4GB max in the test
-static const int MAX_ALLOCS_IN_TEST = 4096;   
-
-static void 
-try_ace_new (char **p)
+static void try_ace_new (char **p)
 {
   ACE_NEW (*p, char[BIG_BLOCK]);
   return;
 }
 
-static char * 
-try_ace_new_return (void)
+
+static char * try_ace_new_return (void)
 {
-  char *p = 0;
+  char *p;
   ACE_NEW_RETURN (p, char[BIG_BLOCK], 0);
   return p;
 }
 
+
 int
 main (int, ASYS_TCHAR *[])
 {
   ACE_START_TEST (ASYS_TEXT ("New_Fail_Test"));
   int status = 0;
 
-  // Some platforms are known to throw an exception on a failed 'new',
-  // but are customarily built without exception support to improve
-  // performance.  These platforms are noted, and the test passes.
-  // For new ports, it is wise to let this test run.  Depending on
-  // intended conditions, exceptions can be disabled when the port is
-  // complete.
+  // Some platforms are known to throw an exception on a failed 'new', but
+  // are customarily built without exception support to improve performance.
+  // These platforms are noted, and the test passes.
+  // For new ports, it is wise to let this test run.  Depending on intended
+  // conditions, exceptions can be disabled when the port is complete.
 #if (defined (__SUNPRO_CC) || defined (__GNUG__)) && \
-  !defined (ACE_HAS_EXCEPTIONS)
-    ACE_DEBUG ((LM_NOTICE, ASYS_TEXT ("Out-of-memory will throw an unhandled exception\n")));
+    !defined (ACE_HAS_EXCEPTIONS)
+  ACE_DEBUG ((LM_NOTICE, ASYS_TEXT ("Out-of-memory will throw an unhandled exception\n")));
   ACE_DEBUG ((LM_NOTICE, ASYS_TEXT ("Rebuild with exceptions=1 to prevent this, but it may impair performance.\n")));
 
   // Use the static function addresses, to prevent warnings about the
   // functions not being used.
-  if (&try_ace_new) 
-    /* NULL */;
-  if (&try_ace_new_return) 
-    /* NULL */;
+  if (&try_ace_new) /* null */;
+  if (&try_ace_new_return) /* null */;
 #else
 
   char *blocks[MAX_ALLOCS_IN_TEST];
@@ -108,16 +103,13 @@ main (int, ASYS_TCHAR *[])
         {
           ACE_ERROR((LM_WARNING,
                      ASYS_TEXT ("Test didn't exhaust all available memory\n")));
-          // Back up to valid pointer for deleting.
-          --i;    
+          --i;    // Back up to valid pointer for deleting
         }
       else
         {
           ACE_ASSERT (blocks[i] == 0);
           ACE_ASSERT (errno == ENOMEM);
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("ACE_NEW failed properly at block %d\n"),
-                      i));
+          ACE_DEBUG((LM_DEBUG, ASYS_TEXT ("ACE_NEW failed properly at block %d\n"), i));
         }
 
       // Free the memory to try ACE_NEW_RETURN
@@ -131,20 +123,17 @@ main (int, ASYS_TCHAR *[])
           if (blocks[i] == 0)
             break;
         }
-
       if (i == MAX_ALLOCS_IN_TEST)
         {
-          ACE_ERROR ((LM_WARNING,
-                      ASYS_TEXT ("Test didn't exhaust all available memory\n")));
-          // Back up to valid pointer.
-          --i;    
+          ACE_ERROR((LM_WARNING,
+                     ASYS_TEXT ("Test didn't exhaust all available memory\n")));
+          --i;    // Back up to valid pointer
         }
       else
         {
           ACE_ASSERT (blocks[i] == 0);
           ACE_ASSERT (errno == ENOMEM);
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("ACE_NEW_RETURN failed properly at block %d\n"),
+          ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_NEW_RETURN failed properly at block %d\n"),
                       i));
         }
       while (i >= 0)
@@ -156,12 +145,11 @@ main (int, ASYS_TCHAR *[])
   catch (...)
     {
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("Caught exception during test; ")
-                  ASYS_TEXT ("ACE_bad_alloc not defined correctly, or\n")));
+        ASYS_TEXT ("Caught exception during test; ")
+        ASYS_TEXT ("ACE_bad_alloc not defined correctly, or\n")));
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("ACE_NEW_THROWS_EXCEPTIONS is not #defined (and should be).\n")));
-      // Mark test failure
-      status = 1;
+        ASYS_TEXT ("ACE_NEW_THROWS_EXCEPTIONS is not #defined (and should be).\n")));
+      status = 1;        // Mark test failure
     }
 #endif /* ACE_HAS_EXCEPTIONS */
 #endif /* __SUNPRO_CC && !ACE_HAS_EXCEPTIONS */
diff --git a/tests/Priority_Reactor_Test.h b/tests/Priority_Reactor_Test.h
index fdf17865448..a8a5fa57266 100644
--- a/tests/Priority_Reactor_Test.h
+++ b/tests/Priority_Reactor_Test.h
@@ -14,7 +14,7 @@
 //    only used by Priority_Reactor_Test.cpp.
 //
 // = AUTHOR
-//    Carlos O'Ryan <coryan@cs.wustl.edu>
+//    Carlos O'Ryan
 //
 // ============================================================================
 
diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp
index 49c230a4921..58f905b3d25 100644
--- a/tests/Process_Mutex_Test.cpp
+++ b/tests/Process_Mutex_Test.cpp
@@ -43,8 +43,7 @@ static void
 print_usage_and_die (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("usage: %n [-d (don't release mutex)] ")
-              ASYS_TEXT ("[-c (child process)] [-n mutex name] \n")));
+              "usage: %n [-d (don't release mutex)] [-c (child process)] [-n mutex name] \n"));
   ACE_OS::exit (1);
 }
 
@@ -86,17 +85,17 @@ acquire_release (void)
   ACE_ASSERT (mutex.acquire () == 0);
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P) Mutex acquired %s\n"),
+              "(%P) Mutex acquired %s\n",
               mutex_name));
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P) Working....\n")));
+              "(%P) Working....\n"));
   // work
   ACE_OS::sleep (2);
   // Check if we need to release the mutex
   if (release_mutex == 1)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P) Releasing the mutex %s\n"),
+                  "(%P) Releasing the mutex %s\n",
                   mutex_name));
       ACE_ASSERT (mutex.release () == 0);
     }
@@ -111,8 +110,7 @@ main (int argc, ASYS_TCHAR *argv[])
   ACE_UNUSED_ARG (argv);
 
   ACE_START_TEST (ASYS_TEXT ("Process_Mutex_Test"));
-  ACE_ERROR ((LM_INFO,
-              ASYS_TEXT ("fork is not supported on this platform\n")));
+  ACE_ERROR ((LM_INFO, ASYS_TEXT ("fork is not supported on this platform\n")));
   ACE_END_TEST;
 #else  /* ! ACE_LACKS_FORK */
 
@@ -133,14 +131,12 @@ main (int argc, ASYS_TCHAR *argv[])
       ACE_Process_Options options;
       if (release_mutex == 0)
         options.command_line (ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR
-                              ACE_TEXT ("Process_Mutex_Test")
-                                ACE_PLATFORM_EXE_SUFFIX
+                              ACE_TEXT ("Process_Mutex_Test") ACE_PLATFORM_EXE_SUFFIX
                               ACE_TEXT (" -c -n %s -d"),
                               ACE_WIDE_STRING (mutex_name));
       else
         options.command_line (ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR
-                              ACE_TEXT ("Process_Mutex_Test")
-                                ACE_PLATFORM_EXE_SUFFIX
+                              ACE_TEXT ("Process_Mutex_Test") ACE_PLATFORM_EXE_SUFFIX
                               ACE_TEXT (" -c -n %s"),
                               ACE_WIDE_STRING (mutex_name));
 
@@ -152,11 +148,8 @@ main (int argc, ASYS_TCHAR *argv[])
         {
           ACE_ASSERT (servers[i].spawn (options) != -1);
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Server forked with pid = %d.\n"),
+                      "Server forked with pid = %d.\n",
                       servers[i].getpid ()));
-
-          // Give the server a chance to start . . .
-          ACE_OS::sleep (1);
         }
 
       for (i = 0; i < processes; i++)
@@ -164,7 +157,7 @@ main (int argc, ASYS_TCHAR *argv[])
           // Wait for the process we created to exit.
           ACE_ASSERT (servers[i].wait () != -1);
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Server %d finished\n"),
+                      "Server %d finished\n",
                       servers[i].getpid ()));
         }
 
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index 622ce9374a6..6c7e52b43e8 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -186,8 +186,7 @@ Options::parse_args (int argc, ASYS_TCHAR *argv[])
 #endif /* ACE_HAS_THREADS */
         else
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("WARNING: concurrency strategy \"%s\" ")
-                      ASYS_TEXT ("is not supported\n"),
+                      ASYS_TEXT ("WARNING: concurrency strategy \"%s\" is not supported\n"),
                       get_opt.optarg));
         break;
       case 'f':
@@ -195,8 +194,7 @@ Options::parse_args (int argc, ASYS_TCHAR *argv[])
         break;
       default:
         ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("usage: %n [-f (filename)] ")
-                    ASYS_TEXT ("[-c (concurrency strategy)]\n%a"), 1));
+                    ASYS_TEXT ("usage: %n [-f (filename)] [-c (concurrency strategy)]\n%a"), 1));
         /* NOTREACHED */
       }
 
@@ -294,8 +292,7 @@ Counting_Service::Counting_Service (ACE_Thread_Manager *)
 int
 Counting_Service::read (void)
 {
-  ACE_READ_GUARD_RETURN (ACE_File_Lock, ace_mon,
-                         OPTIONS::instance ()->file_lock (), -1);
+  ACE_READ_GUARD_RETURN (ACE_File_Lock, ace_mon, OPTIONS::instance ()->file_lock (), -1);
 
   ACE_DEBUG ((LM_DEBUG,
               ASYS_TEXT ("(%P|%t) reading on handle %d.\n"),
@@ -332,8 +329,7 @@ Counting_Service::read (void)
 int
 Counting_Service::inc (void)
 {
-  ACE_WRITE_GUARD_RETURN (ACE_File_Lock, ace_mon,
-                          OPTIONS::instance ()->file_lock (), -1);
+  ACE_WRITE_GUARD_RETURN (ACE_File_Lock, ace_mon, OPTIONS::instance ()->file_lock (), -1);
 
   ACE_DEBUG ((LM_DEBUG,
               ASYS_TEXT ("(%P|%t) incrementing on handle %d.\n"),
@@ -515,7 +511,7 @@ client (void *arg)
                           0);
       else if (stream.recv (buf, sizeof buf) <= 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("(%P|%t) %p\n"),
+                           ASYS_TEXT ("%p\n"),
                            ASYS_TEXT ("recv")),
                           0);
 
@@ -644,7 +640,6 @@ main (int argc, ASYS_TCHAR *argv[])
           break;
           /* NOTREACHED */
         default:
-          ACE_OS::sleep (1);
           client (&server_addr);
           break;
           /* NOTREACHED */
@@ -670,8 +665,7 @@ main (int argc, ASYS_TCHAR *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 #else
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("(%P|%t) only one thread may be run ")
-                  ASYS_TEXT ("in a process on this platform\n%a"),
+                  ASYS_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"),
                   1));
 #endif /* ACE_HAS_THREADS */
     }
diff --git a/tests/RB_Tree_Test.h b/tests/RB_Tree_Test.h
index 5ace060300d..e86c34d42d4 100644
--- a/tests/RB_Tree_Test.h
+++ b/tests/RB_Tree_Test.h
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
diff --git a/tests/Reactor_Performance_Test.h b/tests/Reactor_Performance_Test.h
index 95940abebc1..a034a80d9e3 100644
--- a/tests/Reactor_Performance_Test.h
+++ b/tests/Reactor_Performance_Test.h
@@ -9,6 +9,7 @@
 //    Reactor_Performance_Test.h
 //
 // = DESCRIPTION
+//
 //    This file includes template class definitions for the
 //    Reactor_Performance_Test.cpp program.
 //
diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp
index f63a6a3766f..c612e868b6f 100644
--- a/tests/SV_Shared_Memory_Test.cpp
+++ b/tests/SV_Shared_Memory_Test.cpp
@@ -37,8 +37,7 @@ static
 ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple> &
 myallocator ()
 {
-  static ACE_Malloc<ACE_SHARED_MEMORY_POOL,
-                    ACE_SV_Semaphore_Simple> myallocator;
+  static ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple> myallocator;
   return myallocator;
 }
 
@@ -56,43 +55,35 @@ parent (char *shm)
   // This semaphore is initially created with a count of 0, i.e., it
   // is "locked."
   ACE_ASSERT (mutex.open (SEM_KEY_1,
-                          ACE_SV_Semaphore_Complex::ACE_CREATE, 0) != -1);
+                           ACE_SV_Semaphore_Complex::ACE_CREATE, 0) != -1);
 
   ACE_SV_Semaphore_Complex synch;
   // This semaphore is initially created with a count of 0, i.e., it
   // is "locked."
   ACE_ASSERT (synch.open (SEM_KEY_2,
-                          ACE_SV_Semaphore_Complex::ACE_CREATE, 0) != -1);
+                           ACE_SV_Semaphore_Complex::ACE_CREATE, 0) != -1);
 
   // This for loop executes in a critical section proteced by <mutex>.
   for (int i = 0; i < SHMSZ; i++)
     shm[i] = SHMDATA[i];
 
   if (mutex.release () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p"),
-                ASYS_TEXT ("parent mutex.release")));
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p"), ASYS_TEXT ("parent mutex.release")));
   else if (synch.acquire () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p"),
-                ASYS_TEXT ("parent synch.acquire")));
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p"), ASYS_TEXT ("parent synch.acquire")));
 
   if (myallocator ().remove () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"),
-                ASYS_TEXT ("parent allocator.remove")));
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent allocator.remove")));
   if (mutex.remove () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"),
-                ASYS_TEXT ("parent mutex.remove")));
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent mutex.remove")));
   if (synch.remove () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"),
-                ASYS_TEXT ("parent synch.remove")));
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent synch.remove")));
   return 0;
 }
 
 static int
 child (char *shm)
 {
-  // Give the parent a chance to create the semaphore.
-  ACE_OS::sleep (1);
-
   ACE_SV_Semaphore_Complex mutex;
   // This semaphore is initially created with a count of 0, i.e., it
   // is "locked."
@@ -113,8 +104,7 @@ child (char *shm)
     if (errno == EAGAIN)
       ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P) spinning in child!\n")));
     else
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%P) child mutex.tryacquire")), 1);
+      ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P) child mutex.tryacquire")), 1);
 
   for (int i = 0; i < SHMSZ; i++)
     ACE_ASSERT (SHMDATA[i] == shm[i]);
@@ -141,8 +131,7 @@ main (int, ASYS_TCHAR *[])
 {
   ACE_START_TEST (ASYS_TEXT ("SV_Shared_Memory_Test"));
 
-#if defined (ACE_HAS_SYSV_IPC) && !defined (ACE_LACKS_FORK) && \
-    !defined(ACE_LACKS_SYSV_SHMEM)
+#if defined (ACE_HAS_SYSV_IPC) && !defined (ACE_LACKS_FORK) && !defined(ACE_LACKS_SYSV_SHMEM)
   char *shm = (char *) myallocator ().malloc (27);
 
   switch (ACE_OS::fork ("SV_Shared_Memory_Test.cpp"))
@@ -159,8 +148,7 @@ main (int, ASYS_TCHAR *[])
     }
 #else
   ACE_ERROR ((LM_INFO,
-              ASYS_TEXT ("SYSV IPC, SYSV SHMEM, or fork ")
-              ASYS_TEXT ("are not supported on this platform\n")));
+              ASYS_TEXT ("SYSV IPC, SYSV SHMEM, or fork are not supported on this platform\n")));
 #endif /* ACE_HAS_SYSV_IPC */
   ACE_END_TEST;
   return 0;
diff --git a/tests/Shared_Memory_SV_Test.cpp b/tests/Shared_Memory_SV_Test.cpp
deleted file mode 100644
index a3654a7745b..00000000000
--- a/tests/Shared_Memory_SV_Test.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Shared_Memory_SV_Test.cpp
-//
-// = DESCRIPTION
-//     This is a simple test of ACE_Shared_Memory_SV
-//
-// = AUTHOR
-//    Prashant Jain and Doug Schmidt
-// 
-// ============================================================================
-
-
-#include "ace/Shared_Memory_SV.h"
-#include "test_config.h"
-
-const int SHMSZ = 27;
-const int SHM_KEY = 5678;
-
-static void
-client (void)
-{
-  char t = 'a';
-  ACE_Shared_Memory_SV shm_client (SHM_KEY, SHMSZ,
-				   ACE_Shared_Memory_SV::ACE_CREATE);
-  char *shm = (char *) shm_client.malloc ();
-
-  for (char *s = shm; *s != '\0'; s++)
-    {
-      ACE_ASSERT (t == s[0]);
-      t++;
-    }
-  *shm = '*';
-  ACE_OS::exit (0);
-}
-
-static void
-server (void)
-{
-  ACE_Shared_Memory_SV shm_server (SHM_KEY, SHMSZ, 
-				   ACE_Shared_Memory_SV::ACE_CREATE);
-  char *shm = (char *) shm_server.malloc ();
-  char *s   = shm;
-
-  for (char c = 'a'; c <= 'z'; c++)
-    *s++ = c;
-
-  *s = '\0';
-
-  while (*shm != '*')
-    ACE_OS::sleep (1);
-
-  if (shm_server.remove () < 0)
-    ACE_ERROR ((LM_ERROR, "%p\n", "remove"));
-}
-
-int
-main (int, char *argv [])
-{
-  ACE_START_TEST ("Shared_Memory_SV_Test.cpp");
-
-  switch (ACE_OS::fork ())
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "fork"), 1);
-    case 0: 
-      client ();
-      break;
-    default:
-      server ();
-      break;
-    }
-
-  ACE_END_TEST;
-  return 0;
-}
-
diff --git a/tests/TSS_Test_Errno.h b/tests/TSS_Test_Errno.h
index bbec5a05eb3..10b7eff1b34 100644
--- a/tests/TSS_Test_Errno.h
+++ b/tests/TSS_Test_Errno.h
@@ -1,23 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-// ============================================================================
-//
-// = FILENAME
-//    TSS_Test_Errno.h
-//
-// = DESCRIPTION
-//    This file contains the definition of Errno.  Some compilers need
-//    it in a .h file for template instantiation (such as AIX C Set
-//    ++).
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
 class Errno
-{
   // = TITLE
   //    Define a simple Errno abstraction
   //
@@ -25,6 +9,7 @@ class Errno
   //    This class gets its own header file to work around AIX C++
   //    compiler "features" related to template instantiation...  It is
   //    only used by TSS_Test.cpp.
+{
 public:
   int error (void) { return this->errno_; }
   void error (int i) { this->errno_ = i; }
@@ -51,7 +36,7 @@ public:
 #if defined (ACE_HAS_THREADS)
   static
   ACE_Thread_Mutex *
-  allocate_lock (void)
+  allocate_lock ()
   {
     ACE_NEW_RETURN (Errno::lock_, ACE_Thread_Mutex, 0);
     return Errno::lock_;
diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp
index a66f310040a..b840cbe28bd 100644
--- a/tests/Thread_Pool_Test.cpp
+++ b/tests/Thread_Pool_Test.cpp
@@ -18,9 +18,7 @@
 //      worker tasks compared to queue deactivate.
 //
 // = AUTHOR
-//    Karlheinz Dorn <Karlheinz.Dorn@med.siemens.de>, 
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>, and 
-//    Prashant Jain <pjain@cs.wustl.edu>
+//    Karlheinz Dorn, Doug Schmidt, and Prashant Jain
 //
 // ============================================================================
 
@@ -155,12 +153,10 @@ Thread_Pool::open (void *)
                        ASYS_TEXT ("activate failed")),
                       -1);
 
-  ACE_Message_Block *mb = 0;
-
-  for (size_t count = 0;
-       count < n_iterations;
-       count++)
+  for (size_t count = 0; count < n_iterations; count++)
     {
+      ACE_Message_Block *mb;
+
       // Allocate a new message.
       ACE_NEW_RETURN (mb,
                       ACE_Message_Block (BUFSIZ,
@@ -196,6 +192,8 @@ Thread_Pool::open (void *)
               this->thr_count ()));
   this->dump ();
 
+  ACE_Message_Block *mb;
+
   ACE_NEW_RETURN (mb,
                   ACE_Message_Block (0,
                                      ACE_Message_Block::MB_DATA,
@@ -204,11 +202,10 @@ Thread_Pool::open (void *)
                                      0,
                                      &this->lock_adapter_),
                   -1);
-  int i = 0;
 
-  for (i = this->thr_count ();
-       i > 0;
-       i--)
+  int i; // We need to define 'i' here to keep EGCS from complaining...
+
+  for (i = this->thr_count (); i > 0; i--)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("(%t) EOF, enqueueing NULL block for thread = %d\n"),
diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp
index 8d4f8c1408e..acea9415223 100644
--- a/tests/Time_Service_Test.cpp
+++ b/tests/Time_Service_Test.cpp
@@ -43,11 +43,6 @@ main (int, ASYS_TCHAR *[])
 {
   ACE_START_TEST (ASYS_TEXT ("Time_Service_Test"));
 
-#if defined (ACE_LACKS_FORK)
-  ACE_ERROR ((LM_INFO,
-              ASYS_TEXT ("fork is not supported on this platform\n")));
-#else  /* ! ACE_LACKS_FORK */
-
   // Make sure that the backing store is not there. We need to make
   // sure because this test kills the Time Clerk and on some platforms
   // the Clerk is not allowed to do a graceful shutdown. By cleaning
@@ -64,8 +59,7 @@ main (int, ASYS_TCHAR *[])
     ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%n; %p (%s).\n"),
                        ASYS_TEXT ("Server fork failed"), server_cl), -1);
   else
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Server forked with pid = %d.\n"),
-                server.getpid ()));
+    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Server forked with pid = %d.\n"), server.getpid ()));
 
   ACE_OS::sleep (3);
 
@@ -78,25 +72,21 @@ main (int, ASYS_TCHAR *[])
     ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%n; %p: (%s).\n"),
                        ASYS_TEXT ("Clerk fork failed"), clerk_cl), -1);
   else
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Clerk forked with pid = %d.\n"),
-                clerk.getpid ()));
+    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Clerk forked with pid = %d.\n"), clerk.getpid ()));
 
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Sleeping...\n")));
   ACE_OS::sleep (10);
 
   if (clerk.terminate () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for clerk.\n")),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for clerk.\n")), -1);
 
   if (server.terminate () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for server.\n")),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for server.\n")), -1);
 
-  // Because we kill the clerk process, on Win32 it may not do a
+  // Since we kill the clerk process, on Win32 it may not do a
   // graceful shutdown and the backing store file is left behind.
   if (clerk.wait () != 0)
     ACE_OS::unlink (ACE_DEFAULT_BACKING_STORE);
-#endif /* ! ACE_LACKS_FORK */
 
   ACE_END_TEST;
   return 0;
diff --git a/tests/run_pharlap_tests.bat b/tests/run_pharlap_tests.bat
index 9f6da7b1293..8b34bfcf42c 100755
--- a/tests/run_pharlap_tests.bat
+++ b/tests/run_pharlap_tests.bat
@@ -22,8 +22,6 @@ call %0 Buffer_Stream_Test
 call %0 CDR_Test
 call %0 Collection_Test
 call %0 Conn_Test
-call %0 Cached_Conn_Test
-call %0 Cached_Accept_Conn_Test
 call %0 DLL_Test
 call %0 DLList_Test
 call %0 Enum_Interfaces_Test
@@ -31,7 +29,6 @@ call %0 Env_Value_Test
 call %0 Future_Test
 call %0 Handle_Set_Test
 call %0 Hash_Map_Manager_Test
-call %0 Hash_Map_Bucket_Iterator_Test
 call %0 High_Res_Timer_Test
 call %0 IOStream_Test
 call %0 Map_Manager_Test
diff --git a/tests/run_tests.bat b/tests/run_tests.bat
index 5314fe95db8..f0625695664 100644
--- a/tests/run_tests.bat
+++ b/tests/run_tests.bat
@@ -36,8 +36,7 @@ goto setupmsc
 shift
 :setupbor
 set arg=%1
-set exedir=.\Dynamic\Release\
-set PATH=%PATH%;%exedir%
+set exedir=.\bor\bin\
 rem Set deco to whatever decoration you have for the executables
 set deco=
 set platform=bor
@@ -78,13 +77,10 @@ call %run_cmd% %dopure% %platform% Future_Test
 call %run_cmd% %dopure% %platform% Future_Set_Test
 call %run_cmd% %dopure% %platform% Handle_Set_Test
 call %run_cmd% %dopure% %platform% Hash_Map_Manager_Test
-call %run_cmd% %dopure% %platform% Hash_Map_Bucket_Iterator_Test
 call %run_cmd% %dopure% %platform% High_Res_Timer_Test
 call %run_cmd% %dopure% %platform% IOStream_Test
 call %run_cmd% %dopure% %platform% Map_Manager_Test
 call %run_cmd% %dopure% %platform% Cache_Map_Manager_Test
-call %run_cmd% %dopure% %platform% Cached_Conn_Test
-call %run_cmd% %dopure% %platform% Cached_Accept_Conn_Test
 call %run_cmd% %dopure% %platform% Map_Test
 call %run_cmd% %dopure% %platform% Mem_Map_Test
 call %run_cmd% %dopure% %platform% Message_Block_Test
diff --git a/tests/run_tests.check b/tests/run_tests.check
index 0eac73e5d12..8b33cf979a5 100755
--- a/tests/run_tests.check
+++ b/tests/run_tests.check
@@ -10,12 +10,8 @@ tmp=/tmp
 SUCCESS_MSGS="starting|Ending"
 
 # These patterns should not be contained in log file.
-if [ "$1" != "log/Cached_Accept_Conn_Test.log" ]; then
-  ERROR_MSGS="assertion failed|not supported|No such file or directory|Invalid argument|timeout|Bad file number"
-else
-  # "No such file or directory" is allowed in Cached_Accept_Conn_Test.log
-  ERROR_MSGS="assertion failed|not supported|Invalid argument|timeout|Bad file number"
-fi
+ERROR_MSGS="assertion failed|not supported|No such file or directory|Invalid argument|timeout|Bad file number"
+
 status=0
 
 for arg do
diff --git a/tests/run_tests.ksh b/tests/run_tests.ksh
deleted file mode 100755
index a4d7f0d8b17..00000000000
--- a/tests/run_tests.ksh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/ksh -f
-
-. ./run_tests.sh
-
-# EOF
-
diff --git a/tests/run_tests.psosim b/tests/run_tests.psosim
index a788025b628..0d810f84ede 100755
--- a/tests/run_tests.psosim
+++ b/tests/run_tests.psosim
@@ -136,17 +136,7 @@ run Reverse_Lock_Test                   # uses ACE_Reverse_Lock
 #Tokens_Test: threads not supported on this platform
 #run Tokens_Test
 
-run Map_Manager_Test                    # uses Map Manager and Hash Map Manager + Forward and Reverse Map Iterators.
-
-run Hash_Map_Manager_Test               # uses Hash Map Manager + Forward and Reverse Map Iterators.
-
-run Hash_Map_Bucket_Iterator_Test       # uses Hash Map Bucket iterator.
-
-run Cache_Map_Manager_Test              # uses Cache Map Manager and Hash Cache Map Manager + Forward and Reverse Map Iterators.
-
-run Cached_Conn_Test                    # uses Cached connection management (with OneShot Acceptor).
-
-run Cached_Accept_Conn_Test             # uses Cached connection management (with regular Acceptor).
+# run Map_Manager_Test                    # uses Map Manager and Hash Map Manager + Forward and Reverse Map Iterators.
 
 run Map_Test                            # uses Map + Forward and Reverse Map Iterators.
 
@@ -177,11 +167,12 @@ run Service_Config_Test                 # uses Service_Config
 run IOStream_Test                       # uses ACE_IOStream and ACE_SOCK_Stream
 run Enum_Interfaces_Test                # uses ACE::get_ip_interfaces()
 
-run Conn_Test                           # uses Thread_Manager, Acceptor/Connector, SOCK_SAP
+#Conn_Test: requires either fork or threads
+#run Conn_Test                           # uses Thread_Manager, Acceptor/Connector, SOCK_SAP
 
 run Upgradable_RW_Test                  # uses RW locks
 
-run Svc_Handler_Test
+run Svc_Handler_Test			    
 
 echo "Tests complete..."
 
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 08f0da54987..9ef06a9bf17 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -126,7 +126,7 @@ run Time_Value_Test                     # tests Time_Value
 run High_Res_Timer_Test                 # tests High_Res_Timer
 run SString_Test                        # tests ACE_CString and ACE_SString
 run Collection_Test                     # tests ACE Collection classes
-test $Unicos || test -f libDLL_Test.so && run DLL_Test # tests ACE_DLL class
+test $chorus || test $LynxOS || test $Unicos || run DLL_Test # tests ACE_DLL class
 # Naming_Test: UNICOS fails due to feature not supported
 test $OTHER && \
   (test $chorus || test $LynxOS || test $Unicos || run Naming_Test) # tests ACE_Naming_Context, ACE_WString
@@ -154,7 +154,7 @@ run Task_Test                           # tests ACE_Thread_Manager, ACE_Task
 test $Unicos || run Thread_Manager_Test                 # tests ACE_Thread_Manager, ACE_Task
 run Thread_Pool_Test                    # tests ACE_Thread_Manager, ACE_Task
 run Future_Test                         # tests ACE_Thread_Manager, ACE_Task, ACE_Future
-run Future_Set_Test                     # tests ACE_Thread_Manager, ACE_Task, ACE_Future_Set
+# run Future_Set_Test                     # tests ACE_Thread_Manager, ACE_Task, ACE_Future_Set
 run RB_Tree_Test                        # tests ACE_RB_Tree, ACE_RB_Tree_Iterator
 run Reactors_Test                       # tests ACE_Task, ACE_Mutex, ACE_Reactor
 run Reactor_Exceptions_Test             # tests ACE_Reactor and C++ exceptions
@@ -188,11 +188,7 @@ fi
 test $TOKEN && (test $chorus || test $Unicos || run Tokens_Test) # tests ACE_Token
 
 run Cache_Map_Manager_Test              # tests ACE_Cache_Map_Manager and ACE_Hash_Cache_Manager and caching features.
-run Cached_Conn_Test                   # tests connection management features (with OneShot Acceptor).
-run Cached_Accept_Conn_Test            # tests connection management features (with regular Acceptor).
 run Map_Manager_Test                    # tests ACE_Map Manager and ACE_Hash_Map_Manager + Forward and Reverse Map Iterators.
-run Hash_Map_Manager_Test               # tests ACE_Hash_Map_Manager + Forward and Reverse Map Iterators.
-run Hash_Map_Bucket_Iterator_Test       # tests ACE_Hash Map Bucket iterator.
 run Map_Test                            # tests ACE_Map + Forward and Reverse Map Iterators.
 run Message_Queue_Notifications_Test    # tests ACE_Message_Queue + ACE_Reactor
 test $chorus || run Message_Queue_Test  # tests ACE_Message_Queue + Forward and Reverse Message Queue Iterators.
diff --git a/tests/run_tests.vxworks b/tests/run_tests.vxworks
index cbf03135b23..4b7d45e8f5d 100644
--- a/tests/run_tests.vxworks
+++ b/tests/run_tests.vxworks
@@ -97,10 +97,6 @@ ld < Hash_Map_Manager_Test
 write 2, "Hash_Map_Manager_Test ", 22
 ace_main; unld "Hash_Map_Manager_Test"
 
-ld < Hash_Map_Bucket_Iterator_Test
-write 2, "Hash_Map_Bucket_Iterator_Test ", 29
-ace_main; unld "Hash_Map_Bucket_Iterator_Test"
-
 ld < Sigset_Ops_Test
 write 2, "Sigset_Ops_Test ", 16
 ace_main; unld "Sigset_Ops_Test"
@@ -175,14 +171,6 @@ ld < Conn_Test
 write 2, "Conn_Test ", 10
 ace_main; unld "Conn_Test"
 
-ld < Cached_Conn_Test
-write 2, "Cached_Conn_Test ", 17
-ace_main; unld "Cached_Conn_Test"
-
-ld < Cached_Accept_Conn_Test
-write 2, "Cached_Accept_Conn_Test ", 24
-ace_main; unld "Cached_Accept_Conn_Test"
-
 ld < Barrier_Test
 write 2, "Barrier_Test ", 13
 ace_main; unld "Barrier_Test"
@@ -208,13 +196,9 @@ ld < Reverse_Lock_Test
 write 2, "Reverse_Lock_Test ", 18
 ace_main; unld "Reverse_Lock_Test"
 
-ld < Map_Manager_Test
-write 2, "Map_Manager_Test ", 17
-ace_main; unld "Map_Manager_Test"
-
-ld < Cache_Map_Manager_Test
-write 2, "Cache_Map_Manager_Test ", 23
-ace_main; unld "Cache_Map_Manager_Test"
+#### ld < Map_Manager_Test
+#### write 2, "Map_Manager_Test ", 17
+#### ace_main; unld "Map_Manager_Test"
 
 ld < Map_Test
 write 2, "Map_Test ", 9
diff --git a/tests/tests.dsw b/tests/tests.dsw
index 52bb372ec27..4bf8393e600 100644
--- a/tests/tests.dsw
+++ b/tests/tests.dsw
@@ -87,30 +87,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Cached_Conn_Test"=.\Cached_Conn_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Cached_Accept_Conn_Test"=.\Cached_Accept_Conn_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Collection_Test"=.\Collection_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -243,18 +219,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Hash_Map_Bucket_Iterator_Test"=.\Hash_Map_Bucket_Iterator_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "High_Res_Timer_Test"=.\High_Res_Timer_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -914,3 +878,4 @@ Package=<3>
 }}}

 

 ###############################################################################

+